MOKASZ\lw12420 1 год назад
Родитель
Сommit
61cb37823b

+ 10 - 3
launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewCommonController.java

@@ -15,11 +15,13 @@ import com.webflux.launchadmin.mysql.entity.planNew.PlanNew;
 import com.webflux.launchadmin.mysql.entity.planNew.PlanNewBackgroupPoster;
 import com.webflux.launchadmin.mysql.entity.planNew.PlanNewCommon;
 import com.webflux.launchadmin.mysql.entity.planNew.Poster;
+import com.webflux.launchadmin.mysql.service.customCode.CustomCodeServer;
 import com.webflux.launchadmin.mysql.service.planNew.goGenerate.GoGenerateService;
 import com.webflux.launchadmin.mysql.service.planNew.structure.GoRequest;
 import com.webflux.launchcommon.returnObj.RStatus;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.data.relational.core.query.Criteria;
@@ -47,7 +49,8 @@ public class PlanNewCommonController {
 
     @Resource
     private GoGenerateService goGenerateService;
-
+    @Autowired
+    private CustomCodeServer customCodeServer;
 
     /**
      * 保存计划
@@ -75,12 +78,16 @@ public class PlanNewCommonController {
     private Mono<RStatus<String>> savePlanCommon(PlanReq saveRequest) {
         String userName = BaseContextHandler.getUserName();
         String userId = BaseContextHandler.getUserId();
-        saveRequest.setCode(IdUtil.fastSimpleUUID());
+        Mono<String> code = customCodeServer.getCode().flatMap(newCode->{
+            saveRequest.setCode(newCode);
+            return Mono.just(newCode);
+        });
+       // saveRequest.setCode(IdUtil.fastSimpleUUID());
         Mono<String> previewUrl;
         if (saveRequest.getType() == 8) {//复粉
              previewUrl = Mono.just("");
         }else {
-             previewUrl = this.getPreviewUrl(saveRequest);
+             previewUrl = code.then(this.getPreviewUrl(saveRequest));
         }
         Mono<PlanNewCommon> insert = previewUrl.flatMap(f -> {
             PlanNewCommon plan = new PlanNewCommon(

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

@@ -1533,7 +1533,7 @@ public class PlanNewCommonOutController {
                         }
                         stringBuilder.append(code);
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                         if (isAddGroup) {
                             stringBuilder.append("&id=57");
                         }

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

@@ -17,6 +17,7 @@ import com.webflux.launchadmin.mysql.entity.lb.HomePageTempItem;
 import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNew;
 import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNewBackgroupPoster;
 import com.webflux.launchadmin.mysql.entity.planNew.*;
+import com.webflux.launchadmin.mysql.service.customCode.CustomCodeServer;
 import com.webflux.launchadmin.mysql.service.listening.ListeningPlanServiceInterface;
 import com.webflux.launchadmin.mysql.service.planNew.PlanServiceInterface;
 import com.webflux.launchadmin.mysql.service.planNew.goGenerate.GoGenerateService;
@@ -59,6 +60,8 @@ public class PlanNewController {
     private ListeningPlanServiceInterface listeningPlanService;
     @Resource
     private PlanServiceInterface planServiceInterface;
+    @Resource
+    private CustomCodeServer customCodeServer;
 
     @GetMapping("tt")
     public String tt() {
@@ -478,11 +481,15 @@ public class PlanNewController {
         } else if (1 == saveRequest.getType()) {
             String userName = BaseContextHandler.getUserName();
             String userId = BaseContextHandler.getUserId();
-            saveRequest.setCode(IdUtil.fastSimpleUUID());
+           // saveRequest.setCode(IdUtil.fastSimpleUUID());
+            Mono<String> code = customCodeServer.getCode().flatMap(newCode->{
+                saveRequest.setCode(newCode);
+                return Mono.just(newCode);
+            });
             Long posterTemplateId = saveRequest.getPosterTemplateId();
-            Mono<String> stringMono1 = template
+            Mono<String> stringMono1 = code.then(template
                     .select(Query.query(Criteria.where("poster_template_id")
-                                    .is(posterTemplateId))
+                            .is(posterTemplateId))
                             .sort(Sort.by(Sort.Order.asc("created_at"))), Poster.class)
                     .collectList().flatMap(f -> {
                         Poster poster = f.get(0);
@@ -491,12 +498,11 @@ public class PlanNewController {
                         GoRequest goRequest = new GoRequest();
                         BeanUtil.copyProperties(jsonObject, goRequest);
                         ServiceGroupSettingItemRequest serviceGroupSettingItemRequest = saveRequest.getBackgroupFxSetting().get(0);
-                        Mono<String> stringMono = goGenerateService.saveAndUpdatePlanGenerateImage0(goRequest,
+                        return goGenerateService.saveAndUpdatePlanGenerateImage0(goRequest,
                                 goGenerateService.setCusqrcodeSetV(goRequest),// getStringBuilderMono(goRequest),
                                 serviceGroupSettingItemRequest,
                                 saveRequest);
-                        return stringMono;
-                    });
+                    }));
             Mono<StringBuilder> stringBuilderMono;
             if (saveRequest.getRedirectType() == 2) {
                 stringBuilderMono = Mono.just(new StringBuilder()); // goGenerateService.byPlanNewIdGetUrl(saveRequest.getRedirectPlanId());

+ 33 - 13
launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/customCode/CustomCodeServer.java

@@ -1,9 +1,13 @@
 package com.webflux.launchadmin.mysql.service.customCode;
 
+import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNew;
+import com.webflux.launchadmin.mysql.entity.planNew.PlanNew;
+import com.webflux.launchadmin.mysql.entity.planNew.PlanNewCommon;
 import com.webflux.launchadmin.utils.RandomStr;
 import jakarta.annotation.Resource;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
 import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.relational.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -16,16 +20,24 @@ import java.util.concurrent.locks.ReentrantLock;
 @Service
 public class CustomCodeServer {
 
-    private final ConcurrentHashMap<Object, Lock> lockMap = new ConcurrentHashMap<>();
     @Resource
     private R2dbcEntityTemplate template;
+    @Resource
+    private ReactiveRedisTemplate<String,String> reactiveRedisTemplate;
+    private final long startNum=123456;
+    private final ReentrantLock lock = new ReentrantLock();
+
+    public Mono<Long> incrementKey() {
+        // 自增 1
+        String codeIncreaseKey = "java-code-value-Increase-Key";
+        return reactiveRedisTemplate.opsForValue().increment(codeIncreaseKey);
+    }
 
     @NotNull
-    public <T> Mono<String> getCode(Class<T> objClass){
-        Lock lock = lockMap.computeIfAbsent(objClass, k -> new ReentrantLock());
+    public  Mono<String> getCode(){
         try {
             lock.lock();
-            return getCount(objClass);
+            return getCount();
         } finally {
             lock.unlock();
         }
@@ -33,18 +45,26 @@ public class CustomCodeServer {
 
     /**
      * 随机 数据库 验证
-     * @param objClass
-     * @param <T>
      * @return
      */
     @NotNull
-    private <T> Mono<String> getCount(Class<T> objClass) {
-        String newCode = RandomStr.generateUniqueId1();
-        return template.count(Query.query(Criteria.where("code").is(newCode)), objClass).flatMap(count->{
-            if(count>0){
-              return   getCount(objClass);
-            }
-            return Mono.just(newCode);
+    private  Mono<String> getCount() {
+        Mono<Long> longMono = incrementKey();
+       return longMono.flatMap(incre->{
+            String newCode = RandomStr.generateUniqueId1(startNum+incre);
+           Query query = Query.query(Criteria.where("code").is(newCode));
+           Mono<Long> code = template.count(query, PlanNew.class);
+           Mono<Long> code1 = template.count(query, ListeningPlanNew.class);
+           Mono<Long> code2 = template.count(query, PlanNewCommon.class);
+           return   Mono.zip(code,code1,code2).flatMap(tuple3->{
+               Long t1 = tuple3.getT1();
+               Long t2 = tuple3.getT2();
+               Long t3 = tuple3.getT3();
+               if(t1>0 || t2>0 || t3>0){
+                    return  getCount();
+                }
+                return Mono.just(newCode);
+            });
         });
     }
 }

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

@@ -20,6 +20,7 @@ import com.webflux.launchadmin.mysql.entity.listening.ListeningAudio;
 import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNew;
 import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNewBackgroupPoster;
 import com.webflux.launchadmin.mysql.entity.planNew.*;
+import com.webflux.launchadmin.mysql.service.customCode.CustomCodeServer;
 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;
@@ -32,6 +33,7 @@ import com.webflux.launchcommon.returnObj.RStatus;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
@@ -62,6 +64,8 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
     private SyncListeningAudioToRedis syncListeningAudioToRedis;
     @Resource
     private SyncPlanNewListenToRedis syncPlanNewListenToRedis;
+    @Autowired
+    private CustomCodeServer customCodeServer;
     @Override
     public Mono<RStatus<Paged<ListeningPlanNewRes2>>> page(PlanReqPage request, Criteria criteria) {
         Query query = Query.query(criteria);
@@ -116,29 +120,34 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
         String userId = BaseContextHandler.getUserId();
         //save
         boolean bl=Objects.isNull(saveRequest.getPlanNewId()) || "".equals(saveRequest.getPlanNewId().trim());
+        Mono<String> code =Mono.just("");
         if(bl){
-            saveRequest.setCode(IdUtil.fastSimpleUUID());
+           // saveRequest.setCode(IdUtil.fastSimpleUUID());
+            code = customCodeServer.getCode().flatMap(newCode->{
+                saveRequest.setCode(newCode);
+                return Mono.just(newCode);
+            });
         }
         Long posterTemplateId = saveRequest.getPosterTemplateId();
         //预览Url
-         Mono<String> stringMono1 = template
-                .select(Query.query(Criteria.where("poster_template_id")
-                        .is(posterTemplateId)).sort(Sort.by(Sort.Order.asc("created_at"))), Poster.class)
-                .collectList().flatMap(f -> {
-                    Poster poster = f.get(0);
-                    String posterTemplate = poster.posterTemplate();
-                    JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
-                    GoRequest goRequest = new GoRequest();
-                    BeanUtil.copyProperties(jsonObject, goRequest);
-                    ServiceGroupSettingItemRequest serviceGroupSettingItemRequest = saveRequest.getBackgroupFxSetting().get(0);
-                    System.out.println(goRequest);
-                    Mono<String> stringMono = saveAndUpdatePlanGenerateImage0(goRequest,
-                            //setCusqrcodeRtUrl(goRequest),
-                            goGenerateService.setCusqrcodeSetV(goRequest),
-                            serviceGroupSettingItemRequest,
-                            saveRequest);
-                    return stringMono;
-                });
+         Mono<String> stringMono1 = code.then(template
+                 .select(Query.query(Criteria.where("poster_template_id")
+                         .is(posterTemplateId)).sort(Sort.by(Sort.Order.asc("created_at"))), Poster.class)
+                 .collectList().flatMap(f -> {
+                     Poster poster = f.get(0);
+                     String posterTemplate = poster.posterTemplate();
+                     JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
+                     GoRequest goRequest = new GoRequest();
+                     BeanUtil.copyProperties(jsonObject, goRequest);
+                     ServiceGroupSettingItemRequest serviceGroupSettingItemRequest = saveRequest.getBackgroupFxSetting().get(0);
+                     System.out.println(goRequest);
+                     Mono<String> stringMono = saveAndUpdatePlanGenerateImage0(goRequest,
+                             //setCusqrcodeRtUrl(goRequest),
+                             goGenerateService.setCusqrcodeSetV(goRequest),
+                             serviceGroupSettingItemRequest,
+                             saveRequest);
+                     return stringMono;
+                 }));
         Mono<StringBuilder> link=Mono.just(new StringBuilder(saveRequest.getLink()));
         Mono<ListeningPlanNew> insert = Mono.zip(stringMono1, link).flatMap(f->{
 
@@ -239,7 +248,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                                     stringBuilder.append("/index.html?code=");
                                     stringBuilder.append(a.code());
                                     stringBuilder.append("&sk=");
-                                    stringBuilder.append(IdUtil.fastSimpleUUID());
+                                    stringBuilder.append(RandomStr.generateUseSk());
                                 }else {
                                     throw new BaseException("通过计划id3:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
                                 }
@@ -574,7 +583,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                         stringBuilder.append("/index.html?code=");
                         stringBuilder.append(a.code());
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                     }else {
                         throw new BaseException("二维码链接:::通过计划id4:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
                     }
@@ -821,7 +830,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                                     stringBuilder.append("/index.html?code=");
                                     stringBuilder.append(a.code());
                                     stringBuilder.append("&sk=");
-                                    stringBuilder.append(IdUtil.fastSimpleUUID());
+                                    stringBuilder.append(RandomStr.generateUseSk());
                                 }else {
                                     throw new BaseException("通过计划id5:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
                                 }
@@ -1179,7 +1188,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
             stringBuilder.append("/index.html?code=");
             stringBuilder.append(a.code());
             stringBuilder.append("&sk=");
-            stringBuilder.append(IdUtil.fastSimpleUUID());
+            stringBuilder.append(RandomStr.generateUseSk());
         }else {
             throw new BaseException("通过计划id1:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
         }
@@ -1194,7 +1203,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
             stringBuilder.append("/index.html?code=");
             stringBuilder.append(saveRequest.getCode());
             stringBuilder.append("&sk=");
-            stringBuilder.append(IdUtil.fastSimpleUUID());
+            stringBuilder.append(RandomStr.generateUseSk());
         }else {
             throw new BaseException("通过计划id2:"+saveRequest.getPlanNewId() +"的营销类型查询域名为空");
         }

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

@@ -215,7 +215,7 @@ public class OtherServicesImpl implements   OtherServicesInterface {
 
                         stringBuilder.append(code);
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                     }else {
                         return Mono.error(new BaseException(StrUtil.format("通过code:{},groupId:{};查询域名Error::{}",code,groupId,"错误")));
                     }

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

@@ -957,7 +957,7 @@ public class GoGenerateService {
                         }
                         stringBuilder.append(saveRequest.getCode());
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                     } else {
                         throw new BaseException("通过入口页域名值查询域名返回结果为空");
                     }
@@ -986,7 +986,7 @@ public class GoGenerateService {
                             stringBuilder.append("/index.html?code=");
                             stringBuilder.append(saveRequest.code());
                             stringBuilder.append("&sk=");
-                            stringBuilder.append(IdUtil.fastSimpleUUID());
+                            stringBuilder.append(RandomStr.generateUseSk());
                         } else {
                             throw new BaseException("通过入口页域名值查询域名返回结果为空");
                         }
@@ -1021,7 +1021,7 @@ public class GoGenerateService {
                             }
                             stringBuilder.append(saveRequest.code());
                             stringBuilder.append("&sk=");
-                            stringBuilder.append(IdUtil.fastSimpleUUID());
+                            stringBuilder.append(RandomStr.generateUseSk());
                         } else {
                             throw new BaseException("通过入口页域名值查询域名返回结果为空");
                         }
@@ -1046,7 +1046,7 @@ public class GoGenerateService {
                             stringBuilder.append("/index.html?code=");
                             stringBuilder.append(saveRequest.getCode());
                             stringBuilder.append("&sk=");
-                            stringBuilder.append(IdUtil.fastSimpleUUID());
+                            stringBuilder.append(RandomStr.generateUseSk());
                         }
                         return Mono.just(stringBuilder);
                     });
@@ -1066,7 +1066,7 @@ public class GoGenerateService {
                                     stringBuilder.append("/index.html?code=");
                                     stringBuilder.append(a.code());
                                     stringBuilder.append("&sk=");
-                                    stringBuilder.append(IdUtil.fastSimpleUUID());
+                                    stringBuilder.append(RandomStr.generateUseSk());
                                 }
                                 return stringBuilder;
                             })
