plan-java v0.55

launch-admin/src/main/java/com/webflux/launchadmin/config/LoginWebFiter.java

@@ -122,7 +122,7 @@ public class LoginWebFiter implements WebFilter {
         }
         CloseableHttpClient httpclient = HttpClients.createDefault();
         //https://kuaitou.mokamrp.com/api/system/qwlb/getAdminInfo
-        HttpGet httpget = new HttpGet("https://kuaitou.mokamrp.com/api/system/qwlb/getAdminInfo");
+        HttpGet httpget = new HttpGet("https://kuaitou.mokamrp.com/api/system/admin/getAdminInfo");
         httpget.setHeader("Cookie",cookie);
         CloseableHttpResponse response = httpclient.execute(httpget);
         try {

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/goGenerate/GoGenerateService.java

@@ -185,11 +185,15 @@ public class GoGenerateService {
 
         Mono<String> stringMono = Mono.zip(bgImage, fmImage, text, stringBuilderMono,fm1).flatMap(f -> {
             List<StringBuilder> t4 = f.getT4();
+            if (Objects.nonNull(t4) && !t4.isEmpty()) {
+                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+            }else{
+                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
+            }
             Optional<Image> first = f.getT1().stream().findFirst();
             if (goRequest.getIsRandom()) {
                 first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
             }
-            goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
             //封面
             if( Objects.nonNull(f.getT3()) &&!f.getT3().isEmpty()){
                 goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst()
@@ -243,6 +247,11 @@ public class GoGenerateService {
 
         Mono<String> stringMono = Mono.zip(bgImage, fmImage, text, stringBuilderMono,fm1,getStringBuilderMono(saveRequest)).flatMap(f -> {
             List<StringBuilder> t4 = f.getT4();
+            if (Objects.nonNull(t4) && !t4.isEmpty()) {
+                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+            }else{
+                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
+            }
             if (Objects.nonNull(f.getT4()) && !f.getT4().isEmpty()) {
                 Optional<Image> first = f.getT1().stream().findFirst();
                 //first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
@@ -256,7 +265,8 @@ public class GoGenerateService {
                 goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst()
                         .ifPresent(item -> item.setV(f.getT5().get(RandomUtil.randomInt(0, f.getT5().size())).image()));
             }
-            goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+
+
             Optional<Item> first5 = goRequest.getItem().stream().filter(f1 -> "qrcode".equals(f1.getT())).findFirst();
             if (first5.isPresent()) {
                 Item item = first5.get();
@@ -400,13 +410,17 @@ public class GoGenerateService {
                                        Mono<List<Image>> bgImage, Mono<List<Image>> fmImage, Mono<List<Material>> text,Mono<List<Image>> fm1) {
         Mono<String> stringMono = Mono.zip(bgImage, fmImage, text, stringBuilderMono,fm1).flatMap(f -> {
             List<StringBuilder> t4 = f.getT4();
+            if (Objects.nonNull(t4) && !t4.isEmpty()) {
+                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+            }else{
+                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
+            }
 
-           // System.out.println(t4);
             Optional<Image> first = f.getT1().stream().findFirst();
             if (goRequest.getIsRandom()) {
                 first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
             }
-            goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+
             //封面
             if (Objects.nonNull(f.getT5()) &&!f.getT5().isEmpty()) {
                 goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst()
@@ -464,7 +478,7 @@ public class GoGenerateService {
                     ).collectList();
         }
         if (Objects.isNull(stringBuilderMono)) {
-            return Mono.just(List.of(new StringBuilder("空空如也")));
+            return Mono.just(List.of());
         }
         return stringBuilderMono;
     }