From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:44:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/AuthController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 067d5e5..01906c1 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -14,7 +14,9 @@
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 com.zy.system.timer.LicenseTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -45,20 +47,26 @@
private PermissionService permissionService;
@Autowired
private RolePermissionService rolePermissionService;
+ @Autowired
+ private LicenseTimer licenseTimer;
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String username, String password){
- if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
- Map<String, Object> res = new HashMap<>();
- res.put("username", username);
- res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
- return R.ok(res);
+ //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
+ if (!licenseTimer.getSystemSupport()){
+ return R.parse(CodeRes.SYSTEM_20001);
}
EntityWrapper<User> userWrapper = new EntityWrapper<>();
userWrapper.eq("username", username);
User user = userService.selectOne(userWrapper);
if (Cools.isEmpty(user)){
+ if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
+ Map<String, Object> res = new HashMap<>();
+ res.put("username", username);
+ res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
+ return R.ok(res);
+ }
return R.parse(CodeRes.USER_10001);
}
if (user.getStatus()!=1){
@@ -73,6 +81,7 @@
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