调整权限

db/sys_user_role_menu.sql

@@ -62,15 +62,16 @@ INSERT INTO sys_user_role_menu(id, parent_id, menu_name, menu_name_en, type, pat
 #     (8, '我的作品', 'My Work', 1, '/account/myWork', '', '{}', null, '21.2', 11),
 #     (8, '我的草稿', 'My Draft', 1, '/account/myDraft', '', '{}', null, '21.3', 11),
 
-    (30, -1, '内容管理', 'CMS', 1, '/cms', '', '{}', 'Document', '13', 5),
-    (31, 30, '单页管理', 'Pages', 1, '/cms/page/cmsPage', '/src/views/cms/page/cmsPage.vue', '{}', null, '13.1', 5),
-    (32, 30, '资讯管理', 'Articles', 1, '/cms/article/cmsArticle', '/src/views/cms/article/cmsArticle.vue', '{}', null, '10.3', 6),
-    (33, 30, '资讯详情', 'Articles Detail', 2, '/cms/article/cmsArticleDetail', '/src/views/cms/article/cmsArticleDetail.vue', '{"isBack":true,"isHide":true}', null, '10.3.1', 6),
-    (34, 30, '资讯分类管理', 'Articles Categories', 1, '/cms/article/cmsArticleCategory', '/src/views/cms/article/cmsArticleCategory.vue', '{}', null, '10.2', 7),
-    (35, 30, '资讯分类详情', 'Articles Categorie Detail', 2, '/cms/article/cmsArticleCategoryDetail', '/src/views/cms/article/cmsArticleCategoryDetail.vue', '{"isBack":true,"isHide":true}', null, '10.2.1', 7),
-    (36, 30, '幻灯片管理', 'Banners', 1, '/cms/banner/cmsBanner', '/src/views/cms/banner/cmsBanner.vue', '{}', null, '10.1', 8),
-    (37, 30, '幻灯片详情', 'Banners Detail', 2, '/cms/banner/cmsBannerDetail', '/src/views/cms/banner/cmsBannerDetail.vue', '{"isBack":true,"isHide":true}', null, '10.1.1', 8),
-    (38, 30, '站点信息', 'SiteInfo', 1, '/cms/site/cmsSiteInfo', '/src/views/cms/site/cmsSiteInfo.vue', '{}', null, '13', 9),
+    (30, -1, '内容管理', 'CMS', 1, '/cms', '', '{}', 'Document', '10', 5),
+    (31, 30, '导航管理', 'Navigation', 1, '/cms/navigation/cmsNavigation', '/src/views/cms/navigation/cmsNavigation.vue', '{}', null, '10.6', 4),
+    (32, 30, '单页管理', 'Pages', 1, '/cms/page/cmsPage', '/src/views/cms/page/cmsPage.vue', '{}', null, '10.4', 5),
+    (33, 30, '资讯管理', 'Articles', 1, '/cms/article/cmsArticle', '/src/views/cms/article/cmsArticle.vue', '{}', null, '10.3', 6),
+    (34, 30, '资讯详情', 'Articles Detail', 2, '/cms/article/cmsArticleDetail', '/src/views/cms/article/cmsArticleDetail.vue', '{"isBack":true,"isHide":true}', null, '10.3.1', 6),
+    (35, 30, '资讯分类管理', 'Articles Categories', 1, '/cms/article/cmsArticleCategory', '/src/views/cms/article/cmsArticleCategory.vue', '{}', null, '10.2', 7),
+    (36, 30, '资讯分类详情', 'Articles Categorie Detail', 2, '/cms/article/cmsArticleCategoryDetail', '/src/views/cms/article/cmsArticleCategoryDetail.vue', '{"isBack":true,"isHide":true}', null, '10.2.1', 7),
+    (37, 30, '幻灯片管理', 'Banners', 1, '/cms/banner/cmsBanner', '/src/views/cms/banner/cmsBanner.vue', '{}', null, '10.1', 8),
+    (38, 30, '幻灯片详情', 'Banners Detail', 2, '/cms/banner/cmsBannerDetail', '/src/views/cms/banner/cmsBannerDetail.vue', '{"isBack":true,"isHide":true}', null, '10.1.1', 8),
+    (39, 30, '站点信息', 'SiteInfo', 1, '/cms/site/cmsSiteInfo', '/src/views/cms/site/cmsSiteInfo.vue', '{}', null, '10.5', 9),
 
     (12, -1, '系统管理', 'Systems', 1, '/system', '', '{}', 'Setting', '3', 12),
     (13, 12, '用户管理', 'Users', 1, '/system/sysUserList', '/src/views/system/sysUser/sysUserList.vue', '{}', null, '3.2', 12),

db/sys_user_role_permission.sql

@@ -109,6 +109,18 @@ INSERT INTO sys_user_role_permission(id, parent_id, permission_name, sort) VALUE
             ('10.3.2', '10.3', '创建资讯', null),
             ('10.3.3', '10.3', '编辑资讯', null),
             ('10.3.4', '10.3', '删除资讯', null),
+        ('10.4', '10', '单页列表', null),
+            ('10.4.1', '10.4', '单页详情', null),
+            ('10.4.2', '10.4', '创建单页', null),
+            ('10.4.3', '10.4', '编辑单页', null),
+            ('10.4.4', '10.4', '删除单页', null),
+        ('10.5', '10', '站点管理', null),
+            ('10.5.1', '10.5', '编辑站点信息', null),
+        ('10.6', '10', '导航列表', null),
+            ('10.6.1', '10.6', '导航详情', null),
+            ('10.6.2', '10.6', '创建导航', null),
+            ('10.6.3', '10.6', '编辑导航', null),
+            ('10.6.4', '10.6', '删除导航', null),
 
     -- ('11', -1, '商品管理', null),
     --     ('11.1', '11', '商品列表', null),
@@ -142,22 +154,7 @@ INSERT INTO sys_user_role_permission(id, parent_id, permission_name, sort) VALUE
     --         ('11.6.3', '11.6', '编辑商品规格SKU', null),
     --         ('11.6.4', '11.6', '删除商品规格SKU', null),
 
-    ('12', -1, '单页管理', null),
-        ('12.1', '12', '单页列表', null),
-        ('12.2', '12', '单页详情', null),
-        ('12.3', '12', '创建单页', null),
-        ('12.4', '12', '编辑单页', null),
-        ('12.5', '12', '删除单页', null),
 
-    ('13', -1, '站点管理', null),
-        ('13.1', '13', '编辑站点信息', null),
-
-    ('14', -1, '导航菜单', null),
-        ('14.3', '14', '导航列表', null),
-            ('14.3.1', '14.3', '导航详情', null),
-            ('14.3.2', '14.3', '创建导航', null),
-            ('14.3.3', '14.3', '编辑导航', null),
-            ('14.3.4', '14.3', '删除导航', null),
 
     ('20', -1, '素材管理', null),
         ('20.1', '20', '素材列表', null),

db/sys_user_role_permission_relation.sql

@@ -54,6 +54,12 @@ INSERT INTO sys_user_role_permission_relation(role_id, permission_id) VALUES
             (1, '10.2.1'), (1, '10.2.2'), (1, '10.2.3'), (1, '10.2.4'),
         (1, '10.3'),
             (1, '10.3.1'), (1, '10.3.2'), (1, '10.3.3'), (1, '10.3.4'),
+        (1, '10.4'),
+            (1, '10.4.1'), (1, '10.4.2'), (1, '10.4.3'), (1, '10.4.4'),
+        (1, '10.5'),
+            (1, '10.5.1'),
+        (1, '10.6'),
+            (1, '10.6.1'), (1, '10.6.2'), (1, '10.6.3'), (1, '10.6.4'),
 #     (1, '11'),
 #         (1, '11.1'),
 #             (1, '11.1.1'), (1, '11.1.2'), (1, '11.1.3'), (1, '11.1.4'),
@@ -67,16 +73,8 @@ INSERT INTO sys_user_role_permission_relation(role_id, permission_id) VALUES
 #             (1, '11.5.1'), (1, '11.5.2'), (1, '11.5.3'), (1, '11.5.4'),
 #         (1, '11.6'),
 #             (1, '11.6.1'), (1, '11.6.2'), (1, '11.6.3'), (1, '11.6.4'),
-    (1, '12'),
-        (1, '12.1'), (1, '12.2'), (1, '12.3'), (1, '12.4'), (1, '12.5'),
 
 
-    (1, '13'),
-        (1, '13.1'),
-    (1, '14'),
-        (1, '14.3'),
-            (1, '14.3.1'), (1, '14.3.2'), (1, '14.3.3'), (1, '14.3.4'),
-
     (1, '20'),
         (1, '20.1'),
             (1, '20.1.1'), (1, '20.1.2'), (1, '20.1.3'), (1, '20.1.4'), (1, '20.1.5'), (1, '20.1.6'),
@@ -156,13 +154,7 @@ INSERT INTO sys_user_role_permission_relation(role_id, permission_id) VALUES
     (3, '4'),
         (3, '4.1'),
             (3, '4.1.1'), (3, '4.1.2'), (3, '4.1.3'), (3, '4.1.4'), (3, '4.1.5'),
-    (3, '10'),
-        (3, '10.1'),
-            (3, '10.1.1'), (3, '10.1.2'), (3, '10.1.3'), (3, '10.1.4'),
-        (3, '10.2'),
-            (3, '10.2.1'), (3, '10.2.2'), (3, '10.2.3'), (3, '10.2.4'),
-        (3, '10.3'),
-            (3, '10.3.1'), (3, '10.3.2'), (3, '10.3.3'), (3, '10.3.4'),
+
     (3, '13'),
         (3, '13.1'),
     (3, '14'),

src/main/java/com/backendsys/modules/cms/article/controller/ArticleCategoryController.java

@@ -21,7 +21,7 @@ public class ArticleCategoryController {
 
     @Operation(summary = "获取资讯分类列表")
     @PreAuthorize("@sr.hasPermission('10')")
-    @GetMapping("/api/cms/article/getArticleCategory")
+    @GetMapping("/api/cms/article/getArticleCategoryList")
     public Result getArticleCategory(@Validated ArticleCategory articleCategory) {
         return Result.success().put("data", articleCategoryService.selectArticleCategoryList(articleCategory));
     }

src/main/java/com/backendsys/modules/cms/article/controller/ArticleController.java

@@ -21,7 +21,7 @@ public class ArticleController {
 
     @Operation(summary = "获取资讯列表")
     @PreAuthorize("@sr.hasPermission('10.3')")
-    @GetMapping("/api/cms/article/getArticle")
+    @GetMapping("/api/cms/article/getArticleList")
     public Result getArticle(@Validated Article article) {
         return Result.success().put("data", articleService.selectArticleList(article));
     }

src/main/java/com/backendsys/modules/cms/banner/controller/BannerController.java

@@ -21,7 +21,7 @@ public class BannerController {
 
     @Operation(summary = "获取幻灯片列表")
     @PreAuthorize("@sr.hasPermission('10.1')")
-    @GetMapping("/api/cms/banner/getBanner")
+    @GetMapping("/api/cms/banner/getBannerList")
     public Result getBanner(@Validated Banner banner) {
         return Result.success().put("data", bannerService.selectBannerList(banner));
     }

src/main/java/com/backendsys/modules/cms/navigation/controller/NavigationController.java

@@ -21,14 +21,14 @@ public class NavigationController {
     private NavigationService navigationService;
 
     @Operation(summary = "获取导航列表")
-    @PreAuthorize("@sr.hasPermission('14.3')")
+    @PreAuthorize("@sr.hasPermission('10.6')")
     @GetMapping("/api/cms/navigation/getNavigationList")
     public Result getNavigation(@Validated Navigation navigation) {
         return Result.success().put("data", navigationService.selectNavigationList(navigation));
     }
 
     @Operation(summary = "获取导航详情")
-    @PreAuthorize("@sr.hasPermission('14.3.1')")
+    @PreAuthorize("@sr.hasPermission('10.6.1')")
     @GetMapping("/api/cms/navigation/getNavigationDetail")
     public Result getNavigationDetail(@Validated(Navigation.Detail.class) Navigation navigation) {
         return Result.success().put("data", navigationService.selectNavigationDetail(navigation));
@@ -36,7 +36,7 @@ public class NavigationController {
 
     @SysLog("创建导航")
     @Operation(summary = "创建导航")
-    @PreAuthorize("@sr.hasPermission('14.3.2')")
+    @PreAuthorize("@sr.hasPermission('10.6.2')")
     @PostMapping("/api/cms/navigation/createNavigation")
     public Result createNavigation(@Validated(Navigation.Create.class) @RequestBody Navigation navigation) {
         return Result.success().put("data", navigationService.insertNavigation(navigation));
@@ -44,7 +44,7 @@ public class NavigationController {
 
     @SysLog("编辑导航")
     @Operation(summary = "编辑导航")
-    @PreAuthorize("@sr.hasPermission('14.3.3')")
+    @PreAuthorize("@sr.hasPermission('10.6.3')")
     @PutMapping("/api/cms/navigation/updateNavigation")
     public Result updateNavigation(@Validated(Navigation.Update.class) @RequestBody Navigation navigation) {
         return Result.success().put("data", navigationService.updateNavigation(navigation));
@@ -52,7 +52,7 @@ public class NavigationController {
 
     @SysLog("删除导航")
     @Operation(summary = "删除导航")
-    @PreAuthorize("@sr.hasPermission('14.3.4')")
+    @PreAuthorize("@sr.hasPermission('10.6.4')")
     @DeleteMapping("/api/cms/navigation/deleteNavigation")
     public Result deleteNavigation(@Validated(Navigation.Delete.class) @RequestBody Navigation navigation) {
         return Result.success().put("data", navigationService.deleteNavigation(navigation));
@@ -60,7 +60,7 @@ public class NavigationController {
 
     @SysLog("删除导航 (批量)")
     @Operation(summary = "删除导航 (批量)")
-    @PreAuthorize("@sr.hasPermission('14.3.4')")
+    @PreAuthorize("@sr.hasPermission('10.6.4')")
     @DeleteMapping("/api/cms/navigation/deleteNavigationBatch")
     public Result deleteNavigationBatch(@Validated(Navigation.DeleteBatch.class) @RequestBody Navigation navigation) {
         return Result.success().put("data", navigationService.deleteNavigationBatch(navigation));

src/main/java/com/backendsys/modules/cms/page/controller/PageController.java

@@ -19,35 +19,35 @@ public class PageController {
     private PageService pageService;
 
     @Operation(summary = "获取单页列表")
-    @PreAuthorize("@sr.hasPermission('10.3')")
-    @GetMapping("/api/cms/page/getPage")
+    @PreAuthorize("@sr.hasPermission('10.4')")
+    @GetMapping("/api/cms/page/getPageList")
     public Result getPage(@Validated Page page) {
         return Result.success().put("data", pageService.selectPageList(page));
     }
 
     @Operation(summary = "获取单页详情")
-    @PreAuthorize("@sr.hasPermission('12.2')")
+    @PreAuthorize("@sr.hasPermission('10.4.1')")
     @GetMapping("/api/cms/page/getPageDetail")
     public Result getPageDetail(@Validated(Page.Detail.class) Page page) {
         return Result.success().put("data", pageService.selectPageDetail(page));
     }
 
     @Operation(summary = "创建单页")
-    @PreAuthorize("@sr.hasPermission('12.3')")
+    @PreAuthorize("@sr.hasPermission('10.4.2')")
     @PostMapping("/api/cms/page/createPage")
     public Result createPage(@Validated(Page.Create.class) @RequestBody Page page) {
         return Result.success().put("data", pageService.insertPage(page));
     }
 
     @Operation(summary = "编辑单页")
-    @PreAuthorize("@sr.hasPermission('12.4')")
+    @PreAuthorize("@sr.hasPermission('10.4.3')")
     @PutMapping("/api/cms/page/updatePage")
     public Result updatePage(@Validated(Page.Update.class) @RequestBody Page page) {
         return Result.success().put("data", pageService.updatePage(page));
     }
 
     @Operation(summary = "删除单页")
-    @PreAuthorize("@sr.hasPermission('12.5')")
+    @PreAuthorize("@sr.hasPermission('10.4.4')")
     @DeleteMapping("/api/cms/page/deletePage")
     public Result deletePage(@Validated(Page.Delete.class) @RequestBody Page page) {
         return Result.success().put("data", pageService.deletePage(page));

src/main/java/com/backendsys/modules/cms/siteinfo/controller/SiteInfoController.java

@@ -22,14 +22,14 @@ public class SiteInfoController {
     private SiteInfoService siteInfoService;
 
     @Operation(summary = "获取站点信息")
-    @PreAuthorize("@sr.hasPermission('13')")
+    @PreAuthorize("@sr.hasPermission('10.5')")
     @GetMapping("/api/cms/site/getSiteInfo")
     public Result getSiteInfo() {
         return Result.success().put("data", siteInfoService.selectSiteInfo());
     }
 
     @Operation(summary = "编辑站点信息")
-    @PreAuthorize("@sr.hasPermission('13.1')")
+    @PreAuthorize("@sr.hasPermission('10.5.1')")
     @PutMapping("/api/cms/site/updateSiteInfo")
     public Result updateSiteInfo(@Validated(SiteInfo.Update.class) @RequestBody SiteInfo siteInfo) {
         siteInfo.setId(1L);