This is an automated email from the ASF dual-hosted git repository.
hefengen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 2f017d39fc [ISSUE #5333]Upgrade Shiro version to a secure version.
(#5334)
2f017d39fc is described below
commit 2f017d39fc65bb9968de66b41486646dc4b3c01e
Author: Junwei Lian <[email protected]>
AuthorDate: Sat Dec 2 22:26:16 2023 +0800
[ISSUE #5333]Upgrade Shiro version to a secure version. (#5334)
* apidoc sql
* refact
* commit
* [Task] Shenyu-admin: Fix API document failed to build because of NPE.
* [Task] Shenyu-admin: Fix API document failed to build because of NPE.
* solve conficts,modify LICENSE.
* delete useless code.
* delete useless code.
* commit
* [ISSUE #3843]admin apidoc fix: the required attribute prompt is incorrect
when micro service parameter uses "@ApiModelProperty".
* commit
* [shenyu-examples]add swagger to the example project to test the apidoc
function of the gateway management system.
* commit
* commit
* commit
* [ISSUE #4690]Supports gzip compression in response to HTTP requests.
* [examples]Add Swagger sample project to demonstrate automatic pull
interface documentation.
* delete exapmple
* delete useless code.
* delete useless code.
* Upgrade Shiro version to a secure version.
---------
Co-authored-by: lianjunwei <[email protected]>
Co-authored-by: dragon-zhang <[email protected]>
---
pom.xml | 2 +-
.../java/org/apache/shenyu/admin/controller/ResourceController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index abb9b9e63b..dc347dd258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
<wiremock.version>2.18.0</wiremock.version>
<zookeeper.version>3.5.7</zookeeper.version>
<zkclient.version>0.10</zkclient.version>
- <shiro.version>1.8.0</shiro.version>
+ <shiro.version>1.13.0</shiro.version>
<jwt.version>3.12.0</jwt.version>
<motan.version>1.2.1</motan.version>
<spring-boot.version>2.7.13</spring-boot.version>
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ResourceController.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ResourceController.java
index 98a1fa6b29..57c258b9f3 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ResourceController.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ResourceController.java
@@ -118,7 +118,7 @@ public class ResourceController {
* @return {@linkplain ShenyuAdminResult}
*/
@GetMapping("/{id}")
- @RequiresPermissions(value = {"system:resource:list",
"system:resource:editMenu", "system:resource:list"}, logical = Logical.OR)
+ @RequiresPermissions(value = {"system:resource:list",
"system:resource:editMenu"}, logical = Logical.OR)
public ShenyuAdminResult detailResource(@PathVariable("id") final String
id) {
return Optional.ofNullable(resourceService.findById(id))
.map(item ->
ShenyuAdminResult.success(ShenyuResultMessage.DETAIL_SUCCESS, item))
