From 510de9a7af542df4844649dee335622e18478c9a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 07 八月 2024 16:31:31 +0800
Subject: [PATCH] 新增MES采购入库上报功能
---
src/main/java/com/zy/common/web/AuthController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index c8bca4a..a54e094 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.*;
+import com.core.common.AesUtils;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.common.CodeRes;
import com.zy.common.entity.Parameter;
@@ -14,7 +17,6 @@
import com.zy.common.properties.SystemProperties;
import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.system.entity.*;
-import com.zy.system.entity.license.LicenseVerify;
import com.zy.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -51,11 +53,11 @@
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String username, String password){
//楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
- LicenseVerify licenseVerify = new LicenseVerify();
- boolean verify = licenseVerify.verify();
- if (!verify) {//璁稿彲璇佸凡澶辨晥
- return R.parse(CodeRes.SYSTEM_20001);
- }
+// LicenseVerify licenseVerify = new LicenseVerify();
+// boolean verify = licenseVerify.verify();
+// if (!verify) {//璁稿彲璇佸凡澶辨晥
+// return R.parse(CodeRes.SYSTEM_20001);
+// }
if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
Map<String, Object> res = new HashMap<>();
res.put("username", username);
@@ -75,11 +77,12 @@
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()).eq("system", "WMS"));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setCreateTime(new Date());
+ userLogin.setSystem("WMS");
userLoginService.insert(userLogin);
Map<String, Object> res = new HashMap<>();
res.put("username", user.getUsername());
--
Gitblit v1.9.1