diff --git a/.gitignore b/.gitignore
index bfdf8041bfc99ea1dfbea37f56a7fe4f0d67a1d5..863750406f5a1b8469a5c277969c67b6a58892c4 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 db183ffcb8efa657a0441e940dd5aae0d61f27e1..f6c21f5fa92f68a9c6feca846fa69822536be93a 100644
--- a/mt-demo/pom.xml
+++ b/mt-demo/pom.xml
@@ -29,5 +29,10 @@
slf4j-log4j12
1.7.5
+
+ javax.websocket
+ javax.websocket-api
+ 1.0
+
\ No newline at end of file
diff --git a/mt-framework/pom.xml b/mt-framework/pom.xml
index 9974bdc35ba807b931f8ebce9cbd5e30280358b6..ba26883d248dff91ecb3580b4dc2f489845e0cdd 100644
--- a/mt-framework/pom.xml
+++ b/mt-framework/pom.xml
@@ -60,4 +60,17 @@
1.4.2
+
+
+
+
+ maven-compiler-plugin
+
+ 1.8
+ 1.8
+ UTF-8
+
+
+
+
\ 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 79856a6d2ddbbb38695cfe606f029677f0ec2aad..166b8d78367b2aafb962523eab02480f53bab705 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 f77f72569ba19f1843485eeb185b9d7aade0035d..669629e856eb0c98175c3e2e6d7c3ecaac5001f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,4 +8,18 @@
mt-framework
mt-demo
+
+
+
+
+
+ maven-compiler-plugin
+
+ 1.8
+ 1.8
+ UTF-8
+
+
+
+
\ No newline at end of file