cup 2 vuotta sitten
vanhempi
commit
6c5cf18b45

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

@@ -24,6 +24,7 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.*;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.pulsar.PulsarClientService;
+import com.qs.mp.common.utils.AESUtil;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.RSAUtil;
 import com.qs.mp.system.domain.SysUser;
@@ -399,13 +400,13 @@ 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()));
+						ticketExcel.setSerialNo(AESUtil.encrypt(ticket.getSerialNo()));
 					}else {
-						ticketExcel.setSerialNo(ticket.getSerialNo());
+						ticketExcel.setUrl(exportUrl + ticket.getSerialNo());
 					}
-					ticketExcel.setUrl(exportUrl + ticket.getSerialNo());
 					ticketExcel.setDrawNum(formatDraw(ticket.getDrawNum()));
 					if (!ServerEnvEnum.PROD.getCode().equals(env)) {
 						ticketExcel.setCipherLuckyNum(RSAUtil.decrypt(ticket.getCipherLuckyNum()));

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

@@ -217,6 +217,12 @@ public class UserTicketController extends BaseApiController {
       return AjaxResult.error("参数异常,盲票不存在");
     }
 
+    TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
+    if (ticketBox.getIsEncrypt() == 1 && match) {
+      return AjaxResult.error("非法访问!");
+    }
+
+
     /*if (ticket.getStatus() == TicketStatusEnum.CASHED) {
       return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1017);
     }*/
@@ -226,7 +232,6 @@ public class UserTicketController extends BaseApiController {
       return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1023);
     }
 
-    TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
 
     TicketVO ticketVO = new TicketVO();
     ticketVO.setPrizeList(ticketAwardsPrizeService.listPrizeVO(ticket.getBoxId()));