Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mall-service/src/main/resources/bootstrap.properties

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

@@ -85,6 +85,34 @@ logging.level.java.sql=DEBUG
 
 
 
+dev.redis=124.220.229.80:6379
+pro.redis=r-gs50pf9efmh3s8eekx.redis.singapore.rds.aliyuncs.com:6379
+pro2.redis=r-gs5nqh2z2uwhw49qas.redis.singapore.rds.aliyuncs.com:6379
+
+
+#dev.redis.password=mypassword
+#pro.redis.password=
+#pro2.redis.password=
+
+
+#redisson.singleServerConfig.address=redis://${${spring.profiles.active}.redis}
+#redisson.singleServerConfig.password=${${spring.profiles.active}.redis.password}
+## \u9ED8\u8BA4\u6570\u636E\u5E93\u4E3A0
+#redisson.singleServerConfig.database=0
+#
+#redisson.singleServerConfig.connectionPoolSize=15
+## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570
+#redisson.singleServerConfig.connectionMinimumIdleSize=5
+## \u8FDE\u63A5\u7A7A\u95F2\u8D85\u65F6\uFF0C\u5355\u4F4D\uFF1A\u6BEB\u79D2
+#redisson.singleServerConfig.idleConnectionTimeout=10000
+## \u8D85\u65F6\u65F6\u95F4\uFF0C\u5355\u4F4D\uFF1A\u6BEB\u79D2
+#redisson.singleServerConfig.connectTimeout=30000
+## \u547D\u4EE4\u7B49\u5F85\u8D85\u65F6\uFF0C\u5355\u4F4D\uFF1A\u6BEB\u79D2
+#redisson.singleServerConfig.timeout=30000
+## \u547D\u4EE4\u5931\u8D25\u91CD\u8BD5\u6B21\u6570
+#redisson.singleServerConfig.retryAttempts=2
+## \u547D\u4EE4\u91CD\u8BD5\u53D1\u9001\u65F6\u95F4\u95F4\u9694\uFF0C\u5355\u4F4D\uFF1A\u6BEB\u79D2
+#redisson.singleServerConfig.retryInterval=1500
 #dev.redis=124.220.229.80:6379
 #pro.redis=r-gs50pf9efmh3s8eekx.redis.singapore.rds.aliyuncs.com:6379
 #pro2.redis=r-gs5nqh2z2uwhw49qas.redis.singapore.rds.aliyuncs.com:6379