随机6字符 改 ("qq", "baidu", "weixin")

(cherry picked from commit 0d8ab0857f9bf73d9bc35b7f2dfa1b3570cc02e6)

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

@@ -27,6 +27,7 @@ import com.webflux.launchadmin.mysql.service.planNew.structure.Item;
 import com.webflux.launchadmin.mysql.service.readBookPlan.ReadBookPlanServicesInterface;
 import com.webflux.launchadmin.mysql.service.sourceMaterial.materialManagement.MaterialManagementInterface;
 import com.webflux.launchadmin.mysql.service.takeaway.TakeawayServicesInterface;
+import com.webflux.launchadmin.utils.RandomStr;
 import com.webflux.launchcommon.returnObj.RStatus;
 import com.webflux.launchcommon.utils.StringUtils;
 import jakarta.annotation.Resource;
@@ -520,7 +521,7 @@ public class PlanNewCommonOutController {
                         .onErrorResume(throwable -> Mono.error(new BaseException("transferPageDomain 域名查詢為空 group_type_id:::" + f.transferPageDomain()))).collectList().flatMap(fff -> {
                             if (!fff.isEmpty()) {
                                 DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-                                String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                                String string = RandomStr.getRandomStr();
                                 String domain1 = domainSelect.domain();
                                 return Mono.just(string + "." + domain1);
 
@@ -542,7 +543,7 @@ public class PlanNewCommonOutController {
                         .onErrorResume(throwable -> Mono.error(new BaseException("backgroupDomain 域名查询为空 group_type_id" + f.backgroupDomain()))).collectList().flatMap(fff -> {
                             if (!fff.isEmpty()) {
                                 DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-                                String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                                String string = RandomStr.getRandomStr();
                                 String domain1 = domainSelect.domain();
                                 return Mono.just(string + "." + domain1);
                             } else {
@@ -562,7 +563,7 @@ public class PlanNewCommonOutController {
                         //  DomainSelectRes domainSelectRes = new DomainSelectRes();
                         int i = RandomUtil.randomInt(0, fm.size());
                         String domain = fm.get(i).domain();
-                        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                        String string = RandomStr.getRandomStr();
                         return Mono.just(string + "." + domain);
                     });
             return Mono.zip(stringMono2, stringMono1, stringMono).flatMap(fff -> {
@@ -597,7 +598,7 @@ public class PlanNewCommonOutController {
                     DomainSelectRes domainSelectRes = new DomainSelectRes();
                     int i = RandomUtil.randomInt(0, fm.size());
                     String domain = fm.get(i).domain();
-                    String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                    String string = RandomStr.getRandomStr();
                     domainSelectRes.setDomain(string + "." + domain);
                     domainSelectRes.setPath("");
                     domainSelectRes.setUnique(IdUtil.fastSimpleUUID());
@@ -624,7 +625,7 @@ public class PlanNewCommonOutController {
                     .collectList().flatMap(fm -> {
                         int i = RandomUtil.randomInt(0, fm.size());
                         String domain = fm.get(i).domain();
-                        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                        String string = RandomStr.getRandomStr();
                         return Mono.just(string + "." + domain);
                     });
         }
@@ -639,7 +640,7 @@ public class PlanNewCommonOutController {
                     .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
                         if (!fff.isEmpty()) {
                             DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-                            String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                            String string = RandomStr.getRandomStr();
                             String domain1 = domainSelect.domain();
                             return Mono.just(string + "." + domain1);
                         } else {
@@ -660,7 +661,7 @@ public class PlanNewCommonOutController {
                     .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
                         if (!fff.isEmpty()) {
                             DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-                            String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                            String string = RandomStr.getRandomStr();
                             String domain1 = domainSelect.domain();
                             return Mono.just(string + "." + domain1);
                         } else {
@@ -697,7 +698,7 @@ public class PlanNewCommonOutController {
                     .collectList().flatMap(fm -> {
                         int i = RandomUtil.randomInt(0, fm.size());
                         String domain = fm.get(i).domain();
-                        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                        String string = RandomStr.getRandomStr();
                         return Mono.just(string + "." + domain);
                     });
         }
@@ -973,7 +974,7 @@ public class PlanNewCommonOutController {
                 // 交友裂变无清水分类
                 isQs = false;
             }
-            if (Objects.nonNull(request.getRedirectType()) && request.getRedirectType() == 2) {
+            if (Objects.nonNull(request.getRedirectType()) && request.getRedirectType() == 2 ) {
                 stringBuilderMono = goGenerateService.byPlanNewIdGetUrlCommon(request.getRedirectPlanId(), isQs, request.getGroupIdQs());
             } else {
                 stringBuilderMono = Mono.just(new StringBuilder(request.getLink() == null ? "" : request.getLink()));
@@ -1453,7 +1454,7 @@ public class PlanNewCommonOutController {
                 });
     }
     private String get6Str() {
-        return RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        return RandomStr.getRandomStr();
     }
 
 

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

@@ -21,6 +21,7 @@ import com.webflux.launchadmin.mysql.service.listening.ListeningPlanServiceInter
 import com.webflux.launchadmin.mysql.service.planNew.PlanServiceInterface;
 import com.webflux.launchadmin.mysql.service.planNew.goGenerate.GoGenerateService;
 import com.webflux.launchadmin.mysql.service.planNew.structure.GoRequest;
+import com.webflux.launchadmin.utils.RandomStr;
 import com.webflux.launchcommon.returnObj.Paged;
 import com.webflux.launchcommon.returnObj.RStatus;
 import jakarta.annotation.Resource;
@@ -247,7 +248,7 @@ public class PlanNewController {
 
     @PostMapping("test12")
     public Mono<String> test112() {
-        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        String string = RandomStr.getRandomStr();
         return Mono.just(string);// goGenerateService.updatePoster12();
     }
 

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

@@ -19,6 +19,7 @@ import com.webflux.launchadmin.mysql.service.planNew.goGenerate.GoGenerateServic
 import com.webflux.launchadmin.mysql.service.planNew.ipAnalyze.IpAnalyzeServiceInterface;
 import com.webflux.launchadmin.mysql.service.planNew.structure.GoRequest;
 import com.webflux.launchadmin.mysql.service.planNew.structure.Item;
+import com.webflux.launchadmin.utils.RandomStr;
 import com.webflux.launchcommon.returnObj.RStatus;
 import com.weblux.launchredis.utils.RedisKey;
 import jakarta.annotation.Resource;
@@ -121,7 +122,7 @@ public class PlanNewOutController {
                             .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
                                 if (!fff.isEmpty()) {
                                     DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-                                    String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                                    String string = RandomStr.getRandomStr();
                                     String domain1 = domainSelect.domain();
                                     return Mono.just(string+"."+domain1);
 
@@ -143,7 +144,7 @@ public class PlanNewOutController {
                             .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
                                 if (!fff.isEmpty()) {
                                     DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-                                    String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                                    String string = RandomStr.getRandomStr();
                                     String domain1 = domainSelect.domain();
                                     return Mono.just(string+"."+domain1);
                                 } else {
@@ -160,7 +161,7 @@ public class PlanNewOutController {
                           //  DomainSelectRes domainSelectRes = new DomainSelectRes();
                             int i = RandomUtil.randomInt(0, fm.size());
                             String domain = fm.get(i).domain();
-                            String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+                            String string = RandomStr.getRandomStr();
                           //  domainSelectRes.setBackgroupDomain(f.backgroupDomain());
                          //   domainSelectRes.setTransferPageDomain(f.transferPageDomain());
                            // domainSelectRes.setTransferPageBl(f.transferPageBl());
@@ -200,7 +201,7 @@ public class PlanNewOutController {
             DomainSelect domainInfo = com.alibaba.fastjson.JSONObject.parseObject(domainInfoCache.toString(),DomainSelect.class);
             DomainSelectRes domainSelectRes = new DomainSelectRes();
             String domain = domainInfo.domain();
-            String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+            String string = RandomStr.getRandomStr();
             domainSelectRes.setDomain(string+"."+domain);
             domainSelectRes.setPath("");
             domainSelectRes.setUnique(IdUtil.fastSimpleUUID());
@@ -504,7 +505,7 @@ public class PlanNewOutController {
 //                            .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList().flatMap(fff -> {
 //                                if (!fff.isEmpty()) {
 //                                    DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-//                                    String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+//                                    String string = RandomStr.getRandomStr();
 //                                    String domain1 = domainSelect.domain();
 //                                    return Mono.just(string+"."+domain1);
 //
@@ -526,7 +527,7 @@ public class PlanNewOutController {
 //                            .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList().flatMap(fff -> {
 //                                if (!fff.isEmpty()) {
 //                                    DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
-//                                    String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+//                                    String string = RandomStr.getRandomStr();
 //                                    String domain1 = domainSelect.domain();
 //                                    return Mono.just(string+"."+domain1);
 //                                } else {

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/listening/ListeningPlanServiceImpl.java

@@ -26,6 +26,7 @@ import com.webflux.launchadmin.mysql.service.planNew.structure.GoRequest;
 import com.webflux.launchadmin.mysql.service.planNew.structure.Item;
 import com.webflux.launchadmin.mysql.task.SyncListeningAudioToRedis;
 import com.webflux.launchadmin.mysql.task.SyncPlanNewListenToRedis;
+import com.webflux.launchadmin.utils.RandomStr;
 import com.webflux.launchcommon.returnObj.Paged;
 import com.webflux.launchcommon.returnObj.RStatus;
 import jakarta.annotation.Resource;
@@ -1201,7 +1202,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
 
 
     private String get6Str() {
-        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        String string = RandomStr.getRandomStr();
         return string;
     }
     //背景

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/otherServices/OtherServicesImpl.java

@@ -13,6 +13,7 @@ import com.webflux.launchadmin.mysql.entity.planNew.DomainSelect;
 import com.webflux.launchadmin.mysql.entity.planNew.PlanNew;
 import com.webflux.launchadmin.mysql.entity.planNew.PlanNewCommon;
 import com.webflux.launchadmin.mysql.service.planNew.structure.Item;
+import com.webflux.launchadmin.utils.RandomStr;
 import com.webflux.launchcommon.returnObj.RStatus;
 import jakarta.annotation.Resource;
 import org.jetbrains.annotations.NotNull;
@@ -214,7 +215,7 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                 });
     }
     private String get6Str() {
-        return RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        return RandomStr.getRandomStr();
     }
 
 }

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

@@ -22,6 +22,7 @@ import com.webflux.launchadmin.mysql.service.planNew.structure.GoRequest;
 import com.webflux.launchadmin.mysql.service.planNew.structure.Item;
 import com.webflux.launchadmin.mysql.service.readBookPlan.ReadBookPlanServicesImpl;
 import com.webflux.launchadmin.mysql.service.readBookPlan.ReadBookPlanServicesInterface;
+import com.webflux.launchadmin.utils.RandomStr;
 import com.webflux.launchcommon.returnObj.RStatus;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -1469,7 +1470,7 @@ public class GoGenerateService {
     }
 
     private String get6Str() {
-        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        String string = RandomStr.getRandomStr();
         return string;
     }
     public String get7Str() {

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/readBookPlan/ReadBookPlanServicesImpl.java

@@ -22,6 +22,7 @@ import com.webflux.launchadmin.mysql.service.planNew.goGenerate.GoGenerateServic
 import com.webflux.launchadmin.mysql.service.planNew.structure.GoRequest;
 import com.webflux.launchadmin.mysql.service.planNew.structure.Item;
 import com.webflux.launchadmin.mysql.service.readBookPlan.data.AvatarInfo;
+import com.webflux.launchadmin.utils.RandomStr;
 import com.webflux.launchcommon.utils.StringUtils;
 import jakarta.annotation.Resource;
 import lombok.Data;
@@ -523,7 +524,7 @@ public class ReadBookPlanServicesImpl implements ReadBookPlanServicesInterface{
 
 
     private String get6Str() {
-        return RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
+        return RandomStr.getRandomStr();
     }
     public String goGenerateStr(String temStr){
         String body="";

launch-admin/src/main/java/com/webflux/launchadmin/utils/RandomStr.java

@@ -0,0 +1,16 @@
+package com.webflux.launchadmin.utils;
+
+import cn.hutool.core.util.RandomUtil;
+
+import java.util.List;
+
+public  class RandomStr {
+    public static String getRandomStr(){
+        List<String> list = List.of("qq", "baidu", "weixin");
+        return list.get(RandomUtil.randomInt(0, list.size()));
+      //  return RandomStr.getRandomStr();
+    }
+
+
+
+}