Merge branch 'feat/1005748' into 'master'

feat:[1005748]二维码加密

See merge request rays/pcloud-book!1442

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java

@@ -162,6 +162,24 @@ public class BookGroupDTO implements Serializable {
 
     private String groupQrcodeRemark;
     private String groupQrcodeLink;
+    private String preLink;
+    private String uuid;
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getPreLink() {
+        return preLink;
+    }
+
+    public void setPreLink(String preLink) {
+        this.preLink = preLink;
+    }
 
     public String getGroupQrcodeLink() {
         return groupQrcodeLink;

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java

@@ -315,16 +315,8 @@ import org.springframework.web.multipart.MultipartFile;
 import java.awt.*;
 import java.io.File;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Random;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -658,6 +650,11 @@ public class BookGroupBizImpl implements BookGroupBiz {
             }
             bookGroupDao.insert(bookGroup);
             String groupQrcodeLink = this.getGroupQrcodeLink(bookGroup.getId(), adviserId, joinGroupType, jumpType, jumpUrl);
+            String uuid = getUUID16();
+            String preLink = groupQrcodeLink;
+            if (!QrcodeJumpType.H5_SELF_URL.getCode().equals(jumpType)) {
+                groupQrcodeLink = bookGroupQrcodeDomain+"/"+uuid;
+            }
             String groupQrcodeUrl = QrcodeUtils.createWithMargin(groupQrcodeLink, 1);
             BookGroup group = new BookGroup();
             group.setId(bookGroup.getId());
@@ -669,6 +666,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
             bookGroupDao.update(group);
             bookGroup.setGroupQrcodeUrl(groupQrcodeUrl);
             bookGroup.setGroupQrcodeLink(groupQrcodeLink);
+            bookGroup.setPreLink(preLink);
+            bookGroup.setUuid(uuid);
         }
         if (null != bookId && !bookId.equals(0L)) {
             mainLineConsr.sendAddBookGroupTask(bookId, adviserId);
@@ -680,6 +679,24 @@ public class BookGroupBizImpl implements BookGroupBiz {
         return bookGroup;
     }
 
+
+    public static String getUUID16() {
+        StringBuffer shortBuffer = new StringBuffer();
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        for (int i = 0; i < 16; i++) {
+            String str = uuid.substring(i * 2, i * 2 + 2);
+            int x = Integer.parseInt(str, 16);
+            shortBuffer.append(chars[x % 0x3E]);
+        }
+        return shortBuffer.toString();
+
+    }
+    public static String[] chars = new String[] { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n",
+            "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8",
+            "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
+            "U", "V", "W", "X", "Y", "Z" };
+
+
     /**
      * 获取社群书群二维码信息
      */

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java

@@ -359,6 +359,25 @@ public class BookGroupDTO extends BaseDto {
      */
     private String uploadUserName;
 
+    private String preLink;
+    private String uuid;
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getPreLink() {
+        return preLink;
+    }
+
+    public void setPreLink(String preLink) {
+        this.preLink = preLink;
+    }
+
     public String getUploadUserName() {
         return uploadUserName;
     }

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/BookGroup.java

@@ -193,6 +193,17 @@ public class BookGroup extends BaseEntity {
      */
     private String jumpUrl;
 
+    private String preLink;
+    private String uuid;
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
     public Integer getJumpType() {
         return jumpType;
     }
@@ -236,6 +247,15 @@ public class BookGroup extends BaseEntity {
      */
     private Integer seq;
 
+
+    public String getPreLink() {
+        return preLink;
+    }
+
+    public void setPreLink(String preLink) {
+        this.preLink = preLink;
+    }
+
     public Integer getSeq() {
         return seq;
     }