From 89847f0c5a5d37e5a720afd32cdd7e4d9ead664b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 13 四月 2026 08:15:47 +0800
Subject: [PATCH] #新的菜单接口
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 184 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 153 insertions(+), 31 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index f0239f8..adb7030 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.system.controller;
+import com.alibaba.fastjson.JSONObject;
import com.vincent.rsf.common.enums.SystemModeType;
import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.BaseRes;
@@ -8,9 +9,11 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.config.ConfigProperties;
+import com.vincent.rsf.server.common.domain.BusinessRes;
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.service.EmailService;
import com.vincent.rsf.server.common.service.RedisService;
+import com.vincent.rsf.server.common.utils.JSONUtil;
import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import com.vincent.rsf.server.system.controller.param.RegisterParam;
@@ -19,6 +22,7 @@
import com.vincent.rsf.server.system.controller.result.LoginResult;
import com.vincent.rsf.server.system.controller.result.MenuVo;
import com.vincent.rsf.server.system.controller.result.SystemInfoVo;
+import com.vincent.rsf.server.system.controller.result.UserMenuRouteVo;
import com.vincent.rsf.server.system.entity.Menu;
import com.vincent.rsf.server.system.entity.Tenant;
import com.vincent.rsf.server.system.entity.User;
@@ -31,15 +35,17 @@
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
- * 璁よ瘉鎺у埗鍣�
- *
+ * Authority Controller
* Created by vincent on 1/30/2024
*/
@RestController
@@ -62,24 +68,26 @@
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
-// System.out.println(userService.encodePassword("123456"));
String username = param.getUsername();
- Long tenantId = param.getTenantId();
- User user = userService.getByUsername(username, tenantId);
+ User user = userService.getByUsername(username
+ , configProperties.getSystemMode()
+ .equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
+ );
if (user == null) {
- return R.error("Username Does Not Exist");
+ return R.parse(BusinessRes.USERNAME_NOT_EXIST);
}
if (!user.getStatus().equals(StatusType.ENABLE.val)) {
- return R.error("Account Frozen");
+ return R.parse(BusinessRes.USERNAME_FROZEN);
}
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
- return R.error("Invalid 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);
+ userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, user.getTenantId(), null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
- return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
+ user = userService.fillRoleIdsForResponse(user);
+ return R.ok("Sign In Success").add(buildPageRowsUtils.rowsMap(new LoginResult(accessToken, user, tenant.getName())));
}
@GetMapping("/email/code")
@@ -88,10 +96,10 @@
return R.parse(BaseRes.PARAM);
}
if (!emailService.isValid(email)) {
- return R.error("Please enter a valid email address");
+ return R.parse(BusinessRes.INVALID_EMAIL);
}
if (null != userService.getByEmail(email, null)) {
- return R.error("Email Already Exist");
+ return R.parse(BusinessRes.EMAIL_EXIT);
}
Long expire = redisService.getExpire(EmailType.REGISTER_VERIFY.toString(), email);
if (expire > (configProperties.getCodeTime() - 60)) {
@@ -111,14 +119,15 @@
return R.parse(BaseRes.PARAM);
}
// verify code
- String cacheCode = redisService.getValue(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
- if (Cools.isEmpty(cacheCode)) {
- return R.error("The verification code has expired.");
+ if (!param.getCode().equals(configProperties.getSecurityCode())) {
+ String cacheCode = redisService.getValue(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
+ if (Cools.isEmpty(cacheCode)) {
+ return R.error("The verification code has expired.");
+ }
+ if (!cacheCode.equals(param.getCode())) {
+ return R.error("The verification code is incorrect.");
+ }
}
- if (!cacheCode.equals(param.getCode())) {
- return R.error("The verification code is incorrect.");
- }
-
// register
TenantInitParam initParam = new TenantInitParam();
initParam.setEmail(param.getEmail());
@@ -126,27 +135,32 @@
initParam.setPassword(param.getPassword());
initParam.setName(param.getUsername());
initParam.setFlag(param.getUsername());
- if (!tenantService.initTenant(initParam)) {
+ Long tenantId = tenantService.initTenant(initParam);
+ if (null == tenantId) {
throw new CoolException("Failed to register");
}
-
redisService.delete(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
- return R.ok();
+ // token
+ User user = userService.getByUsername(param.getUsername(), tenantId);
+ String accessToken = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
+ configProperties.getTokenExpireTime(), configProperties.getTokenKey());
+ userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
+ Tenant tenant = tenantService.getById(user.getTenantId());
+ return R.ok("Sign Up Success").add(buildPageRowsUtils.rowsMap(new LoginResult(accessToken, user, tenant.getName())));
}
@GetMapping("/system/info")
public R systemInfo() {
- SystemModeType systemMode = configProperties.getSystemMode();
SystemInfoVo infoVo = new SystemInfoVo();
infoVo.setName(configProperties.getSystemName());
infoVo.setVersion(configProperties.getSystemVersion());
- infoVo.setMode(systemMode.toString());
+ infoVo.setMode(configProperties.getSystemMode().toString());
return R.ok(infoVo);
}
@GetMapping("/tenant/list")
public R tenantList() {
- return R.ok().add(tenantService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(tenantService.list()));
}
@GetMapping("/auth/user")
@@ -166,7 +180,23 @@
&& !vo.getName().equals("menu.menu")
).collect(Collectors.toList());
}
- return R.ok().add(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren));
+ return R.ok().add(buildPageRowsUtils.rowsMap(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren)));
+ }
+
+ @GetMapping("/auth/menu/v2")
+ public R userMenuV2() {
+ List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU);
+ Map<Long, List<Menu>> buttonMap = roleMenuService.listButtonByUserId(getLoginUserId())
+ .stream()
+ .collect(Collectors.groupingBy(Menu::getParentId));
+ List<UserMenuRouteVo> voList = menus.stream().map(menu -> convertToRouteVo(menu, buttonMap)).collect(Collectors.toList());
+ if (!configProperties.getSuperUserList().contains(getLoginUser().getUsername())) {
+ voList = voList.stream().filter(vo ->
+ !vo.getName().equals("menu.tenant")
+ && !vo.getName().equals("menu.menu")
+ ).collect(Collectors.toList());
+ }
+ return R.ok().add(buildPageRowsUtils.rowsMap(Utils.toTreeData(voList, 0L, UserMenuRouteVo::getParentId, UserMenuRouteVo::getId, UserMenuRouteVo::setChildren)));
}
@OperationLog("Update UserInfo")
@@ -178,8 +208,17 @@
user.setEmailVerified(null);
user.setTenantId(null);
user.setStatus(null);
+ if (!Cools.isEmpty(user.getEmail())) {
+ if (!emailService.isValid(user.getEmail())) {
+ return R.parse(BusinessRes.INVALID_EMAIL);
+ }
+ User one = userService.getByEmail(user.getEmail(), null);
+ if (null != one && !one.getId().equals(user.getId())) {
+ return R.parse(BusinessRes.EMAIL_EXIT);
+ }
+ }
if (userService.updateById(user)) {
- return R.ok("Save Success").add(userService.getById(user.getId()));
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(userService.getById(user.getId())));
}
return R.error("Save Fail");
}
@@ -188,14 +227,14 @@
@PostMapping("/auth/reset/password")
public R resetPassword(@RequestBody UpdatePasswordParam param) {
if (Cools.isEmpty(param.getOldPassword(), param.getNewPassword())) {
- return R.error("Parameters Cannot Be Empty");
+ return R.parse(BaseRes.PARAM);
}
Long userId = getLoginUserId();
if (userId == null) {
return R.error("Please Login First");
}
if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) {
- return R.parse("408-The Current Password Was Incorrect");
+ return R.parse(BusinessRes.INVALID_PASSWORD);
}
User user = new User();
user.setId(userId);
@@ -234,4 +273,87 @@
return vo;
}
+ private UserMenuRouteVo convertToRouteVo(Menu menu, Map<Long, List<Menu>> buttonMap) {
+ if (menu == null) {
+ return null;
+ }
+ UserMenuRouteVo vo = new UserMenuRouteVo();
+ vo.setId(menu.getId());
+ vo.setParentId(menu.getParentId());
+ vo.setName(menu.getName());
+ vo.setPath(resolveRoutePath(menu));
+ vo.setComponent(resolveComponent(menu));
+ vo.setMeta(buildMenuMeta(menu, buttonMap.get(menu.getId())));
+ if (menu.getChildren() != null && !menu.getChildren().isEmpty()) {
+ vo.setChildren(menu.getChildren().stream().map(child -> convertToRouteVo(child, buttonMap)).collect(Collectors.toList()));
+ }
+ return vo;
+ }
+
+ private String resolveComponent(Menu menu) {
+ if (menu.getParentId() == null || menu.getParentId() == 0L) {
+ return "/index/index";
+ }
+ return "/"+menu.getComponent();
+ }
+
+ private String resolveRoutePath(Menu menu) {
+ String route = menu.getRoute();
+ if (Cools.isEmpty(route)) {
+ return route;
+ }
+ if (menu.getParentId() != null && menu.getParentId() > 0 && route.startsWith("/")) {
+ return route.substring(1 + route.lastIndexOf("/", route.length() - 2));
+ }
+ return route;
+ }
+
+ private Map<String, Object> buildMenuMeta(Menu menu, List<Menu> buttons) {
+ Map<String, Object> meta = parseMeta(menu.getMeta());
+ if (Cools.isEmpty(meta.get("title")) && !Cools.isEmpty(menu.getName())) {
+ meta.put("title", menu.getName());
+ }
+ if (Cools.isEmpty(meta.get("icon")) && !Cools.isEmpty(menu.getIcon())) {
+ meta.put("icon", menu.getIcon());
+ }
+ if (!Cools.isEmpty(buttons)) {
+ meta.put("authList", buttons.stream().map(this::convertButtonAuth).collect(Collectors.toList()));
+ }
+ return meta;
+ }
+
+ private Map<String, Object> convertButtonAuth(Menu button) {
+ Map<String, Object> authItem = new LinkedHashMap<>();
+ authItem.put("title", button.getName());
+ authItem.put("authMark", extractAuthMark(button.getAuthority()));
+ return authItem;
+ }
+
+ private String extractAuthMark(String authority) {
+ if (Cools.isEmpty(authority)) {
+ return null;
+ }
+ int lastIndex = authority.lastIndexOf(":");
+ if (lastIndex < 0 || lastIndex == authority.length() - 1) {
+ return authority;
+ }
+ return authority.substring(lastIndex + 1);
+ }
+
+ private Map<String, Object> parseMeta(String metaJson) {
+ if (Cools.isEmpty(metaJson)) {
+ return new LinkedHashMap<>();
+ }
+ try {
+ JSONObject jsonObject = JSONUtil.parseObject(metaJson, JSONObject.class);
+ if (jsonObject == null) {
+ return new LinkedHashMap<>();
+ }
+ return new LinkedHashMap<>(jsonObject);
+ } catch (Exception e) {
+ return new LinkedHashMap<>();
+ }
+ }
+
}
+
--
Gitblit v1.9.1