Pārlūkot izejas kodu

随机字符-v0.01

(cherry picked from commit 74e51cde60db780c1dbca7a620c4469da4dc5e35)
MOKASZ\lw12420 1 gadu atpakaļ
vecāks
revīzija
40471138fc

+ 5 - 0
launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/AlbumOutController.java

@@ -8,6 +8,11 @@ import jakarta.validation.constraints.NotNull;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;
 
+/**
+ * 相册对外接口
+ * @author lw12420
+ * @date 2024/08/12
+ */
 @RestController
 @RequestMapping("out/album")
 public class AlbumOutController {

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

@@ -521,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 = RandomStr.getRandomStr();
+                                String string = RandomStr.getRandomStr(request.getCode());
                                 String domain1 = domainSelect.domain();
                                 return Mono.just(string + "." + domain1);
 
@@ -543,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 = RandomStr.getRandomStr();
+                                String string = RandomStr.getRandomStr(request.getCode());
                                 String domain1 = domainSelect.domain();
                                 return Mono.just(string + "." + domain1);
                             } else {
@@ -563,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 = RandomStr.getRandomStr();
+                        String string = RandomStr.getRandomStr(request.getCode());
                         return Mono.just(string + "." + domain);
                     });
             return Mono.zip(stringMono2, stringMono1, stringMono).flatMap(fff -> {
@@ -598,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 = RandomStr.getRandomStr();
+                    String string = RandomStr.getRandomStr(request.getCode());
                     domainSelectRes.setDomain(string + "." + domain);
                     domainSelectRes.setPath("");
                     domainSelectRes.setUnique(IdUtil.fastSimpleUUID());
@@ -625,7 +625,7 @@ public class PlanNewCommonOutController {
                     .collectList().flatMap(fm -> {
                         int i = RandomUtil.randomInt(0, fm.size());
                         String domain = fm.get(i).domain();
-                        String string = RandomStr.getRandomStr();
+                        String string = RandomStr.getRandomStr(request.getCode());
                         return Mono.just(string + "." + domain);
                     });
         }
@@ -640,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 = RandomStr.getRandomStr();
+                            String string = RandomStr.getRandomStr(request.getCode());
                             String domain1 = domainSelect.domain();
                             return Mono.just(string + "." + domain1);
                         } else {
@@ -661,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 = RandomStr.getRandomStr();
+                            String string = RandomStr.getRandomStr(request.getCode());
                             String domain1 = domainSelect.domain();
                             return Mono.just(string + "." + domain1);
                         } else {
@@ -698,7 +698,7 @@ public class PlanNewCommonOutController {
                     .collectList().flatMap(fm -> {
                         int i = RandomUtil.randomInt(0, fm.size());
                         String domain = fm.get(i).domain();
-                        String string = RandomStr.getRandomStr();
+                        String string = RandomStr.getRandomStr(request.getCode());
                         return Mono.just(string + "." + domain);
                     });
         }
@@ -1442,7 +1442,7 @@ public class PlanNewCommonOutController {
                     if(!f2.isEmpty()){
                         DomainSelect domainSelect = f2.get(RandomUtil.randomInt(0, f2.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(code));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         if(2==type){
@@ -1466,8 +1466,8 @@ public class PlanNewCommonOutController {
                     return Mono.just(domain);
                 });
     }
-    private String get6Str() {
-        return RandomStr.getRandomStr();
+    private String get6Str(String code) {
+        return RandomStr.getRandomStr(code);
     }
 
 

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

@@ -248,7 +248,7 @@ public class PlanNewController {
 
     @PostMapping("test12")
     public Mono<String> test112() {
-        String string = RandomStr.getRandomStr();
+        String string = RandomStr.getRandomStr("code");
         return Mono.just(string);// goGenerateService.updatePoster12();
     }
 

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

@@ -122,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 = RandomStr.getRandomStr();
+                                    String string = RandomStr.getRandomStr(code);
                                     String domain1 = domainSelect.domain();
                                     return Mono.just(string+"."+domain1);
 
@@ -144,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 = RandomStr.getRandomStr();
+                                    String string = RandomStr.getRandomStr(code);
                                     String domain1 = domainSelect.domain();
                                     return Mono.just(string+"."+domain1);
                                 } else {
@@ -161,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 = RandomStr.getRandomStr();
+                            String string = RandomStr.getRandomStr(code);
                           //  domainSelectRes.setBackgroupDomain(f.backgroupDomain());
                          //   domainSelectRes.setTransferPageDomain(f.transferPageDomain());
                            // domainSelectRes.setTransferPageBl(f.transferPageBl());
@@ -201,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 = RandomStr.getRandomStr();
+            String string = RandomStr.getRandomStr(code);
             domainSelectRes.setDomain(string+"."+domain);
             domainSelectRes.setPath("");
             domainSelectRes.setUnique(IdUtil.fastSimpleUUID());

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

@@ -233,7 +233,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                                 if (Objects.nonNull(b) && !b.isEmpty()) {
                                     DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                                     stringBuilder.append("http://");
-                                    stringBuilder.append( get6Str());
+                                    stringBuilder.append( get6Str(a.code()));
                                     stringBuilder.append(".");
                                     stringBuilder.append(domainSelect.domain());
                                     stringBuilder.append("/index.html?code=");
@@ -568,7 +568,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                     if (Objects.nonNull(b) && !b.isEmpty()) {
                         DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(a.code()));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         stringBuilder.append("/index.html?code=");
@@ -815,7 +815,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                                 if (Objects.nonNull(b) && !b.isEmpty()) {
                                     DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                                     stringBuilder.append("http://");
-                                    stringBuilder.append( get6Str());
+                                    stringBuilder.append( get6Str(a.code()));
                                     stringBuilder.append(".");
                                     stringBuilder.append(domainSelect.domain());
                                     stringBuilder.append("/index.html?code=");
@@ -1173,7 +1173,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
         if (Objects.nonNull(b) && !b.isEmpty()) {
             DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
             stringBuilder.append("http://");
-            stringBuilder.append(get6Str());
+            stringBuilder.append(get6Str(a.code()));
             stringBuilder.append(".");
             stringBuilder.append(domainSelect.domain());
             stringBuilder.append("/index.html?code=");
@@ -1188,7 +1188,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
         if (Objects.nonNull(b) && !b.isEmpty()) {
             DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
             stringBuilder.append("http://");
-            stringBuilder.append(get6Str());
+            stringBuilder.append(get6Str(saveRequest.getCode()));
             stringBuilder.append(".");
             stringBuilder.append(domainSelect.domain());
             stringBuilder.append("/index.html?code=");
@@ -1201,8 +1201,8 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
     }
 
 
-    private String get6Str() {
-        String string = RandomStr.getRandomStr();
+    private String get6Str(String code) {
+        String string = RandomStr.getRandomStr(code);
         return string;
     }
     //背景

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

@@ -202,7 +202,7 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                     if(!f2.isEmpty()){
                         DomainSelect domainSelect = f2.get(RandomUtil.randomInt(0, f2.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(code));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         if(2==type){
@@ -224,8 +224,8 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                     return Mono.just(domain);
                 });
     }
-    private String get6Str() {
-        return RandomStr.getRandomStr();
+    private String get6Str(String code ) {
+        return RandomStr.getRandomStr(code);
     }
 
 }

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

@@ -932,7 +932,7 @@ public class GoGenerateService {
                     if (Objects.nonNull(b) && !b.isEmpty()) {
                         DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(saveRequest.getCode()));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         if (3 == saveRequest.getType() || 4 == saveRequest.getType()) {
@@ -966,7 +966,7 @@ public class GoGenerateService {
                         if (Objects.nonNull(b) && !b.isEmpty()) {
                             DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                             stringBuilder.append("http://");
-                            stringBuilder.append(get6Str());
+                            stringBuilder.append(get6Str(saveRequest.code()));
                             stringBuilder.append(".");
                             stringBuilder.append(domainSelect.domain());
                             stringBuilder.append("/index.html?code=");
@@ -996,7 +996,7 @@ public class GoGenerateService {
                         if (Objects.nonNull(b) && !b.isEmpty()) {
                             DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                             stringBuilder.append("http://");
-                            stringBuilder.append(get6Str());
+                            stringBuilder.append(get6Str(saveRequest.code()));
                             stringBuilder.append(".");
                             stringBuilder.append(domainSelect.domain());
                             if (3 == saveRequest.type() || 4 == saveRequest.type()) {
@@ -1026,7 +1026,7 @@ public class GoGenerateService {
                         if (Objects.nonNull(b) && !b.isEmpty()) {
                             DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                             stringBuilder.append("http://");
-                            stringBuilder.append(get6Str());
+                            stringBuilder.append(get6Str(saveRequest.getCode()));
                             stringBuilder.append(".");
                             stringBuilder.append(domainSelect.domain());
                             stringBuilder.append("/index.html?code=");
@@ -1046,7 +1046,7 @@ public class GoGenerateService {
                                 if (Objects.nonNull(b) && !b.isEmpty()) {
                                     DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                                     stringBuilder.append("http://");
-                                    stringBuilder.append(get6Str());
+                                    stringBuilder.append(get6Str(saveRequest.getCode()));
                                     stringBuilder.append(".");
                                     stringBuilder.append(domainSelect.domain());
                                     stringBuilder.append("/index.html?code=");
@@ -1071,7 +1071,7 @@ public class GoGenerateService {
                     if (Objects.nonNull(b) && !b.isEmpty()) {
                         DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(a.code()));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         stringBuilder.append("/index.html?code=");
@@ -1098,7 +1098,7 @@ public class GoGenerateService {
                     if (Objects.nonNull(b) && !b.isEmpty()) {
                         DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(a.code()));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         stringBuilder.append("/index.html?code=");
@@ -1145,7 +1145,7 @@ public class GoGenerateService {
             if (Objects.nonNull(b) && !b.isEmpty()) {
                 DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                 stringBuilder.append("http://");
-                stringBuilder.append(get6Str());
+                stringBuilder.append(get6Str(a.code()));
                 stringBuilder.append(".");
                 stringBuilder.append(domainSelect.domain());
                 if (3 == a.type() || 4 ==a.type()) {
@@ -1190,7 +1190,7 @@ public class GoGenerateService {
                     if (Objects.nonNull(b) && !b.isEmpty()) {
                         DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(a.code()));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         stringBuilder.append("/index.html?code=");
@@ -1409,7 +1409,7 @@ public class GoGenerateService {
                     if (!f2.isEmpty()) {
                         DomainSelect domainSelect = f2.get(RandomUtil.randomInt(0, f2.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(code));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         if (3 == type || 4==type) {
@@ -1447,7 +1447,7 @@ public class GoGenerateService {
                                 if (Objects.nonNull(b) && !b.isEmpty()) {
                                     DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                                     stringBuilder.append("http://");
-                                    stringBuilder.append(get6Str());
+                                    stringBuilder.append(get6Str(a.code()));
                                     stringBuilder.append(".");
                                     stringBuilder.append(domainSelect.domain());
                                     stringBuilder.append("/index.html?code=");
@@ -1469,8 +1469,8 @@ public class GoGenerateService {
         return stringBuilderMono;
     }
 
-    private String get6Str() {
-        String string = RandomStr.getRandomStr();
+    private String get6Str(String code ) {
+        String string = RandomStr.getRandomStr(code);
         return string;
     }
     public String get7Str() {

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

@@ -506,7 +506,7 @@ public class ReadBookPlanServicesImpl implements ReadBookPlanServicesInterface{
                     if (Objects.nonNull(b) && !b.isEmpty()) {
                         DomainSelect domainSelect = b.get(RandomUtil.randomInt(0, b.size()));
                         stringBuilder.append("http://");
-                        stringBuilder.append(get6Str());
+                        stringBuilder.append(get6Str(a.code()));
                         stringBuilder.append(".");
                         stringBuilder.append(domainSelect.domain());
                         stringBuilder.append("/index.html?code=");
@@ -521,10 +521,8 @@ public class ReadBookPlanServicesImpl implements ReadBookPlanServicesInterface{
         );
     }
 
-
-
-    private String get6Str() {
-        return RandomStr.getRandomStr();
+    private String get6Str(String code) {
+        return RandomStr.getRandomStr(code);
     }
     public String goGenerateStr(String temStr){
         String body="";

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

@@ -3,13 +3,23 @@ package com.webflux.launchadmin.utils;
 import cn.hutool.core.util.RandomUtil;
 
 import java.util.List;
+import java.util.Objects;
 
 public  class RandomStr {
-    public static String getRandomStr(){
-        List<String> list = List.of("qq", "baidu", "weixin");
-        String s = list.get(RandomUtil.randomInt(0, list.size()));
-        String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 7);
-        return s+"-"+string;
+    public static String getRandomStr(String code){
+        List<String> list1 = List.of("07e3138d92454920b975c5a07d8c0e17", "835c9959339f495d921d6555c03aa6dc");
+        if(Objects.isNull(code)||!list1.contains(code)){
+            List<String> list = List.of("qq", "baidu", "weixin");
+            String s = list.get(RandomUtil.randomInt(0, list.size()));
+            String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 7);
+            return s+"-"+string;
+        }else {
+            List<String> list2 = List.of("weixin.qq.com", "baidu.com", "sina.com", "qq.com", "apple.com.cn", "apple.com", "huawei.com", "mi.com", "jd.com");
+            String s = list2.get(RandomUtil.randomInt(0, list2.size()));
+            return s;
+        }
+
+      //  return s+"-"+string;
       //  return RandomStr.getRandomStr(); String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 7);
     }