wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-19 16:24:52 +08:00
parent ef86c15598 0cd5c87689
commit 62231a0d92
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/resources/application-dev.yml
View File

@ -104,6 +104,6 @@ sso:
#同步摄像头标签表t_channel_mtm_label需要链接的数据库配置 #同步摄像头标签表t_channel_mtm_label需要链接的数据库配置
synchro: synchro:
driver-class-name: com.mysql.cj.jdbc.Driver 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 username: root
password: root password: Hisense2019

2
renren-admin/src/main/resources/application.yml
View File

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