Merge remote-tracking branch 'origin/deng' into deng

src/main/resources/es.properties

@@ -2,8 +2,8 @@ es.nodes=127.0.0.1
 #es.nodes=122.51.194.184
 es.host=9300
 #es.name=elastic
-es.name=my-application
+#es.name=elasticsearch
 #es.name=elasticsearch-sipaiis
-
+es.name=my-application
 
 

src/main/resources/redis.properties

@@ -1,10 +1,10 @@
 #redis<69><73><EFBFBD><EFBFBD>
-#redis.host=122.51.194.184
- redis.host=127.0.0.1
+redis.host=122.51.194.184
+# redis.host=127.0.0.1
 #<23><><EFBFBD><EFBFBD>single  <20><>Ⱥcluster
 redis.mode=single
-#redis.port=26739
- redis.port=6379
+redis.port=26739
+# redis.port=6379
 redis.password=Aa112211
 redis.maxIdle=100
 redis.maxActive=300