From 7c2e648831a44c03ada06af12b1fcfc408b43d63 Mon Sep 17 00:00:00 2001
From: xiang <xiang@example.com>
Date: Tue, 2 Sep 2025 23:26:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 15 ++++++++-----
 .../com/xiang/xservice/IndexController.java   |  2 +-
 .../src/main/resources/application-local.yml  | 21 +++++++++++++++----
 .../src/main/resources/application-test.yml   | 21 +++++++++++++++----
 script/src/main/resources/application.yml     |  6 ++++--
 5 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b8e75f..287aa46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.xiang</groupId>
         <artifactId>xservice-basic</artifactId>
-        <version>1.1</version>
+        <version>2.0</version>
     </parent>
 
     <groupId>com.xiang</groupId>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.xiang</groupId>
             <artifactId>xservice-common</artifactId>
-            <version>1.2</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>com.xiang</groupId>
@@ -40,17 +40,22 @@
         <dependency>
             <groupId>com.xiang</groupId>
             <artifactId>xservice-schedule-starter</artifactId>
-            <version>1.1</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>com.xiang</groupId>
             <artifactId>xservice-cache-starter</artifactId>
-            <version>1.1</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>com.xiang</groupId>
             <artifactId>xservice-http-starter</artifactId>
-            <version>1.1</version>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.xiang</groupId>
+            <artifactId>xservice-mysql-starter</artifactId>
+            <version>2.0</version>
         </dependency>
 
     </dependencies>
diff --git a/script/src/main/java/com/xiang/xservice/IndexController.java b/script/src/main/java/com/xiang/xservice/IndexController.java
index a2bbe3d..3a4501a 100644
--- a/script/src/main/java/com/xiang/xservice/IndexController.java
+++ b/script/src/main/java/com/xiang/xservice/IndexController.java
@@ -25,7 +25,7 @@ public class IndexController {
     @Value("${server.port}")
     private String port;
 
-    @Value("${spring.datasource.url}")
+    @Value("${spring.datasource.dynamic.datasource.master.url}")
     private String url;
 
     @GetMapping("/index")
diff --git a/script/src/main/resources/application-local.yml b/script/src/main/resources/application-local.yml
index b670837..a2ac056 100644
--- a/script/src/main/resources/application-local.yml
+++ b/script/src/main/resources/application-local.yml
@@ -1,9 +1,22 @@
 spring:
+  cloud:
+    nacos:
+      discovery:
+        group: DEFAULT_GROUP
+        namespace: 00131110-3ecb-4a35-8bbb-624edde1d937
+        server-addr: general.xiangtech.xyz:8848
+        username: nacos
+        password: nacos
   datasource:
-    url: jdbc:mysql://rm-bp15t34gqx62jm069ro.mysql.rds.aliyuncs.com:3306/xservice-script-test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: xb#UWqnhH24&XpX
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      primary: master
+      datasource:
+        master:
+          url: jdbc:mysql://rm-bp15t34gqx62jm069ro.mysql.rds.aliyuncs.com:3306/xservice-script-test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: xb#UWqnhH24&XpX
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          sshConnect: false
   redis:
     host: r-bp1wt59a6nfyt4e3ltpd.redis.rds.aliyuncs.com
     port: 6379
diff --git a/script/src/main/resources/application-test.yml b/script/src/main/resources/application-test.yml
index 52f512a..0bcd541 100644
--- a/script/src/main/resources/application-test.yml
+++ b/script/src/main/resources/application-test.yml
@@ -1,9 +1,22 @@
 spring:
+  cloud:
+    nacos:
+      discovery:
+        group: DEFAULT_GROUP
+        namespace: e4a9b94d-637e-4faf-8521-6ffc090a8c03
+        server-addr: general.xiangtech.xyz:8848
+        username: nacos
+        password: nacos
   datasource:
-    url: jdbc:mysql://rm-bp15t34gqx62jm069ro.mysql.rds.aliyuncs.com:3306/xservice-script-test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: xb#UWqnhH24&XpX
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      primary: master
+      datasource:
+        master:
+          url: jdbc:mysql://rm-bp15t34gqx62jm069ro.mysql.rds.aliyuncs.com:3306/xservice-script-test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: xb#UWqnhH24&XpX
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          sshConnect: false
   redis:
     host: r-bp1wt59a6nfyt4e3ltpd.redis.rds.aliyuncs.com
     port: 6379
diff --git a/script/src/main/resources/application.yml b/script/src/main/resources/application.yml
index 9d81df6..075ffec 100644
--- a/script/src/main/resources/application.yml
+++ b/script/src/main/resources/application.yml
@@ -12,11 +12,13 @@ xiaobei:
             021688, 021536, 019571, 168204, 020741, 013594"
 
 server:
-  port: 8080
+  port: 38012
 
 spring:
   profiles:
-    active: local
+    active: test
+  application:
+    name: xservice-script-center
 
 http:
   maxAttempts: 10