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 +++++++-----------------
/dev/null | 40 -------------
ruoyi-ui/src/api/menu.js | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java | 13 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/IndexController.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoVo.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java | 21 +++++++
ruoyi-ui/src/api/login.js | 14 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java | 4
ruoyi-admin/src/main/resources/application.yml | 2
10 files changed, 71 insertions(+), 107 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));
- }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
index bfb127a..ab9c4d1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
@@ -52,7 +52,7 @@
*
* @param phonenumber 鐢ㄦ埛鎵嬫満鍙�
*/
- @GetMapping("/captchaSms")
+ @GetMapping("/sms/code")
public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}")
String phonenumber) {
if (!smsProperties.getEnabled()) {
@@ -77,7 +77,7 @@
/**
* 鐢熸垚楠岃瘉鐮�
*/
- @GetMapping("/captchaImage")
+ @GetMapping("/code")
public R<CaptchaVo> getCode() {
CaptchaVo captchaVo = new CaptchaVo();
boolean captchaEnabled = captchaProperties.getEnable();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/IndexController.java
similarity index 94%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/IndexController.java
index 368dbaf..2139240 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/IndexController.java
@@ -12,9 +12,10 @@
*
* @author Lion Li
*/
+@SaIgnore
@RequiredArgsConstructor
@RestController
-public class SysIndexController {
+public class IndexController {
/**
* 绯荤粺鍩虹閰嶇疆
@@ -24,7 +25,6 @@
/**
* 璁块棶棣栭〉锛屾彁绀鸿
*/
- @SaIgnore
@GetMapping("/")
public String index() {
return StringUtils.format("娆㈣繋浣跨敤{}鍚庡彴绠＄悊妗嗘灦锛屽綋鍓嶇増鏈細v{}锛岃閫氳繃鍓嶇鍦板潃璁块棶銆�", ruoyiConfig.getName(), ruoyiConfig.getVersion());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java
deleted file mode 100644
index 0c3ef3b..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ruoyi.web.controller;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.web.service.SysRegisterService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 娉ㄥ唽楠岃瘉
- *
- * @author Lion Li
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-public class SysRegisterController extends BaseController {
-
- private final SysRegisterService registerService;
- private final ISysConfigService configService;
-
- /**
- * 鐢ㄦ埛娉ㄥ唽
- */
- @SaIgnore
- @PostMapping("/register")
- public R<Void> register(@Validated @RequestBody RegisterBody user) {
- if (!configService.selectRegisterEnabled(user.getTenantId())) {
- return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
- }
- registerService.register(user);
- return R.ok();
- }
-}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index c6acfb2..b81de5a 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@
# 鍚嶇О
name: RuoYi-Vue-Plus
# 鐗堟湰
- version: ${ruoyi-vue-plus.version}
+ version: ${revision}
# 鐗堟潈骞翠唤
copyrightYear: 2022
# 瀹炰緥婕旂ず寮�鍏�
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java
index 8a19b5d..2288360 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java
@@ -12,8 +12,10 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.common.web.core.BaseController;
+import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.bo.SysMenuBo;
import com.ruoyi.system.domain.vo.MenuTreeSelectVo;
+import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.domain.vo.SysMenuVo;
import com.ruoyi.system.service.ISysMenuService;
import lombok.RequiredArgsConstructor;
@@ -36,6 +38,17 @@
private final ISysMenuService menuService;
/**
+ * 鑾峰彇璺敱淇℃伅
+ *
+ * @return 璺敱淇℃伅
+ */
+ @GetMapping("/getRouters")
+ public R<List<RouterVo>> getRouters() {
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
+ return R.ok(menuService.buildMenus(menus));
+ }
+
+ /**
* 鑾峰彇鑿滃崟鍒楄〃
*/
@SaCheckRole(value = {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java
index b071853..120a19b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java
@@ -6,6 +6,7 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
@@ -94,6 +95,26 @@
}
/**
+ * 鑾峰彇鐢ㄦ埛淇℃伅
+ *
+ * @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);
+ }
+
+ /**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
*
* @param userId 鐢ㄦ埛ID
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/UserInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoVo.java
similarity index 91%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/UserInfoVo.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoVo.java
index ad4f015..99b517b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/UserInfoVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoVo.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.domain.vo;
+package com.ruoyi.system.domain.vo;
import com.ruoyi.system.domain.vo.SysUserVo;
import lombok.Data;
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 6b8d857..9e878cb 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -10,7 +10,7 @@
uuid
}
return request({
- url: '/login',
+ url: '/auth/login',
headers: {
isToken: false
},
@@ -22,7 +22,7 @@
// 娉ㄥ唽鏂规硶
export function register(data) {
return request({
- url: '/register',
+ url: '/auth/register',
headers: {
isToken: false
},
@@ -34,7 +34,7 @@
// 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
export function getInfo() {
return request({
- url: '/getInfo',
+ url: '/system/user/getInfo',
method: 'get'
})
}
@@ -42,7 +42,7 @@
// 閫�鍑烘柟娉�
export function logout() {
return request({
- url: '/logout',
+ url: '/auth/logout',
method: 'post'
})
}
@@ -50,7 +50,7 @@
// 鑾峰彇楠岃瘉鐮�
export function getCodeImg() {
return request({
- url: '/captchaImage',
+ url: '/code',
headers: {
isToken: false
},
@@ -62,7 +62,7 @@
// 鐭俊楠岃瘉鐮�
export function getCodeSms() {
return request({
- url: '/captchaSms',
+ url: '/sms/code',
headers: {
isToken: false
},
@@ -74,7 +74,7 @@
// 鑾峰彇绉熸埛鍒楄〃
export function tenantList() {
return request({
- url: '/tenant/list',
+ url: '/auth/tenant/list',
headers: {
isToken: false
},
diff --git a/ruoyi-ui/src/api/menu.js b/ruoyi-ui/src/api/menu.js
index faef101..8c1c21a 100644
--- a/ruoyi-ui/src/api/menu.js
+++ b/ruoyi-ui/src/api/menu.js
@@ -3,7 +3,7 @@
// 鑾峰彇璺敱
export const getRouters = () => {
return request({
- url: '/getRouters',
+ url: '/system/menu/getRouters',
method: 'get'
})
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3