From fbe37e2e00bddec409b595a4a6e50c4bb32a008a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 21 三月 2023 18:29:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
index f46898c..b798a72 100644
--- a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
+++ b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
@@ -68,7 +68,7 @@
 	 * 璇︽儏
 	 */
 	@GetMapping("/detail")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "璇︽儏", notes = "浼犲叆menu")
 	public R<MenuVO> detail(Menu menu) {
@@ -84,7 +84,7 @@
 		@ApiImplicitParam(name = "code", value = "鑿滃崟缂栧彿", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "鑿滃崟鍚嶇О", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "鍒楄〃", notes = "浼犲叆menu")
 	public R<List<MenuVO>> list(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -100,7 +100,7 @@
 		@ApiImplicitParam(name = "code", value = "鑿滃崟缂栧彿", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "鑿滃崟鍚嶇О", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鎳掑姞杞藉垪琛�", notes = "浼犲叆menu")
 	public R<List<MenuVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -116,7 +116,7 @@
 		@ApiImplicitParam(name = "code", value = "鑿滃崟缂栧彿", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "鑿滃崟鍚嶇О", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "鑿滃崟鍒楄〃", notes = "浼犲叆menu")
 	public R<List<MenuVO>> menuList(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -132,7 +132,7 @@
 		@ApiImplicitParam(name = "code", value = "鑿滃崟缂栧彿", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "name", value = "鑿滃崟鍚嶇О", paramType = "query", dataType = "string")
 	})
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "鎳掑姞杞借彍鍗曞垪琛�", notes = "浼犲叆menu")
 	public R<List<MenuVO>> lazyMenuList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -144,7 +144,7 @@
 	 * 鏂板鎴栦慨鏀�
 	 */
 	@PostMapping("/submit")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆menu")
 	public R submit(@Valid @RequestBody Menu menu) {
@@ -163,7 +163,7 @@
 	 * 鍒犻櫎
 	 */
 	@PostMapping("/remove")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "鍒犻櫎", notes = "浼犲叆ids")
 	public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
@@ -274,7 +274,7 @@
 	/**
 	 * 鑾峰彇閰嶇疆鐨勮鑹叉潈闄�
 	 */
-	@GetMapping("auth-routes")
+	@GetMapping("/auth-routes")
 	@ApiOperationSupport(order = 17)
 	@ApiOperation(value = "鑿滃崟鐨勮鑹叉潈闄�")
 	public R<List<Kv>> authRoutes(BladeUser user) {

--
Gitblit v1.9.3