plan-java v0.39

(cherry picked from commit 1f65c6f1e4cc4a90358fc3f837ebdd8f543a55b3)

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

@@ -67,7 +67,7 @@ public class GoGenerateService {
             String body = HttpUtil.post(value + "/api/image/createImage",temStr,100000);
             return body;
         } catch (Exception e) {
-            System.out.println(e);
+           // System.out.println(e);
             throw new BaseException(e.getMessage());
         }
 
@@ -133,7 +133,10 @@ public class GoGenerateService {
 
             // System.out.println(t4);
             Optional<Image> first = f.getT1().stream().findFirst();
-            first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            //first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            if (goRequest.getIsRandom()) {
+                first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            }
             //封面
             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()));
@@ -184,7 +187,10 @@ public class GoGenerateService {
             List<StringBuilder> t4 = f.getT4();
 
             Optional<Image> first = f.getT1().stream().findFirst();
-            first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            //first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            if (goRequest.getIsRandom()) {
+                first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            }
             //封面
             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()));
@@ -319,7 +325,9 @@ public class GoGenerateService {
 
            // System.out.println(t4);
             Optional<Image> first = f.getT1().stream().findFirst();
-            first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            if (goRequest.getIsRandom()) {
+                first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            }
             //封面
             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()));
@@ -369,7 +377,7 @@ public class GoGenerateService {
                                                 .equals(f.planNewId()) && (Objects.isNull(ft.getV()) || "".equals(ft.getV()))).findFirst();
                         first.ifPresent(item -> item.setV(stringBuilder.toString()));
 
-                                System.out.println(stringBuilder);
+                               // System.out.println(stringBuilder);
                                 return stringBuilder;
                             })
                     ).collectList();
@@ -484,7 +492,7 @@ public class GoGenerateService {
             posterRequest.setPosterTemplateId(f.posterTemplateId());
            // Mono<RStatus<Poster>> rStatusMono = savePoster(posterRequest);
              String s = goGenerate(JSONUtil.toJsonStr(f.posterTemplate()));
-             System.out.println(s);
+           //  System.out.println(s);
             return Mono.just(s);
         });
         return poster_id;