From 39b93d9dbf4df53c4b2e35dda99457aad4093d1e Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期二, 19 十一月 2024 16:15:27 +0800
Subject: [PATCH] change druid
---
billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java | 1 -
billion-admin/src/main/resources/application-druid.yml | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/billion-admin/src/main/resources/application-druid.yml b/billion-admin/src/main/resources/application-druid.yml
index 18bb86d..405c2a1 100644
--- a/billion-admin/src/main/resources/application-druid.yml
+++ b/billion-admin/src/main/resources/application-druid.yml
@@ -6,16 +6,16 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.168.0.189:3306/billion-db-base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/billion-db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: root
# 浠庡簱鏁版嵁婧�
- slave:
- # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: true
- url: jdbc:mysql://192.168.0.189:3306/billion-db-self?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
+# slave:
+# # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+# enabled: false
+# url: jdbc:mysql://127.0.0.1:3306/billion-db-self?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: root
+# password: root
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
diff --git a/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
index 5601bbe..057c944 100644
--- a/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
@@ -18,7 +18,6 @@
public class DaMaterialCollectionServiceImpl extends ServiceImpl<DaMaterialCollectionMapper, DaMaterialCollection>
implements DaMaterialCollectionService{
- public R getData(){}
}
--
Gitblit v1.9.3