From 0eaaac435d91a2240a63b5b36758b9044c54c32f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 20 十二月 2023 12:34:41 +0800
Subject: [PATCH] 登录鉴别
---
zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
index 85d7974..df4a984 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
@@ -6,6 +6,7 @@
import com.zy.asrs.common.domain.dto.PowerDto;
import com.zy.asrs.common.domain.entity.Parameter;
import com.zy.asrs.common.domain.enums.HtmlNavIconType;
+import com.zy.asrs.common.domain.enums.LoginSystemType;
import com.zy.asrs.common.properties.OSinfo;
import com.zy.asrs.common.properties.SystemProperties;
import com.zy.asrs.common.sys.entity.*;
@@ -46,7 +47,7 @@
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
- public R loginAction(String username, String password){
+ public R loginAction(String username, String password, Boolean wms) {
if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
Map<String, Object> res = new HashMap<>();
res.put("username", username);
@@ -56,21 +57,28 @@
LambdaQueryWrapper<User> userWrapper = new LambdaQueryWrapper<>();
userWrapper.eq(User::getUsername, username);
User user = userService.getOne(userWrapper);
- if (Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
return R.parse(CodeRes.USER_10001);
}
- if (user.getStatus()!=1){
+ if (user.getStatus() != 1) {
return R.parse(CodeRes.USER_10002);
}
- if (!user.getPassword().equals(password)){
+ if (!user.getPassword().equals(password)) {
return R.parse(CodeRes.USER_10003);
}
+ String system = null;//鐧婚檰绯荤粺
+ if (wms) {
+ system = String.valueOf(LoginSystemType.WMS);
+ }else {
+ system = String.valueOf(LoginSystemType.WCS);
+ }
String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
- userLoginService.remove(new LambdaQueryWrapper<UserLogin>().eq(UserLogin::getUserId, user.getId()));
+ userLoginService.remove(new LambdaQueryWrapper<UserLogin>().eq(UserLogin::getUserId, user.getId()).eq(UserLogin::getSystem, system));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setCreateTime(new Date());
+ userLogin.setSystem(system);
userLoginService.save(userLogin);
Map<String, Object> res = new HashMap<>();
res.put("username", user.getUsername());
--
Gitblit v1.9.1