[合并] ‘caihaohan’合并到 ‘lixuetao’ 解决冲突

2023-04-24 11:18:57 +08:00
parent 6d3e7fe66e
commit 2d1b1d2066
8 changed files with 22 additions and 64 deletions
@@ -35,7 +35,7 @@
 #spring.datasource.mysql.password = root

 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 spring.datasource.username = root
 spring.datasource.password = hzwlsoft.com

@@ -86,11 +86,6 @@ MAIL_POP_PORT=110
 #MAIL_USERNAME=64459@Any3.com
 #MAIL_PASSWORD=65316975Xiaoq

-
-
-
-
-
 IPANDPORT=http://localhost:7061/

 #redis
@@ -133,10 +128,8 @@ huawei.OBS.fileMaxSize=10 #文件上传最大M数

 logging.level.com.adc: debug

-
-# ======= ddm权限接口 集成 =========
-ddm-identity=changan_test
-ddm-company=9
-ddm-ras-public-key=
-
+# ==== IAM????
+iam.url=https://iamuat.faw-vw.com/
+iam.appkey=xxxx
+iam.appSecret=xxx