Merge branch 'dev' into test

6 years ago · 8e6c2556a1
parent d4b84598fb 52729845d8
commit 8e6c2556a1
2 changed files with 3 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,4 +11,5 @@ target
 *.jar
 *.class
 .md
-*.log
+*.log
+*.properties
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@ -111,7 +111,7 @@ impp.schedule.thread-priority=5
 #redisIP
 redis.hostName=192.168.1.240
 #端口号
-redis.port=16376
+redis.port=6379
 #如果有密码
 redis.password=
 ##其他redis配置需要调整的加在此处