BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整

pull/1121/head
梁宇奇 2025-08-06 21:41:07 +08:00
parent c8b4d99eb1
commit d2b1906108
9 changed files with 126 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -298,6 +298,14 @@
</dependency>
<!-- ES相关 end-->
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java</artifactId>
<!-- go to https://central.sonatype.com/artifact/com.tencentcloudapi/tencentcloud-sdk-java/versions and get the latest version. -->
<!-- 请到 https://central.sonatype.com/artifact/com.tencentcloudapi/tencentcloud-sdk-java/versions 查询所有版本，最新版本如下 -->
<version>3.1.1000</version>
</dependency>
</dependencies>
</dependencyManagement>

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -23,7 +23,7 @@ import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.web.controller.system.vo.*;
import com.ruoyi.xkt.manager.AliAuthManager;
import com.ruoyi.xkt.manager.TencentAuthManager;
import com.ruoyi.xkt.service.IStoreService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -62,7 +62,7 @@ public class SysLoginController {
@Autowired
private RedisCache redisCache;
@Autowired
private AliAuthManager aliAuthManager;
private TencentAuthManager tencentAuthManager;
@Autowired
private SysPasswordService passwordService;
@ -75,8 +75,7 @@ public class SysLoginController {
@ApiOperation(value = "用户名密码登录")
@PostMapping("/loginByUname")
public AjaxResult login(@Validated @RequestBody LoginByUsernameVO loginBody) {
boolean captchaPass = aliAuthManager.validate(loginBody.getLot_number(), loginBody.getCaptcha_output(),
loginBody.getPass_token(), loginBody.getGen_time());
boolean captchaPass = tencentAuthManager.validate(loginBody.getTicket(), loginBody.getRandstr());
if (!captchaPass) {
return AjaxResult.error("验证失败");
}
@ -110,8 +109,7 @@ public class SysLoginController {
@ApiOperation(value = "发送登录短信验证码")
@PostMapping("/sendSmsVerificationCode")
public R sendSmsVerificationCode(@Validated @RequestBody LoginSmsReqVO vo) {
boolean captchaPass = aliAuthManager.validate(vo.getLot_number(), vo.getCaptcha_output(),
vo.getPass_token(), vo.getGen_time());
boolean captchaPass = tencentAuthManager.validate(vo.getTicket(), vo.getRandstr());
if (!captchaPass) {
return R.fail("验证失败");
}

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
View File

@ -16,7 +16,7 @@ import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.web.controller.system.vo.LoginSmsReqVO;
import com.ruoyi.web.controller.system.vo.RegisterBySmsCodeVO;
import com.ruoyi.web.controller.xkt.vo.PhoneNumberVO;
import com.ruoyi.xkt.manager.AliAuthManager;
import com.ruoyi.xkt.manager.TencentAuthManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -48,7 +48,7 @@ public class SysRegisterController extends BaseController {
private ISysUserService userService;
@Autowired
private AliAuthManager aliAuthManager;
private TencentAuthManager tencentAuthManager;
@ApiOperation(value = "档口供应商注册")
@PostMapping("/registerStore")
@ -95,8 +95,7 @@ public class SysRegisterController extends BaseController {
@ApiOperation(value = "发送注册短信验证码")
@PostMapping("/sendSmsVerificationCode")
public R sendSmsVerificationCode(@Validated @RequestBody LoginSmsReqVO vo) {
boolean captchaPass = aliAuthManager.validate(vo.getLot_number(), vo.getCaptcha_output(),
vo.getPass_token(), vo.getGen_time());
boolean captchaPass = tencentAuthManager.validate(vo.getTicket(), vo.getRandstr());
if (!captchaPass) {
return R.fail("验证失败");
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/LoginByUsernameVO.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.web.controller.system.vo;
import com.ruoyi.web.controller.xkt.vo.AliCaptchaAuthReqVO;
import com.ruoyi.web.controller.xkt.vo.TencentCaptchaAuthReqVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -17,7 +17,7 @@ import javax.validation.constraints.NotEmpty;
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LoginByUsernameVO extends AliCaptchaAuthReqVO {
public class LoginByUsernameVO extends TencentCaptchaAuthReqVO {
/**
* 用户名
*/

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/LoginSmsReqVO.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.web.controller.system.vo;
import com.ruoyi.web.controller.xkt.vo.AliCaptchaAuthReqVO;
import com.ruoyi.web.controller.xkt.vo.TencentCaptchaAuthReqVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -18,7 +18,7 @@ import javax.validation.constraints.Pattern;
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LoginSmsReqVO extends AliCaptchaAuthReqVO {
public class LoginSmsReqVO extends TencentCaptchaAuthReqVO {
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
@NotEmpty(message = "手机号不能为空")

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/TencentCaptchaAuthReqVO.java 100644
View File

@ -0,0 +1,24 @@
package com.ruoyi.web.controller.xkt.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
/**
* @author liangyq
* @date 2025-07-22
*/
@ApiModel
@Data
public class TencentCaptchaAuthReqVO {
@NotEmpty(message = "ticket不能为空")
@ApiModelProperty("ticket（图像验证参数）")
private String ticket;
@NotEmpty(message = "randstr不能为空")
@ApiModelProperty("randstr（图像验证参数）")
private String randstr;
}

8
ruoyi-admin/src/main/resources/application.yml
View File

@ -226,3 +226,11 @@ aliauth:
captcha:
appId: 386ec134856c9fe7d47ce2a34ee91038
appKey: 1b4e3ff703ca1ea0fb802d188079a25c
# 腾讯认证
tencent:
secretId: AKIDEbxNfmkW5RaVDhDc2Pcs198zpeP6kEZi
secretKey: 3ub7QZYN9qR4bxBE6qQs9GBuSnuoW0JP
captcha:
captchaAppId: 199022475
appSecretKey: wcqMdqjV3fnvFKxUAq5mwulnD

5
ruoyi-common/pom.xml
View File

@ -193,6 +193,11 @@
<version>1.16.1</version>
</dependency>
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java</artifactId>
</dependency>
</dependencies>
</project>

70
xkt/src/main/java/com/ruoyi/xkt/manager/TencentAuthManager.java 100644
View File

@ -0,0 +1,70 @@
package com.ruoyi.xkt.manager;
import com.ruoyi.common.utils.ip.IpUtils;
import com.tencentcloudapi.captcha.v20190722.CaptchaClient;
import com.tencentcloudapi.captcha.v20190722.models.DescribeCaptchaResultRequest;
import com.tencentcloudapi.captcha.v20190722.models.DescribeCaptchaResultResponse;
import com.tencentcloudapi.common.AbstractModel;
import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.profile.ClientProfile;
import com.tencentcloudapi.common.profile.HttpProfile;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
* @author liangyq
* @date 2025-08-06
*/
@Slf4j
@Component
public class TencentAuthManager implements InitializingBean {
private static final Long SUCCESS_CODE = 1L;
@Value("${tencent.secretId:}")
private String secretId;
@Value("${tencent.secretKey:}")
private String secretKey;
@Value("${tencent.captcha.captchaAppId:}")
private Long captchaAppId;
@Value("${tencent.captcha.appSecretKey:}")
private String appSecretKey;
private CaptchaClient client;
@Override
public void afterPropertiesSet() throws Exception {
Credential cred = new Credential(secretId, secretKey);
// 实例化一个http选项，可选的，没有特殊需求可以跳过
HttpProfile httpProfile = new HttpProfile();
httpProfile.setEndpoint("captcha.tencentcloudapi.com");
// 实例化一个client选项，可选的，没有特殊需求可以跳过
ClientProfile clientProfile = new ClientProfile();
clientProfile.setHttpProfile(httpProfile);
// 实例化要请求产品的client对象,clientProfile是可选的
client = new CaptchaClient(cred, "", clientProfile);
}
public boolean validate(String ticket, String randstr) {
try {
DescribeCaptchaResultRequest req = new DescribeCaptchaResultRequest();
req.setCaptchaType(9L);
req.setTicket(ticket);
req.setRandstr(randstr);
req.setUserIp(IpUtils.getIpAddr());
req.setCaptchaAppId(captchaAppId);
req.setAppSecretKey(appSecretKey);
// 返回的resp是一个DescribeCaptchaResultResponse的实例，与请求对象对应
DescribeCaptchaResultResponse resp = client.DescribeCaptchaResult(req);
if (SUCCESS_CODE.equals(resp.getCaptchaCode())) {
return true;
}
log.warn("滑动验证未通过: {}", AbstractModel.toJsonString(resp));
} catch (Exception e) {
log.error("滑动验证校验异常", e);
}
return false;
}
}