diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackReqVO.java index 21f579896..6dc4ababf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackReqVO.java @@ -19,14 +19,10 @@ public class PicPackReqVO { @NotNull(message = "文件ID不能为空") @ApiModelProperty(value = "文件ID") private Long fileId; - /** - * 图片验证码UUID - */ - @ApiModelProperty(value = "图片验证码UUID") - private String uuid; - /** - * 图片验证码CODE - */ - @ApiModelProperty(value = "图片验证码CODE") - private String code; + + @ApiModelProperty("ticket(图像验证参数)") + private String ticket; + + @ApiModelProperty("randstr(图像验证参数)") + private String randstr; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackReqDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackReqDTO.java index 459f3199d..c4de8ad34 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackReqDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackReqDTO.java @@ -17,11 +17,11 @@ public class PicPackReqDTO { */ private Long fileId; /** - * 图片验证码UUID + * ticket(图像验证参数) */ - private String uuid; + private String ticket; /** - * 图片验证码CODE + * randstr(图像验证参数) */ - private String code; + private String randstr; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 896558487..94ee33904 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -50,6 +50,7 @@ import com.ruoyi.xkt.dto.storeProductFile.StoreProdMainPicDTO; import com.ruoyi.xkt.dto.userBrowsingHistory.UserBrowsingHisDTO; import com.ruoyi.xkt.dto.userNotice.UserFocusAndFavUserIdDTO; import com.ruoyi.xkt.enums.*; +import com.ruoyi.xkt.manager.TencentAuthManager; import com.ruoyi.xkt.mapper.*; import com.ruoyi.xkt.service.IPictureService; import com.ruoyi.xkt.service.IStoreProductService; @@ -110,6 +111,7 @@ public class StoreProductServiceImpl implements IStoreProductService { final UserNoticeMapper userNoticeMapper; final UserSubscriptionsMapper userSubMapper; final OSSClientWrapper ossClient; + final TencentAuthManager tencentAuthManager; /** @@ -647,12 +649,15 @@ public class StoreProductServiceImpl implements IStoreProductService { //3次请求后需要输入验证码 if (reqCount > 2) { //需验证验证码 - if (StrUtil.isEmpty(picPackReqDTO.getCode()) || StrUtil.isEmpty(picPackReqDTO.getUuid())) { + if (StrUtil.isEmpty(picPackReqDTO.getTicket()) || StrUtil.isEmpty(picPackReqDTO.getRandstr())) { //未传验证码 return new PicPackInfoDTO(true); } //验证码校验 - validateCaptcha(picPackReqDTO.getCode(), picPackReqDTO.getUuid()); + boolean pass = tencentAuthManager.validate(picPackReqDTO.getTicket(), picPackReqDTO.getRandstr()); + if (!pass) { + throw new ServiceException("验证未通过"); + } //重置请求次数 reqCount = 0; }