From 3c74b6ffe9e246c66d44f2c6be463a630328d30a Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 10:43:56 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java
index 6f2ce54..6b79bab 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java
@@ -5,12 +5,15 @@
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.config.ConfigProperties;
+import com.zy.acs.manager.common.domain.BusinessRes;
import com.zy.acs.manager.common.security.JwtSubject;
import com.zy.acs.manager.common.utils.JwtUtil;
+import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.system.controller.param.LoginParam;
import com.zy.acs.manager.system.controller.param.UpdatePasswordParam;
import com.zy.acs.manager.system.controller.result.LoginResult;
import com.zy.acs.manager.system.controller.result.MenuVo;
+import com.zy.acs.manager.system.controller.result.SystemInfoVo;
import com.zy.acs.manager.system.entity.Menu;
import com.zy.acs.manager.system.entity.User;
import com.zy.acs.manager.system.entity.UserLogin;
@@ -53,18 +56,18 @@
Long tenantId = param.getTenantId();
User user = userService.getByUsername(username, tenantId);
if (user == null) {
- return R.error("Username Does Not Exist");
+ return R.parse(BusinessRes.USERNAME_NOT_EXIST);
}
- if (!user.getStatus().equals(1)) {
- return R.error("Account Frozen");
+ if (!user.getStatus().equals(StatusType.ENABLE.val)) {
+ return R.parse(BusinessRes.USERNAME_FROZEN);
}
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
- return R.error("Wrong Password");
+ return R.parse(BusinessRes.INVALID_PASSWORD);
}
String accessToken = JwtUtil.buildToken(new JwtSubject(username, user.getTenantId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
- return R.ok("Login Success").add(new LoginResult(accessToken, user));
+ return R.ok("Sign In Success").add(new LoginResult(accessToken, user));
}
@GetMapping("/auth/user")
@@ -78,13 +81,6 @@
// return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
List<MenuVo> voList = menus.stream().map(this::convertToVo).collect(Collectors.toList());
return R.ok().add(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren));
- }
-
-
-
- @GetMapping("/auth/tenant")
- public R authHost() {
- return R.ok().add(tenantService.list());
}
@PreAuthorize("hasAuthority('sys:auth:user')")
@@ -127,6 +123,14 @@
return R.error("Update Fail");
}
+ @GetMapping("/system/info")
+ public R systemInfo() {
+ SystemInfoVo infoVo = new SystemInfoVo();
+ infoVo.setName(configProperties.getSystemName());
+ infoVo.setVersion(configProperties.getSystemVersion());
+ infoVo.setMode(configProperties.getSystemMode().toString());
+ return R.ok(infoVo);
+ }
// ----------------------------------------------------
--
Gitblit v1.9.1