@@ -1091,7 +1091,7 @@ public class GoGenerateService {
                         stringBuilder.append("/index.html?code=");
                         stringBuilder.append(a.code());
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                     }
                     return stringBuilder;
                 })
@@ -1118,7 +1118,7 @@ public class GoGenerateService {
                         stringBuilder.append("/index.html?code=");
                         stringBuilder.append(a.code());
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                     }
                     return stringBuilder;
                 }));
@@ -1170,7 +1170,7 @@ public class GoGenerateService {
                 }
                 stringBuilder.append(a.code());
                 stringBuilder.append("&sk=");
-                stringBuilder.append(IdUtil.fastSimpleUUID());
+                stringBuilder.append(RandomStr.generateUseSk());
             }
             return stringBuilder;
         });
@@ -1210,7 +1210,7 @@ public class GoGenerateService {
                         stringBuilder.append("/index.html?code=");
                         stringBuilder.append(a.code());
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                     }
                     return stringBuilder;
                 })
@@ -1434,7 +1434,7 @@ public class GoGenerateService {
                         }
                         stringBuilder.append(code);
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                         ftm.setV(stringBuilder.toString());
                         ftm.setName("H5二维码");
                     } else {
@@ -1467,7 +1467,7 @@ public class GoGenerateService {
                                     stringBuilder.append("/index.html?code=");
                                     stringBuilder.append(a.code());
                                     stringBuilder.append("&sk=");
-                                    stringBuilder.append(IdUtil.fastSimpleUUID());
+                                    stringBuilder.append(RandomStr.generateUseSk());
                                 }
                                 Optional<Item> first = collect.stream()
                                         .filter(ft -> ft.getPlanId()

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

@@ -512,7 +512,7 @@ public class ReadBookPlanServicesImpl implements ReadBookPlanServicesInterface{
                         stringBuilder.append("/index.html?code=");
                         stringBuilder.append(a.code());
                         stringBuilder.append("&sk=");
-                        stringBuilder.append(IdUtil.fastSimpleUUID());
+                        stringBuilder.append(RandomStr.generateUseSk());
                     }else {
                         throw new BaseException("海报 二维码 自动生成匹配链接:::通过计划id:"+a.id() +"的营销类型查询域名为空");
                     }

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

@@ -5,13 +5,15 @@ import cn.hutool.core.util.RandomUtil;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public  class RandomStr {
     private   static final List<String> list1 = List.of("07e3138d92454920b975c5a07d8c0e17", "835c9959339f495d921d6555c03aa6dc","057ef6fddb394f7080350bd9237575ba");
     private   static final 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");
     private  static  final  String RandomString="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
     private static final  String  StrRandomAll="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
+    private static final  String  StrRandomAllX="0lmyqjk9up6wxt127cd8arefg34no5hivsbz";
 
     public static String getRandomStr(String code){
         if(Objects.isNull(code)||!list1.contains(code)){
@@ -24,12 +26,25 @@ public  class RandomStr {
 
     }
 
-    public static String generateUniqueId1() {
-        return RandomUtil.randomString(StrRandomAll, 6);
+    public static String generateUniqueId1(long num) {
+        String s = String.valueOf(num);
+        String[] split = s.split("");
+        return Stream.of(split).map(idx -> {
+            int i = Integer.parseInt(idx);
+           return StrRandomAllX.substring(i,i+1);
+        }).collect(Collectors.joining());
+        //return RandomUtil.randomString(StrRandomAll, 6);
        // return UUID.randomUUID().toString().substring(0, 6);
     }
 
-
+    /**
+     * 设置sk
+     * @return
+     */
+    public static String generateUseSk() {
+        //RandomStr.generateUseSk()
+        return RandomUtil.randomString(StrRandomAll, 6);
+    }
     public static String base62Encode(long value) {
         final String base62 = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
         StringBuilder sb = new StringBuilder();
@@ -43,6 +58,10 @@ public  class RandomStr {
         return sb.reverse().toString();
     }
 
+    /**
+     * 不用
+     * @return
+     */
     public static String generateUniqueId2() {
         return base62Encode(System.currentTimeMillis() % 1000000);
     }