Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-19 16:24:52 +08:00
commit 62231a0d92
2 changed files with 3 additions and 3 deletions

View File

@ -104,6 +104,6 @@ sso:
#同步摄像头标签表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
url: jdbc:mysql://15.2.21.238:3310/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
username: root
password: root
password: Hisense2019

View File

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