Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!681

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -399,7 +399,12 @@ public class TicketBoxMgrController extends BaseApiController {
 						&& StringUtils.isNotBlank(ticket.getDrawNum())
 						&& StringUtils.isNotBlank(ticket.getCipherLuckyNum())) {
 					TicketExcel ticketExcel = new TicketExcel();
-					ticketExcel.setSerialNo(ticket.getSerialNo());
+					if (ticketBox.getIsEncrypt() == 1){
+						// 加密序列号
+						ticketExcel.setSerialNo(RSAUtil.encrypt(ticket.getSerialNo()));
+					}else {
+						ticketExcel.setSerialNo(ticket.getSerialNo());
+					}
 					ticketExcel.setUrl(exportUrl + ticket.getSerialNo());
 					ticketExcel.setDrawNum(formatDraw(ticket.getDrawNum()));
 					if (!ServerEnvEnum.PROD.getCode().equals(env)) {

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -1,5 +1,6 @@
 package com.qs.mp.web.controller.api.user;
 
+import cn.hutool.core.util.ReUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +17,7 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.DistributedLocker;
 import com.qs.mp.common.enums.*;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.utils.AESUtil;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.StringUtils;
@@ -203,8 +205,14 @@ public class UserTicketController extends BaseApiController {
       return AjaxResult.error("参数异常，盲票序列号缺失");
     }
 
+    String serialNo = param.getSerialNo();
+    boolean match = ReUtil.isMatch("^\\w*-\\w*-\\w*$", serialNo);
+    if (!match) {
+      serialNo = AESUtil.decrypt(serialNo);
+    }
     Ticket ticket = ticketService.getOne(
-        new LambdaQueryWrapper<Ticket>().eq(Ticket::getSerialNo, param.getSerialNo()));
+            new LambdaQueryWrapper<Ticket>().eq(Ticket::getSerialNo, serialNo));
+
     if (null == ticket) {
       return AjaxResult.error("参数异常，盲票不存在");
     }