Merge remote-tracking branch 'origin/master'

backstage-service/src/main/resources/bootstrap.properties

@@ -111,11 +111,19 @@ spring.messages.basename=i18n/messages,i18n/messages_zh_CN
 spring.messages.encoding=UTF-8
 spring.messages.cache-duration=0
 
+
+dev.redis=124.220.229.80
+pro.redis=172.23.247.205
+pro2.redis=172.23.247.205
+
+dev.redis.password=mypassword
+pro.redis.password=mypassword
+pro2.redis.password=mypassword
 ##??redis
 spring.redis.database=0
-spring.redis.host=172.23.247.205
+spring.redis.host=${${spring.profiles.active}.redis}
 spring.redis.port=6379
-spring.redis.password=mypassword
+spring.redis.password=
 spring.redis.pool.max-active=100
 spring.redis.pool.max-wait=30
 spring.redis.pool.max-idle=200