Merge remote-tracking branch 'origin/main'

# Conflicts:
#	lidee-admin/src/main/resources/application-dev.yml
This commit is contained in:
chy
2026-05-07 14:38:30 +08:00
28 changed files with 2038 additions and 0 deletions

View File

@@ -38,6 +38,12 @@ spring:
username: root
password: taosdata
dbName: lidee_log
maintenance_repair_data:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/gr_report?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: gryy@8888
# slave:
# type: com.alibaba.druid.pool.DruidDataSource
# driver-class-name: com.mysql.cj.jdbc.Driver