From 95028e8f5266c589d2f4e547e003fadc87ae96a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Tue, 10 Mar 2020 11:10:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#825=203.7=20token=20=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98=20&=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/gateway/filter/PasswordDecoderFilter.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java index 8c500bdc2..e0cbf6955 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java @@ -80,6 +80,12 @@ public class PasswordDecoderFilter extends AbstractGatewayFilterFactory { return chain.filter(exchange); } + // 刷新token，直接向下执行 + String grantType = request.getQueryParams().getFirst("grant_type"); + if (StrUtil.equals(SecurityConstants.REFRESH_TOKEN, grantType)) { + return chain.filter(exchange); + } + Class inClass = String.class; Class outClass = String.class; ServerRequest serverRequest = ServerRequest.create(exchange, From e98f5a922daddeacc6585da698c1018e47c61f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Tue, 10 Mar 2020 11:14:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#820=20=E3=80=90=E8=8F=9C=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE=20>=20?= =?UTF-8?q?=E6=9D=83=E9=99=90=20=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=20&?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java | 7 +++++-- .../java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java index b496a5887..f85261485 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java @@ -41,7 +41,7 @@ public class MenuTree extends TreeNode implements Serializable { @ApiModelProperty(value = "菜单图标") private String icon; /** - * 菜单名称 + * 菜单名称 */ @ApiModelProperty(value = "菜单名称") private String name; @@ -60,7 +60,7 @@ public class MenuTree extends TreeNode implements Serializable { * 权限编码 */ @ApiModelProperty(value = "权限编码") - private String code; + private String permission; /** * 菜单类型 （0菜单 1按钮） */ @@ -79,9 +79,11 @@ public class MenuTree extends TreeNode implements Serializable { /** * 是否包含子节点 + * * @since 3.7 */ private Boolean hasChildren; + public MenuTree() { } @@ -106,6 +108,7 @@ public class MenuTree extends TreeNode implements Serializable { this.name = menuVo.getName(); this.path = menuVo.getPath(); this.type = menuVo.getType(); + this.permission = menuVo.getPermission(); this.label = menuVo.getName(); this.sort = menuVo.getSort(); this.keepAlive = menuVo.getKeepAlive(); diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java index 60e46bb27..8f6ad7d08 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java @@ -112,7 +112,7 @@ public class TreeUtil { node.setParentId(menu.getParentId()); node.setName(menu.getName()); node.setPath(menu.getPath()); - node.setCode(menu.getPermission()); + node.setPermission(menu.getPermission()); node.setLabel(menu.getName()); node.setIcon(menu.getIcon()); node.setType(menu.getType());