From e61c535e1a6999e0768217589d8168676c106730 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 27 十月 2025 14:49:02 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/web/AuthController.java | 94 ++++++++++++++++++++++++----------------------
1 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 32e4d76..cc00686 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -17,6 +17,7 @@
import com.zy.system.entity.license.LicenseVerify;
import com.zy.system.service.*;
import com.zy.system.timer.LicenseTimer;
+import com.zy.system.timer.LoadingConfigTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +50,8 @@
private RolePermissionService rolePermissionService;
@Autowired
private LicenseTimer licenseTimer;
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
@PostMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
@@ -76,8 +79,9 @@
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + param.get("username"), user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
- UserLogin userLogin = new UserLogin();
+ if (loadingConfigTimer.getTokenNumber() == 1) {
+ 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());
@@ -340,48 +344,48 @@
return R.ok(resources);
}
- @GetMapping(value = "/system/activation/auth")
- public R activation() {
- if (SystemProperties.SYSTEM_ACTIVATION) {
- String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
- String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT);
- if (null == timeStr) {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- return R.error();
- }
- Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
- if (new Date().getTime() < exprTime.getTime()) {
- return R.ok().add(DateUtils.convert(exprTime));
- } else {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- return R.error();
- }
- } else {
- return R.error();
- }
- }
-
- @PostMapping(value = "/system/secret/auth")
- @ManagerAuth
- public R systemSecret(@RequestParam(value = "secret") String secret) {
- if (Cools.isEmpty(secret)) {
- return R.error("璇疯緭鍏ユ縺娲荤爜");
- }
- // 楠岃瘉婵�娲荤爜
- String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT);
- if (null == timeStr) {
- return R.error("婵�娲荤爜閿欒");
- }
- Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
- if (new Date().getTime() >= exprTime.getTime()) {
- return R.error("婵�娲荤爜宸插け鏁�");
- }
- boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret);
- if (!result) {
- return R.error("婵�娲诲け璐�");
- }
- SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
- return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦" + DateUtils.convert(exprTime));
- }
+// @GetMapping(value = "/system/activation/auth")
+// public R activation() {
+// if (SystemProperties.SYSTEM_ACTIVATION) {
+// String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
+// String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT);
+// if (null == timeStr) {
+// SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
+// return R.error();
+// }
+// Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
+// if (new Date().getTime() < exprTime.getTime()) {
+// return R.ok().add(DateUtils.convert(exprTime));
+// } else {
+// SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
+// return R.error();
+// }
+// } else {
+// return R.error();
+// }
+// }
+//
+// @PostMapping(value = "/system/secret/auth")
+// @ManagerAuth
+// public R systemSecret(@RequestParam(value = "secret") String secret) {
+// if (Cools.isEmpty(secret)) {
+// return R.error("璇疯緭鍏ユ縺娲荤爜");
+// }
+// // 楠岃瘉婵�娲荤爜
+// String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT);
+// if (null == timeStr) {
+// return R.error("婵�娲荤爜閿欒");
+// }
+// Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
+// if (new Date().getTime() >= exprTime.getTime()) {
+// return R.error("婵�娲荤爜宸插け鏁�");
+// }
+// boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret);
+// if (!result) {
+// return R.error("婵�娲诲け璐�");
+// }
+// SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
+// return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦" + DateUtils.convert(exprTime));
+// }
}
--
Gitblit v1.9.1