From 71eeac34fee9f5a53168e0872e5fb7b855c0b4c8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 12 二月 2025 21:22:55 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 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 7639897..0eca7ad 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,25 +1,33 @@
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.BaseRes;
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.RegisterParam;
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.service.*;
+import com.vincent.rsf.server.system.enums.EmailType;
+import com.vincent.rsf.server.system.enums.StatusType;
+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;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -32,7 +40,6 @@
* Created by vincent on 1/30/2024
*/
@RestController
-//@RequestMapping("")
public class AuthController extends BaseController {
@Resource
@@ -46,7 +53,7 @@
@Resource
private TenantService tenantService;
@Autowired
- private UserRoleService userRoleService;
+ private EmailService emailService;
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
@@ -57,16 +64,43 @@
if (user == null) {
return R.error("Username Does Not Exist");
}
- if (!user.getStatus().equals(1)) {
+ if (!user.getStatus().equals(StatusType.ENABLE.val)) {
return R.error("Account Frozen");
}
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
- return R.error("Wrong Password");
+ return R.error("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));
+ Tenant tenant = tenantService.getById(user.getTenantId());
+ return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
+ }
+
+ @GetMapping("/email/code")
+ public R emailCode(@RequestParam("email") String email) {
+ if (Cools.isEmpty(email)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ String code = Utils.randomNumbers(configProperties.getCodeLength());
+ emailService.sendEmail(email, EmailType.REGISTER_VERIFY, Cools.add("code", code));
+ return R.ok();
+ }
+
+ @PostMapping("/register")
+ public R register(@RequestBody RegisterParam param, HttpServletRequest request) {
+
+ return R.ok();
+ }
+
+ @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")
@@ -76,16 +110,21 @@
@GetMapping("/auth/user")
public R userInfo() {
- User user = userService.getByIdRel(getLoginUserId());
- user.setRoles(userRoleService.listByUserId(user.getId()));
- return R.ok(user);
+ User user = userService.getById(getLoginUserId());
+ return R.ok(userService.setUserAuthInfo(user));
}
@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));
}
@@ -100,7 +139,7 @@
user.setTenantId(null);
user.setStatus(null);
if (userService.updateById(user)) {
- return R.ok("Save Success").add(userService.getByIdRel(user.getId()));
+ return R.ok("Save Success").add(userService.getById(user.getId()));
}
return R.error("Save Fail");
}
--
Gitblit v1.9.1