Merge branch 'master' into docker_package

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

@@ -99,4 +99,11 @@ sso:
 #      driver-class-name: org.postgresql.Driver
 #      url: jdbc:postgresql://123456:5432/security_enterprise
 #      username: postgres
-#      password: 123456
+#      password: 123456
+
+#同步摄像头标签表t_channel_mtm_label需要链接的数据库配置
+synchro:
+  driver-class-name: com.mysql.cj.jdbc.Driver
+  url: jdbc:mysql://127.0.0.1:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
+  username: root
+  password: root

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

@@ -32,7 +32,7 @@ server:
 spring:
   # 环境 dev|test|prod|show
   profiles:
-    active: dev
+    active: my
   messages:
     encoding: UTF-8
     basename: i18n/messages