From b333a8557481a773222267d7e9836b75c916d2a9 Mon Sep 17 00:00:00 2001
From: 6500liuwei <1540629869@qq.com>
Date: Mon, 8 May 2017 17:15:52 +0800
Subject: [PATCH] =?UTF-8?q?1.jdk=E7=BC=96=E8=AF=91=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA1.8=202.=E6=94=AF=E6=8C=81=E6=97=A0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=BF=9E=E6=8E=A5redis;=203.=E6=96=B0=E5=A2=9Ejar?=
 =?UTF-8?q?=E5=8C=85javax.websocket-api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 31 ++++++++++++++++---
 mt-demo/pom.xml                               |  5 +++
 mt-framework/pom.xml                          | 13 ++++++++
 .../java/wang/moshu/message/RedisUtil.java    |  2 ++
 pom.xml                                       | 14 +++++++++
 5 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index bfdf804..8637504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,29 @@
-*.project
+# maven #
+target
+
+logs
+
+# windows #
+Thumbs.db
+
+# Mac #
+.DS_Store
+
+# eclipse #
 .settings
-*.classpath
-classes
-/mt-demo/target/m2e-wtp/web-resources/META-INF
+.project
+.classpath
+.log
+*.class
+
+# idea #
+.idea
 *.iml
+
+# Package Files #
+*.jar
+*.war
+*.ear
+/target
+/mt-demo/target/m2e-wtp/web-resources/META-INF
+
diff --git a/mt-demo/pom.xml b/mt-demo/pom.xml
index db183ff..f6c21f5 100644
--- a/mt-demo/pom.xml
+++ b/mt-demo/pom.xml
@@ -29,5 +29,10 @@
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.7.5</version>
 		</dependency>
+		<dependency>
+			<groupId>javax.websocket</groupId>
+			<artifactId>javax.websocket-api</artifactId>
+			<version>1.0</version>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/mt-framework/pom.xml b/mt-framework/pom.xml
index 9974bdc..ba26883 100644
--- a/mt-framework/pom.xml
+++ b/mt-framework/pom.xml
@@ -60,4 +60,17 @@
 			<version>1.4.2</version>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/mt-framework/src/main/java/wang/moshu/message/RedisUtil.java b/mt-framework/src/main/java/wang/moshu/message/RedisUtil.java
index 79856a6..166b8d7 100644
--- a/mt-framework/src/main/java/wang/moshu/message/RedisUtil.java
+++ b/mt-framework/src/main/java/wang/moshu/message/RedisUtil.java
@@ -6,6 +6,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 
+import org.springframework.util.StringUtils;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
@@ -137,6 +138,7 @@ public class RedisUtil implements InitializingBean
 		config.setMaxIdle(maxIdle);
 		config.setMinIdle(minIdle);
 
+		password = StringUtils.isEmpty(password) ? null : password;
 		pool = new JedisPool(config, host, port, timeout, password, DB);
 
 	}
diff --git a/pom.xml b/pom.xml
index f77f725..669629e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,4 +8,18 @@
   	<module>mt-framework</module>
   	<module>mt-demo</module>
   </modules>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
-- 
Gitee