From 895ed97195660b0196b61f5da626ac6d18e2068d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 22 一月 2025 11:54:52 +0800
Subject: [PATCH] 1
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 11d5c34..340dd9b 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -17,7 +17,9 @@
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.company.api.RemoteCompanyService;
import com.ruoyi.company.api.RemoteCompanyUserService;
+import com.ruoyi.company.api.domain.Company;
import com.ruoyi.company.api.domain.User;
import com.ruoyi.company.api.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.api.model.RegisterUser;
@@ -35,6 +37,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
@@ -58,6 +61,9 @@
@Resource
private RemoteCompanyUserService remoteCompanyUserService;
+ @Resource
+ private RemoteCompanyService remoteCompanyService;
+
@Operation(summary = "管理端-登录")
@PostMapping("login")
public R<?> login(@RequestBody LoginBody form)
@@ -184,7 +190,7 @@
@PostMapping("smsLogin")
@Operation(summary = "验证码登录",description = "验证码登录")
public R<Map<String, Object>> smsLogin(@RequestBody RegisterUser registerUser){
- String smsCode = registerUser.getSmsCode();
+ String smsCode = registerUser.getCode();
if (!"999999".equals(smsCode)) {
String verifyKey = CacheConstants.PHONE_CODE_KEY + StringUtils.nvl(registerUser.getPhone(), "");
String captcha = redisService.getCacheObject(verifyKey);
@@ -224,31 +230,21 @@
public R<?> check(@RequestBody RegisterUser registerUser)
{
String accountName = registerUser.getAccountName();
- R<User> userByPhoneR = remoteCompanyUserService.getUserByPhone(accountName, SecurityConstants.INNER);
- if (R.isError(userByPhoneR)) {
- throw new RuntimeException(userByPhoneR.getMsg());
- }
- boolean check = false;
- R<User> userR = new R<>();
- if (userByPhoneR.getData() != null) {
- check = sysLoginService.check(userByPhoneR.getData(), registerUser.getCompanyName(), registerUser.getIdCardNumber());
- }
- if (!check){
- userR = remoteCompanyUserService.getUserByAccountName(accountName, SecurityConstants.INNER);
- if (R.isError(userR)) {
- return R.fail("账号不存在");
- }
- if (userR.getData() == null) {
- return R.fail("账号不存在");
- }
- check = sysLoginService.check(userR.getData(), registerUser.getCompanyName(), registerUser.getIdCardNumber());
- }
- if (!check) {
+ R<User> userR = remoteCompanyUserService.getUserByPhone(accountName, SecurityConstants.INNER);
+ R<User> userR2 = remoteCompanyUserService.getUserByAccountName(accountName, SecurityConstants.INNER);
+
+ User user = userR.getData();
+ Boolean flag = sysLoginService.check(user, registerUser.getCompanyName(), registerUser.getIdCardNumber());
+ User user1 = userR2.getData();
+ Boolean flag1 = sysLoginService.check(user1, registerUser.getCompanyName(), registerUser.getIdCardNumber());
+ if (!flag1 && !flag){
return R.fail("账号不存在");
}
return R.ok();
}
+
+
/**
* 重置密码
*/
--
Gitblit v1.7.1