From 640add74fe75427df3e9a9da3ffdf98ae3da3272 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 24 三月 2026 17:29:25 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材
---
src/main/resources/application-druid.yml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml
index 70ab54a..b613de4 100644
--- a/src/main/resources/application-druid.yml
+++ b/src/main/resources/application-druid.yml
@@ -6,8 +6,8 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://114.132.189.42:9004/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 浠庡簱鏁版嵁婧�
@@ -62,8 +62,8 @@
multi-statement-allow: true
file:
-# temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
-# upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
+ temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
+ upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
+# temp-dir: /javaWork/product-inventory-management/file/temp/uploads
+# upload-dir: /javaWork/product-inventory-management/file/prod/uploads
--
Gitblit v1.9.3