From 70323d032e8d5013b640122319a2f260de0be9ef Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Apr 2024 18:20:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/resources/application-prod.yml | 22 +++++++++++++++++++---
pom.xml | 8 ++------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f34ed1..7ceceb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
<glassfish-jaxb.version>2.3.3</glassfish-jaxb.version>
<log4j2.version>2.15.0</log4j2.version>
<javax-jaxb.version>2.3.0</javax-jaxb.version>
+ <dynamic.version>4.3.0</dynamic.version>
</properties>
<repositories>
@@ -48,7 +49,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>3.5.1</version>
+ <version>${dynamic.version}</version>
</dependency>
<dependency>
@@ -176,11 +177,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 205a2f1..3b8785c 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,12 +1,28 @@
#spring
spring:
datasource:
+ #使用阿里的Druid
+ type: com.alibaba.druid.pool.DruidDataSource
+ dynamic:
+ primary: master #设置默认的数据源或者数据源组,默认值即为master
+ strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+ datasource:
+ master:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+ username: root
+ password: jxpskj_2018
+ sqlite:
+ driver-class-name: org.sqlite.JDBC
+ url: jdbc:sqlite::resource:static/sqlite/resource_db.db
+ username:
+ password:
# url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
# username: root
# password: yshb@123
- url: jdbc:mysql://127.0.0.1:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
- username: root
- password: jxpskj_2018
+# url: jdbc:mysql://127.0.0.1:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+# username: root
+# password: jxpskj_2018
redis:
host: 127.0.0.1
--
Gitblit v1.9.3