From 0ad45df788da057694b84051360d0540e627a600 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 15 三月 2023 15:52:39 +0800
Subject: [PATCH] update 重构 与cloud版本统一接口路径
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java | 74 +++++++++++--------------------------
1 files changed, 22 insertions(+), 52 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
similarity index 64%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
index ecff031..81af4df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
@@ -4,50 +4,43 @@
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.core.domain.model.SmsLoginBody;
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.tenant.helper.TenantHelper;
-import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.bo.SysTenantBo;
-import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.domain.vo.SysTenantVo;
-import com.ruoyi.system.domain.vo.SysUserVo;
-import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysTenantService;
-import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.web.domain.vo.LoginVo;
import com.ruoyi.web.domain.vo.TenantListVo;
-import com.ruoyi.web.domain.vo.UserInfoVo;
import com.ruoyi.web.service.SysLoginService;
+import com.ruoyi.web.service.SysRegisterService;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
-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 java.net.URL;
import java.util.List;
/**
- * 鐧诲綍楠岃瘉
+ * 璁よ瘉
*
* @author Lion Li
*/
+@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
-public class SysLoginController {
+@RequestMapping("/auth")
+public class AuthController {
private final SysLoginService loginService;
- private final ISysMenuService menuService;
- private final ISysUserService userService;
+ private final SysRegisterService registerService;
+ private final ISysConfigService configService;
private final ISysTenantService tenantService;
/**
@@ -56,7 +49,6 @@
* @param body 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @SaIgnore
@PostMapping("/login")
public R<LoginVo> login(@Validated @RequestBody LoginBody body) {
LoginVo loginVo = new LoginVo();
@@ -75,7 +67,6 @@
* @param body 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @SaIgnore
@PostMapping("/smsLogin")
public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody body) {
LoginVo loginVo = new LoginVo();
@@ -91,7 +82,6 @@
* @param xcxCode 灏忕▼搴廲ode
* @return 缁撴灉
*/
- @SaIgnore
@PostMapping("/xcxLogin")
public R<LoginVo> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
LoginVo loginVo = new LoginVo();
@@ -104,7 +94,6 @@
/**
* 閫�鍑虹櫥褰�
*/
- @SaIgnore
@PostMapping("/logout")
public R<Void> logout() {
loginService.logout();
@@ -112,11 +101,22 @@
}
/**
+ * 鐢ㄦ埛娉ㄥ唽
+ */
+ @PostMapping("/register")
+ public R<Void> register(@Validated @RequestBody RegisterBody user) {
+ if (!configService.selectRegisterEnabled(user.getTenantId())) {
+ return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
+ }
+ registerService.register(user);
+ return R.ok();
+ }
+
+ /**
* 鐧诲綍椤甸潰绉熸埛涓嬫媺妗�
*
* @return 绉熸埛鍒楄〃
*/
- @SaIgnore
@GetMapping("/tenant/list")
public R<List<TenantListVo>> tenantList(HttpServletRequest request) throws Exception {
List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
@@ -128,34 +128,4 @@
return R.ok(CollUtil.isNotEmpty(list) ? list : voList);
}
- /**
- * 鑾峰彇鐢ㄦ埛淇℃伅
- *
- * @return 鐢ㄦ埛淇℃伅
- */
- @GetMapping("getInfo")
- public R<UserInfoVo> getInfo() {
- UserInfoVo userInfoVo = new UserInfoVo();
- LoginUser loginUser = LoginHelper.getLoginUser();
- if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
- // 瓒呯骇绠＄悊鍛� 濡傛灉閲嶆柊鍔犺浇鐢ㄦ埛淇℃伅闇�娓呴櫎鍔ㄦ�佺鎴�
- TenantHelper.clearDynamic();
- }
- SysUserVo user = userService.selectUserById(loginUser.getUserId());
- userInfoVo.setUser(user);
- userInfoVo.setPermissions(loginUser.getMenuPermission());
- userInfoVo.setRoles(loginUser.getRolePermission());
- return R.ok(userInfoVo);
- }
-
- /**
- * 鑾峰彇璺敱淇℃伅
- *
- * @return 璺敱淇℃伅
- */
- @GetMapping("getRouters")
- public R<List<RouterVo>> getRouters() {
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
- return R.ok(menuService.buildMenus(menus));
- }
}
--
Gitblit v1.9.3