From bfe51f9c2ce2181fee372ed5f9017c7af59cc896 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 01 九月 2025 12:49:55 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 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 b107b95..6f2ce54 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
@@ -1,6 +1,8 @@
package com.zy.acs.manager.system.controller;
import com.zy.acs.common.utils.Utils;
+import com.zy.acs.framework.common.Cools;
+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.security.JwtSubject;
@@ -8,6 +10,7 @@
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.entity.Menu;
import com.zy.acs.manager.system.entity.User;
import com.zy.acs.manager.system.entity.UserLogin;
@@ -15,14 +18,13 @@
import com.zy.acs.manager.system.service.TenantService;
import com.zy.acs.manager.system.service.UserLoginService;
import com.zy.acs.manager.system.service.UserService;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.R;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 璁よ瘉鎺у埗鍣�
@@ -51,18 +53,18 @@
Long tenantId = param.getTenantId();
User user = userService.getByUsername(username, tenantId);
if (user == null) {
- return R.error("璐﹀彿涓嶅瓨鍦�");
+ return R.error("Username Does Not Exist");
}
if (!user.getStatus().equals(1)) {
- return R.error("璐﹀彿琚喕缁�");
+ return R.error("Account Frozen");
}
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
- return R.error("瀵嗙爜閿欒");
+ return R.error("Wrong 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("鐧诲綍鎴愬姛").add(new LoginResult(accessToken, user));
+ return R.ok("Login Success").add(new LoginResult(accessToken, user));
}
@GetMapping("/auth/user")
@@ -73,8 +75,12 @@
@GetMapping("/auth/menu")
public R userMenu() {
List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU);
- return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
+// 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() {
@@ -95,7 +101,7 @@
if (userService.updateById(user)) {
return R.ok().add(userService.getByIdRel(user.getId()));
}
- return R.error("淇濆瓨澶辫触");
+ return R.error("Save Fail");
}
@PreAuthorize("hasAuthority('sys:auth:password')")
@@ -103,22 +109,50 @@
@PutMapping("/auth/password")
public R updatePassword(@RequestBody UpdatePasswordParam param) {
if (Cools.isEmpty(param.getOldPassword(), param.getPassword())) {
- return R.error("鍙傛暟涓嶈兘涓虹┖");
+ return R.error("Parameters Cannot Be Empty");
}
Long userId = getLoginUserId();
if (userId == null) {
- return R.error("鏈櫥褰�");
+ return R.error("Please Login First");
}
if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) {
- return R.error("鍘熷瘑鐮佽緭鍏ヤ笉姝ｇ‘");
+ return R.error("The Origin Password Was Incorrect");
}
User user = new User();
user.setId(userId);
user.setPassword(userService.encodePassword(param.getPassword()));
if (userService.updateById(user)) {
- return R.ok("淇敼鎴愬姛");
+ return R.ok("Update Success");
}
- return R.error("淇敼澶辫触");
+ return R.error("Update Fail");
+ }
+
+
+ // ----------------------------------------------------
+
+ private MenuVo convertToVo(Menu menu) {
+ if (menu == null) {
+ return null;
+ }
+ MenuVo vo = new MenuVo();
+ vo.setId(menu.getId());
+ vo.setName(menu.getName());
+ vo.setParentId(menu.getParentId());
+// vo.setParentName(menu.getParentName());
+ vo.setPath(menu.getPath());
+// vo.setPathName(menu.getPathName());
+ vo.setRoute(menu.getRoute());
+ vo.setComponent(menu.getComponent());
+ vo.setType(menu.getType());
+ vo.setIcon(menu.getIcon());
+ vo.setSort(menu.getSort());
+ if (menu.getChildren() != null && !menu.getChildren().isEmpty()) {
+ List<MenuVo> childDTOs = menu.getChildren().stream()
+ .map(this::convertToVo)
+ .collect(Collectors.toList());
+ vo.setChildren(childDTOs);
+ }
+ return vo;
}
}
--
Gitblit v1.9.1