From 5d19351b384447e5e9a255abec62e2bd25eeeb61 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 20 May 2020 09:58:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0TokenDTO=E7=9A=84toStri?= =?UTF-8?q?ng()=E6=96=B9=E6=B3=95=EF=BC=8C=E7=94=A8JSON.toJSONString()?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/security/dto/GovTokenDto.java | 7 ++++++- .../com/epmet/commons/tools/security/dto/TokenDto.java | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java index 5362a740ca..1025d173a4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java @@ -1,9 +1,9 @@ package com.epmet.commons.tools.security.dto; +import com.alibaba.fastjson.JSON; import lombok.Data; import java.io.Serializable; -import java.util.List; import java.util.Set; /** @@ -78,5 +78,10 @@ public class GovTokenDto extends BaseTokenDto implements Serializable { * 角色ID列表 */ private Set roleIdList; + + @Override + public String toString() { + return JSON.toJSONString(this); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java index 402dfc1b59..642bad2941 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java @@ -1,5 +1,6 @@ package com.epmet.commons.tools.security.dto; +import com.alibaba.fastjson.JSON; import lombok.Data; import java.io.Serializable; @@ -39,4 +40,8 @@ public class TokenDto extends BaseTokenDto implements Serializable { */ private long updateTime; + @Override + public String toString() { + return JSON.toJSONString(this); + } } From 6894f587ec04527aa8e530ac0c315fdc5240155b Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 20 May 2020 11:24:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=B4=9F=E8=BD=BD=E5=9D=87=E8=A1=A1?= =?UTF-8?q?=E5=99=A8=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/config/LoadBalancerConfig.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java index 2c0b3411e7..150e7253ab 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/LoadBalancerConfig.java @@ -19,11 +19,11 @@ public class LoadBalancerConfig { * 自定义负载均衡算法bean * @return */ - @Bean - public IRule getMyLoadBalancerRule(Environment env) { - EpmetRequestLoadBalancerRule rule = new EpmetRequestLoadBalancerRule(); - rule.setEnv(env); - return rule; - } + //@Bean + //public IRule getMyLoadBalancerRule(Environment env) { + // EpmetRequestLoadBalancerRule rule = new EpmetRequestLoadBalancerRule(); + // rule.setEnv(env); + // return rule; + //} }