From 9180185b46daf03b63d658d3f1168903e5114b61 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 12 二月 2025 20:11:21 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 f54dad3..01afd24 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,22 +1,28 @@
package com.vincent.rsf.server.system.controller;
+import com.vincent.rsf.common.enums.SystemModeType;
import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.config.ConfigProperties;
import com.vincent.rsf.server.common.security.JwtSubject;
+import com.vincent.rsf.server.common.service.EmailService;
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.UpdatePasswordParam;
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.entity.Menu;
import com.vincent.rsf.server.system.entity.Tenant;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.entity.UserLogin;
import com.vincent.rsf.server.system.enums.StatusType;
-import com.vincent.rsf.server.system.service.*;
+import com.vincent.rsf.server.system.service.RoleMenuService;
+import com.vincent.rsf.server.system.service.TenantService;
+import com.vincent.rsf.server.system.service.UserLoginService;
+import com.vincent.rsf.server.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -47,11 +53,13 @@
@Resource
private TenantService tenantService;
@Autowired
- private UserRoleService userRoleService;
+ private EmailService emailService;
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
// System.out.println(userService.encodePassword("123456"));
+// emailService.sendVerificationEmail("t1341870251@gmail.com", "123456");
+
String username = param.getUsername();
Long tenantId = param.getTenantId();
User user = userService.getByUsername(username, tenantId);
@@ -71,6 +79,16 @@
return R.ok("Sign In Success").add(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());
+ return R.ok(infoVo);
+ }
+
@GetMapping("/tenant/list")
public R tenantList() {
return R.ok().add(tenantService.list());
@@ -85,8 +103,14 @@
@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));
List<MenuVo> voList = menus.stream().map(this::convertToVo).collect(Collectors.toList());
+ // exclude tenant
+ 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(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren));
}
--
Gitblit v1.9.1