From f3e38de863b94c2a900fbc924a979d8bf186612b Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 19 Apr 2022 14:04:25 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxkj/admin/controller/AlbumController.java | 2 +- .../main/java/com/hxkj/admin/controller/ArticleController.java | 2 +- .../main/java/com/hxkj/admin/controller/IndexController.java | 2 +- .../main/java/com/hxkj/admin/controller/UploadController.java | 2 +- .../java/com/hxkj/admin/controller/monitor/CacheController.java | 2 +- .../com/hxkj/admin/controller/monitor/ServerController.java | 2 +- .../com/hxkj/admin/controller/setting/BasicsController.java | 2 +- .../com/hxkj/admin/controller/system/SystemAdminController.java | 2 +- .../com/hxkj/admin/controller/system/SystemLogController.java | 2 +- .../com/hxkj/admin/controller/system/SystemLoginController.java | 2 +- .../com/hxkj/admin/controller/system/SystemMenuController.java | 2 +- .../com/hxkj/admin/controller/system/SystemRoleController.java | 2 +- like-framework/like-admin/src/main/resources/application.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java index 614bdbd7..34a9d49c 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java @@ -20,7 +20,7 @@ import java.util.Map; * 相册管理 */ @RestController -@RequestMapping("/album") +@RequestMapping("/api/album") public class AlbumController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java index 155f6c39..9f9f5686 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/article") +@RequestMapping("/api/article") public class ArticleController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java index 84c9e9a1..564565a8 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java @@ -15,7 +15,7 @@ import java.util.Map; */ @Slf4j @RestController -@RequestMapping("/index") +@RequestMapping("/api/index") public class IndexController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java index c5de274a..30dabf33 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java @@ -22,7 +22,7 @@ import java.util.Map; * 上传管理 */ @RestController -@RequestMapping("/upload") +@RequestMapping("/api/upload") public class UploadController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java index 0eb082df..8f24a37a 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java @@ -18,7 +18,7 @@ import java.util.*; * 缓存监控管理 */ @RestController -@RequestMapping("/monitor") +@RequestMapping("/api/monitor") public class CacheController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java index 835f9472..4e45464e 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java @@ -16,7 +16,7 @@ import java.util.Map; * 服务监控管理 */ @RestController -@RequestMapping("/monitor") +@RequestMapping("/api/monitor") public class ServerController { /** * 服务器信息 diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java index d59a0d7b..17acac8b 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java @@ -12,7 +12,7 @@ import java.util.Map; * 基础设置管理 */ @RestController -@RequestMapping("/setting") +@RequestMapping("/api/setting") public class BasicsController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java index b905fbaa..05cc776c 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java @@ -20,7 +20,7 @@ import java.util.Map; * 系统管理员管理 */ @RestController -@RequestMapping("/system/admin") +@RequestMapping("/api/system/admin") public class SystemAdminController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java index b21e4d2d..844012dd 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java @@ -32,7 +32,7 @@ public class SystemLogController { * @param params 搜索参数 * @return Object */ - @GetMapping("/operate") + @GetMapping("/api/operate") public Object operate(@Validated PageParam pageParam, @RequestParam Map params) { PageResult list = iSystemLogServer.operate(pageParam, params); return AjaxResult.success(list); diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java index 428c3b36..0d71ef39 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java @@ -19,7 +19,7 @@ import java.util.Map; * 系统登录管理 */ @RestController -@RequestMapping("/system") +@RequestMapping("/api/system") public class SystemLoginController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java index be2da1d7..622bfada 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java @@ -19,7 +19,7 @@ import java.util.List; * 系统菜单管理 */ @RestController -@RequestMapping("/system/menu") +@RequestMapping("/api/system/menu") public class SystemMenuController { @Resource diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java index 43e0374c..365f5a82 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java @@ -17,7 +17,7 @@ import javax.annotation.Resource; * 系统角色管理 */ @RestController -@RequestMapping("/system/role") +@RequestMapping("/api/system/role") public class SystemRoleController { @Resource diff --git a/like-framework/like-admin/src/main/resources/application.yml b/like-framework/like-admin/src/main/resources/application.yml index c7c963be..956422b3 100644 --- a/like-framework/like-admin/src/main/resources/application.yml +++ b/like-framework/like-admin/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: port: 8082 # 路由前缀 servlet: - context-path: /api + context-path: / # 框架配置 spring: From 3c021a74c4e4bb0827cc08f377893a4bc04b6925 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 19 Apr 2022 14:10:18 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/admin/controller/system/SystemLogController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java index 844012dd..8c76a474 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java @@ -19,7 +19,7 @@ import java.util.Map; * 系统日志管理 */ @RestController -@RequestMapping("/system/log") +@RequestMapping("/api/system/log") public class SystemLogController { @Resource @@ -32,7 +32,7 @@ public class SystemLogController { * @param params 搜索参数 * @return Object */ - @GetMapping("/api/operate") + @GetMapping("/operate") public Object operate(@Validated PageParam pageParam, @RequestParam Map params) { PageResult list = iSystemLogServer.operate(pageParam, params); return AjaxResult.success(list); From efd707ecc358b4ddb780f947e7c116e6753ad8ca Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 19 Apr 2022 14:30:03 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxkj/admin/LikeAdminInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java index 04aeb325..892f8992 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java @@ -49,7 +49,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor { } // 路由转权限 - String prefix = YmlUtil.get("server.servlet.context-path") + "/"; + String prefix = "/api/"; String route = request.getRequestURI().replaceFirst(prefix, ""); String auths = route.replace("/", ":"); From 5e609f41af9d6bb0c0df472c5f499e37d60adf6b Mon Sep 17 00:00:00 2001 From: Mrtangl <1807746833@qq.com> Date: Tue, 19 Apr 2022 16:54:54 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=9B=BE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/layout/components/layout-header.vue | 5 ++++- admin/src/store/modules/user.ts | 4 +++- admin/src/views/setting/system/cache.vue | 11 +++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/admin/src/layout/components/layout-header.vue b/admin/src/layout/components/layout-header.vue index af21fdc0..894d9f52 100644 --- a/admin/src/layout/components/layout-header.vue +++ b/admin/src/layout/components/layout-header.vue @@ -3,10 +3,11 @@
+
- {{ userInfo.name }} + {{ userInfo.username }}