From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8e0d161..d9b2931 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,12 +1,9 @@
logging:
path: ./log/
-#spring:
-# datasource:
-# url: jdbc:mysql://80.36.32.171:3306/xzs?useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true
-# username: root
-# password: qirong_123
-# driver-class-name: com.mysql.cj.jdbc.Driver
+upload:
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
+ url: E:/ycl/file
spring:
datasource:
@@ -14,3 +11,7 @@
username: root
password: 321$YcYl@1970!
driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://127.0.0.1:3306/xzsqy?useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true
+# username: root
+# password: 123456
+# driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.8.0