Merge branch 'feature' into 'release'

同步prod和dev pro文件配置

See merge request !52

src/main/resources/application-dev.properties

@@ -13,8 +13,8 @@ brandkbs.image.url=https://brandkbs2.test.zhiweidata.com/brandkbs/images/
 
 #redis
 spring.redis.host=192.168.0.39
-spring.redis.database=12
-spring.redis.port=7373
+spring.redis.database=0
+spring.redis.port=7376
 
 #mongo\u914D\u7F6E
 mongo.connectionsPerHost=200

src/main/resources/application-prod.properties

@@ -2,7 +2,6 @@ application.name = brandkbs2
 server.port=8888
 spring.flyway.encoding=UTF-8
 server.servlet.context-path=/brandkbs
-
 #jwt
 jwt.key=Token
 jwt.hour=120
@@ -10,12 +9,12 @@ jwt.hour=120
 brandkbs.file.url=/usr/local/sources/brandkbs2/files/
 brandkbs.img.url=/usr/local/sources/brandkbs2/images/
 brandkbs.head.url=/usr/local/sources/brandkbs2/head/
-brandkbs.image.url=https://brandkbs2.zhiweidata.com/brandkbs2/images/
+brandkbs.image.url=https://brandkbs2.test.zhiweidata.com/brandkbs/images/
 
 #redis
 spring.redis.host=192.168.0.39
-spring.redis.database=7
-spring.redis.port=7373
+spring.redis.database=0
+spring.redis.port=7376
 
 #mongo\u914D\u7F6E
 mongo.connectionsPerHost=200