plan-java v0.30

(cherry picked from commit 2c0c99ff6b413b08a074db1bcee12786cb40547e)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewController.java

@@ -176,34 +176,17 @@ public class PlanNewController {
     public Mono<RStatus<Poster>> savePoster(@RequestBody PosterRequest posterRequset){
 
         return goGenerateService.savePoster(posterRequset);
-//        Poster poster = new Poster(null, posterRequset.getPosterTemplateId()
-//                ,posterRequset.getPosterTemplate(), BaseContextHandler.getUserName(),
-//                BaseContextHandler.getUserId(), ZonedDateTime.now(),
-//                ZonedDateTime.now());
-//        Mono<Poster> insert = template.insert(poster);
-//        return RStatus.success(insert);
     }
     @PostMapping("test11")
     public Mono<RStatus<Poster>> test11(){
         return goGenerateService.updatePoster1();
-//        Criteria empty = Criteria.where("poster_id").is(posterRequset.getPosterId());
-//        Update update = Update.update("updated_at", ZonedDateTime.now());
-//        if(Objects.nonNull(posterRequset.getPosterTemplate()) && !"".equals(posterRequset.getPosterTemplate())){
-//            update.set("poster_template",posterRequset.getPosterTemplate());
-//        }
-//        Mono<Long> update1 = template.update(Query.query(empty), update, Poster.class);
-//        return  RStatus.success(update1);
+
     }
     @PostMapping("test12")
     public Mono<String> test112(){
-        return goGenerateService.updatePoster12();
-//        Criteria empty = Criteria.where("poster_id").is(posterRequset.getPosterId());
-//        Update update = Update.update("updated_at", ZonedDateTime.now());
-//        if(Objects.nonNull(posterRequset.getPosterTemplate()) && !"".equals(posterRequset.getPosterTemplate())){
-//            update.set("poster_template",posterRequset.getPosterTemplate());
-//        }
-//        Mono<Long> update1 = template.update(Query.query(empty), update, Poster.class);
-//        return  RStatus.success(update1);
+        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        return Mono.just(string);//goGenerateService.updatePoster12();
+
     }
     /**
      * 海报修改
@@ -213,13 +196,6 @@ public class PlanNewController {
     @PostMapping("updatePoster")
     public Mono<RStatus<Poster>> updatePoster(@RequestBody PosterRequest posterRequset){
         return goGenerateService.updatePoster(posterRequset);
-//        Criteria empty = Criteria.where("poster_id").is(posterRequset.getPosterId());
-//        Update update = Update.update("updated_at", ZonedDateTime.now());
-//        if(Objects.nonNull(posterRequset.getPosterTemplate()) && !"".equals(posterRequset.getPosterTemplate())){
-//            update.set("poster_template",posterRequset.getPosterTemplate());
-//        }
-//        Mono<Long> update1 = template.update(Query.query(empty), update, Poster.class);
-//        return  RStatus.success(update1);
     }
 
     /**

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewOutController.java

@@ -71,7 +71,9 @@ public class PlanNewOutController {
                 .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList().flatMap(fm -> {
                     DomainSelectRes domainSelectRes = new DomainSelectRes();
                     int i = RandomUtil.randomInt(0, fm.size());
-                    domainSelectRes.setDomain(fm.get(i).domain());
+                    String domain = fm.get(i).domain();
+                    String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                    domainSelectRes.setDomain(string+"."+domain);
                     domainSelectRes.setPath("");
                     domainSelectRes.setUnique(IdUtil.fastSimpleUUID());
                     return Mono.just(domainSelectRes);

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

@@ -136,8 +136,6 @@ public class GoGenerateService {
         List<Item> collect = goRequest.getItem().stream().filter(f -> "cusqrcode".equals(f.getT()) && Objects.nonNull(f.getPlanId()) && f.getIsRandom()).collect(Collectors.toList());
         Mono<List<StringBuilder>> stringBuilderMono =null;
         if (Objects.nonNull(collect) && !collect.isEmpty()) {
-            //Item item = first3.get();
-            //Long planid = item.getPlanId();
             List<Long> collect1 = collect.stream().map(Item::getPlanId).collect(Collectors.toList());
              stringBuilderMono = template.select(Query.query(Criteria.where("plan_new_id").in(collect1)), PlanNew.class)
                     .flatMap(f -> Mono.zip(Mono.just(f), template.select(Query.query(Criteria.where("group_type_id").is(f.groupId())
@@ -150,7 +148,7 @@ public class GoGenerateService {
                                 } else {
                                     DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                                     stringBuilder.append("http://");
-                                    stringBuilder.append(IdUtil.fastSimpleUUID().substring(0, 6));
+                                    stringBuilder.append( get6Str());
                                     stringBuilder.append(".");
                                     stringBuilder.append(domainSelect.domain());
                                     stringBuilder.append("/index.html?code=");
@@ -176,6 +174,11 @@ public class GoGenerateService {
         return stringBuilderMono;
     }
 
+    private String get6Str() {
+        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        return string;
+    }
+
     private Mono<Poster> getPosterResMono1(Mono<PosterRequest> insert, Mono<String> stringMono) {
         Mono<Poster> zip = Mono.zip(insert, stringMono, (entry, ret) -> {
             JSONObject jsonObject1 = JSONUtil.parseObj(ret);