Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project

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<String> roleIdList;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 

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);
+	}
 }

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
+    //@Bean
-    public IRule getMyLoadBalancerRule(Environment env) {
+    //public IRule getMyLoadBalancerRule(Environment env) {
-        EpmetRequestLoadBalancerRule rule = new EpmetRequestLoadBalancerRule();
+    //    EpmetRequestLoadBalancerRule rule = new EpmetRequestLoadBalancerRule();
-        rule.setEnv(env);
+    //    rule.setEnv(env);
-        return rule;
+    //    return rule;
-    }
+    //}
 
 }