From fc8e93a23a7447e21b4ab078b777183982f196f9 Mon Sep 17 00:00:00 2001
From: lishangbu <shangshili@hotmail.com>
Date: Mon, 10 Dec 2018 18:16:21 +0800
Subject: [PATCH] :art: Improving structure / format of the code.

---
 .../pigx/common/security/service/PigxUser.java       |  1 -
 .../com/pig4cloud/pigx/admin/api/dto/UserInfo.java   |  1 -
 .../pig4cloud/pigx/manager/config/ConfigReader.java  | 12 ++++++------
 pom.xml                                              |  4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java
index 099d7687c..cae1f7f50 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java
@@ -72,7 +72,6 @@ public class PigxUser extends User {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.id = id;
 		this.deptId = deptId;
-		this.deptId = deptId;
 		this.tenantId = tenantId;
 	}
 }
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java
index 899b7eab8..f7a7e6072 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java
@@ -36,7 +36,6 @@ import java.io.Serializable;
  * commit('SET_PERMISSIONS', data)
  */
 @Data
-@ToString
 public class UserInfo implements Serializable {
 	/**
 	 * 用户基本信息
diff --git a/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/config/ConfigReader.java b/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/config/ConfigReader.java
index 90ba04343..85b3c9837 100644
--- a/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/config/ConfigReader.java
+++ b/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/config/ConfigReader.java
@@ -29,15 +29,15 @@ public class ConfigReader {
 	/**
 	 * 事务默认数据的位置，有最大时间
 	 */
-	private final String key_prefix = "tx:manager:default:";
+	private static final String KEY_PREFIX = "tx:manager:default:";
 	/**
 	 * 负载均衡模块存储信息
 	 */
-	private final String key_prefix_loadbalance = "tx:manager:loadbalance:";
+	private static final String KEY_PREFIX_LOADBALANCE = "tx:manager:loadbalance:";
 	/**
 	 * 补偿事务永久存储数据
 	 */
-	private final String key_prefix_compensate = "tx:manager:compensate:";
+	private static final String TX_MANAGER_COMPENSATE = "tx:manager:compensate:";
 	@Value("${tm.socket.port}")
 	private int socketPort;
 	@Value("${tm.socket.maxconnection}")
@@ -58,7 +58,7 @@ public class ConfigReader {
 	private int compensateMaxWaitTime;
 
 	public String getKeyPrefixLoadbalance() {
-		return key_prefix_loadbalance;
+		return KEY_PREFIX_LOADBALANCE;
 	}
 
 	public String getCompensateNotifyUrl() {
@@ -66,11 +66,11 @@ public class ConfigReader {
 	}
 
 	public String getKeyPrefix() {
-		return key_prefix;
+		return KEY_PREFIX;
 	}
 
 	public String getKeyPrefixCompensate() {
-		return key_prefix_compensate;
+		return TX_MANAGER_COMPENSATE;
 	}
 
 	public int getSocketPort() {
diff --git a/pom.xml b/pom.xml
index 2e779552b..eed9b85e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<organization>
-		<name>Pig4Cloud</name>
+		<name>pig4cloud</name>
 		<url>https://www.pig4cloud.com</url>
 	</organization>
 	<developers>
@@ -49,7 +49,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spring-boot-admin.version>2.0.4</spring-boot-admin.version>
-		<hutool.version>4.2.1</hutool.version>
+		<hutool.version>4.3.0</hutool.version>
 		<mybatis-plus.version>3.0.6</mybatis-plus.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<swagger.version>2.9.2</swagger.version>