feat/前端路由修改

Author: freestylefly

pmhub-api/pmhub-api-system/src/main/java/com/laigeoffer/pmhub/api/system/LogFeignService.java

@@ -26,7 +26,7 @@ public interface LogFeignService
      * @param source 请求来源
      * @return 结果
      */
-    @PostMapping("/monitor/operlog")
+    @PostMapping("/system/monitor/operlog")
     R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
 
     /**
@@ -36,6 +36,6 @@ public interface LogFeignService
      * @param source 请求来源
      * @return 结果
      */
-    @PostMapping("/monitor/logininfor")
+    @PostMapping("/system/monitor/logininfor")
     R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

pmhub-api/pmhub-api-system/src/main/java/com/laigeoffer/pmhub/api/system/UserFeignService.java

@@ -21,7 +21,7 @@ public interface UserFeignService {
     /**
      * 根据用户名获取当前用户信息
      */
-    @GetMapping("/user/info/{username}")
+    @GetMapping("/system/user/info/{username}")
     R<LoginUser> info(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
@@ -31,6 +31,6 @@ public interface UserFeignService {
      * @param source 请求来源
      * @return 结果
      */
-    @PostMapping("/user/register")
+    @PostMapping("/system/user/register")
     R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

pmhub-auth/src/main/java/com/laigeoffer/pmhub/auth/controller/LoginController.java

@@ -1,6 +1,8 @@
 package com.laigeoffer.pmhub.auth.controller;
 
 import com.laigeoffer.pmhub.auth.service.SysLoginService;
+import com.laigeoffer.pmhub.base.core.constant.Constants;
+import com.laigeoffer.pmhub.base.core.core.domain.AjaxResult;
 import com.laigeoffer.pmhub.base.core.core.domain.R;
 import com.laigeoffer.pmhub.base.core.core.domain.model.LoginBody;
 import com.laigeoffer.pmhub.base.core.core.domain.model.LoginUser;
@@ -18,6 +20,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import static com.laigeoffer.pmhub.base.core.core.domain.AjaxResult.success;
+
 /**
  * 登录验证
  *
@@ -34,11 +38,14 @@ public class LoginController {
     private SysLoginService sysLoginService;
 
     @PostMapping("login")
-    public R<?> login(@RequestBody LoginBody form) {
+    public AjaxResult login(@RequestBody LoginBody form) {
+        AjaxResult ajax = success();
         // 用户登录
         LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
         // 获取登录token
-        return R.ok(tokenService.createToken(userInfo));
+        String token = tokenService.createToken(userInfo);
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
     }
 
     @DeleteMapping("logout")

pmhub-base/pmhub-base-security/src/main/java/com/laigeoffer/pmhub/base/security/service/TokenService.java

@@ -140,7 +140,7 @@ public void delLoginUser(String token) {
     /**
      * 创建令牌
      */
-    public Map<String, Object> createToken(LoginUser loginUser)
+    public String createToken(LoginUser loginUser)
     {
         String token = IdUtils.fastUUID();
         Long userId = loginUser.getUser().getUserId();
@@ -158,10 +158,7 @@ public Map<String, Object> createToken(LoginUser loginUser)
         claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
 
         // 接口返回信息
-        Map<String, Object> rspMap = new HashMap<String, Object>();
-        rspMap.put("access_token", JwtUtils.createToken(claimsMap));
-        rspMap.put("expires_in", expireTime);
-        return rspMap;
+        return JwtUtils.createToken(claimsMap);
     }
 
 

pmhub-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 8080
+  port: 6880
 
 # Spring
 spring: 

pmhub-modules/pmhub-gen/src/main/java/com/laigeoffer/pmhub/gen/controller/GenController.java

@@ -28,7 +28,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/tool/gen")
+@RequestMapping("/gen/tool/gen")
 public class GenController extends BaseController {
     @Autowired
     private IGenTableService genTableService;

pmhub-modules/pmhub-job/src/main/java/com/laigeoffer/pmhub/job/controller/SysJobController.java

@@ -28,7 +28,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/monitor/job")
+@RequestMapping("/schedule/monitor/job")
 public class SysJobController extends BaseController {
     @Autowired
     private ISysJobService jobService;

pmhub-modules/pmhub-job/src/main/java/com/laigeoffer/pmhub/job/controller/SysJobLogController.java

@@ -21,7 +21,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/monitor/jobLog")
+@RequestMapping("/schedule/monitor/jobLog")
 public class SysJobLogController extends BaseController {
     @Autowired
     private ISysJobLogService jobLogService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/CacheController.java

@@ -18,7 +18,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/monitor/cache")
+@RequestMapping("/system/monitor/cache")
 public class CacheController {
     private final static List<SysCache> caches = new ArrayList<SysCache>();
     @Autowired

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/FileController.java

@@ -26,7 +26,7 @@
  * @description FileController
  * @create 2024-04-25-17:17
  */
-@RestController
+@RestController("/system")
 public class FileController {
 
     private static final Logger log = LoggerFactory.getLogger(FileController.class);

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysConfigController.java

@@ -25,7 +25,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/config")
+@RequestMapping("/system/config")
 public class SysConfigController extends BaseController {
     @Autowired
     private ISysConfigService configService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysDeptController.java

@@ -23,7 +23,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/dept")
+@RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysDictDataController.java

@@ -26,7 +26,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/dict/data")
+@RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysDictTypeController.java

@@ -24,7 +24,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/dict/type")
+@RequestMapping("/system/dict/type")
 public class SysDictTypeController extends BaseController {
     @Autowired
     private ISysDictTypeService dictTypeService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysIndexController.java

@@ -11,7 +11,7 @@
  *
  * @author canghe
  */
-@RestController
+@RestController("/system/dashboard")
 public class SysIndexController {
     /**
      * 系统基础配置

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysLogininforController.java

@@ -24,7 +24,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/monitor/logininfor")
+@RequestMapping("/system/monitor/logininfor")
 public class SysLogininforController extends BaseController {
     @Autowired
     private ISysLogininforService logininforService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysMenuController.java

@@ -22,7 +22,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/menu")
+@RequestMapping("/system/menu")
 public class SysMenuController extends BaseController {
     @Autowired
     private ISysMenuService menuService;
@@ -119,4 +119,17 @@ public AjaxResult remove(@PathVariable("menuId") Long menuId) {
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters()
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        return success(menuService.buildMenus(menus));
+    }
 }

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysNoticeController.java

@@ -21,7 +21,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/notice")
+@RequestMapping("/system/notice")
 public class SysNoticeController extends BaseController {
     @Autowired
     private ISysNoticeService noticeService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysOperlogController.java

@@ -21,7 +21,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/monitor/operlog")
+@RequestMapping("/system/monitor/operlog")
 public class SysOperlogController extends BaseController {
     @Autowired
     private ISysOperLogService operLogService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysPostController.java

@@ -24,7 +24,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/post")
+@RequestMapping("/system/post")
 public class SysPostController extends BaseController {
     @Autowired
     private ISysPostService postService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysProfileController.java

@@ -24,7 +24,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/user/profile")
+@RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {
     @Autowired
     private ISysUserService userService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysRoleController.java

@@ -35,7 +35,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/role")
+@RequestMapping("/system/role")
 public class SysRoleController extends BaseController {
     @Autowired
     private ISysRoleService roleService;

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysUserController.java

@@ -40,7 +40,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/user")
+@RequestMapping("/system/user")
 public class SysUserController extends BaseController {
     @Autowired
     private ISysUserService userService;
@@ -130,6 +130,25 @@ public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long
         return ajax;
     }
 
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("/getInfo")
+    public AjaxResult getInfo() {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        AjaxResult ajax = success();
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        return ajax;
+    }
+
 
     /**
      * 新增用户

pmhub-modules/pmhub-system/src/main/java/com/laigeoffer/pmhub/system/controller/SysUserOnlineController.java

@@ -26,7 +26,7 @@
  * @author canghe
  */
 @RestController
-@RequestMapping("/monitor/online")
+@RequestMapping("/system/monitor/online")
 public class SysUserOnlineController extends BaseController {
     @Autowired
     private ISysUserOnlineService userOnlineService;

pmhub-modules/pmhub-workflow/src/main/java/com/laigeoffer/pmhub/workflow/controller/WfDeployController.java

@@ -31,7 +31,7 @@
 @Slf4j
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/deploy")
+@RequestMapping("/workflow/deploy")
 public class WfDeployController extends BaseController {
 
     private final IWfDeployService deployService;

pmhub-modules/pmhub-workflow/src/main/java/com/laigeoffer/pmhub/workflow/controller/WfProcessController.java

@@ -37,7 +37,7 @@
 @Slf4j
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/process")
+@RequestMapping("/workflow/process")
 public class WfProcessController extends BaseController {
 
     private final IWfProcessService processService;

pmhub-ui/src/api/login.js

@@ -9,7 +9,7 @@ export function login(username, password, code, uuid) {
     uuid
   }
   return request({
-    url: '/login',
+    url: '/auth/login',
     headers: {
       isToken: false
     },
@@ -33,27 +33,27 @@ export function register(data) {
 // 获取用户详细信息
 export function getInfo() {
   return request({
-    url: '/getInfo',
+    url: '/system/user/getInfo',
     method: 'get'
   })
 }
 
 // 退出方法
 export function logout() {
   return request({
-    url: '/logout',
-    method: 'post'
+    url: '/auth/logout',
+    method: 'delete'
   })
 }
 
 // 获取验证码
-export function getCodeImg() {
-  return request({
-    url: '/captchaImage',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
-}
+// export function getCodeImg() {
+//   return request({
+//     url: '/captchaImage',
+//     headers: {
+//       isToken: false
+//     },
+//     method: 'get',
+//     timeout: 20000
+//   })
+// }

pmhub-ui/src/api/menu.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取路由
 export const getRouters = () => {
   return request({
-    url: '/getRouters',
+    url: '/system/menu/getRouters',
     method: 'get'
   })
 }