Merge branch 'refs/heads/feature/community-center' into preview

# Conflicts:
#	mcwl-admin/src/main/resources/application-druid.yml

mcwl-admin/src/main/resources/application-dev.yml

@@ -117,13 +117,6 @@ wechat:
   # 应用密钥
   secret: 11218568b79e2c5eb10459ef8c0374bd
 
-  #公众号配置
-#wechat:
-#  # 应用ID
-#  appid: wx82d4c3c96f0ffa5b
-#  # 应用密钥
-#  secret: abbabcf1da711a3bbd95387ec83edcac
-
 # yml版(application.yml)
 aliyun:
   oss:

mcwl-admin/src/main/resources/application-druid.yml

@@ -2,7 +2,7 @@
 spring:
   #mq
   rabbitmq:
-    host: 113.45.74.175
+    host: 113.45.9.111
     port: 5672
     username: guest
     password: guest
@@ -23,9 +23,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://113.45.74.175:3306/mcwl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://113.45.9.111:3306/mcwl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: Leng1128
+        password: ybl123456@
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -79,9 +79,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 113.45.74.175
+    host: 113.45.9.111
     # 端口，默认为6379
-    port: 6370
+    port: 6379
     # 数据库索引
     database: 0
     # 密码

mcwl-admin/src/main/resources/application.yml

@@ -52,7 +52,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: druid
   # 文件上传
   servlet:
     multipart: