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 | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 d60dbe4..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,8 +17,11 @@
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;
import com.ruoyi.system.api.model.AppUser;
import com.ruoyi.system.api.model.LoginUser;
@@ -26,7 +29,6 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -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)
@@ -69,7 +75,7 @@
}
@Operation(summary = "管理端-修改密码")
- @GetMapping("/modify-pwd")
+ @PostMapping("/modify-pwd")
public R<?> modifyPwd(@Valid @RequestBody MgtPasswordDTO dto) {
try {
sysLoginService.modifyPwd(dto);
@@ -110,7 +116,7 @@
@PostMapping("companyRegister")
@Operation(summary = "用户注册接口",description = "用户注册接口")
- public R<?> companyRegister(@RequestBody RegisterUser registerUser)
+ public R<?> companyRegister(@RequestBody MgtCompanyDTO registerUser)
{
// 用户注册
sysLoginService.companyRegister(registerUser);
@@ -157,6 +163,7 @@
appUser.setAccountName(user.getAccountName());
appUser.setPhone(user.getPhone());
appUser.setLoginTime(System.currentTimeMillis());
+ appUser.setExpireTime(appUser.getLoginTime() + CacheConstants.EXPIRATION * 60 * 1000L);
appUser.setToken(token);
// 根据uuid将loginUser缓存
@@ -183,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);
@@ -214,6 +221,30 @@
return "login_tokens:" + token;
}
+
+ /**
+ * 公司校验
+ */
+ @PostMapping("check")
+ @Operation(summary = "公司校验",description = "公司校验")
+ public R<?> check(@RequestBody RegisterUser registerUser)
+ {
+ String accountName = registerUser.getAccountName();
+ 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