From 1640cc4555e9a354679be948a69eaf297f9c6b30 Mon Sep 17 00:00:00 2001 From: xiang Date: Mon, 28 Jul 2025 00:19:35 +0800 Subject: [PATCH 1/2] =?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 --- script/src/main/resources/application-local.yml | 7 ++++++- script/src/main/resources/application-nas.yml | 12 ------------ script/src/main/resources/application-prod.yml | 12 +++++++++--- script/src/main/resources/application-test.yml | 11 +++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 script/src/main/resources/application-nas.yml create mode 100644 script/src/main/resources/application-test.yml diff --git a/script/src/main/resources/application-local.yml b/script/src/main/resources/application-local.yml index 3324d40..a70c1d5 100644 --- a/script/src/main/resources/application-local.yml +++ b/script/src/main/resources/application-local.yml @@ -3,4 +3,9 @@ spring: url: jdbc:mysql:///xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true username: root password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file + driver-class-name: com.mysql.cj.jdbc.Driver + +aliyun: + dns: + RR: + - local diff --git a/script/src/main/resources/application-nas.yml b/script/src/main/resources/application-nas.yml deleted file mode 100644 index dcfef97..0000000 --- a/script/src/main/resources/application-nas.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://192.168.2.10:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true - username: root - password: Admin@123 - driver-class-name: com.mysql.cj.jdbc.Driver - -aliyun: - dns: - RR: - - client - - file \ No newline at end of file diff --git a/script/src/main/resources/application-prod.yml b/script/src/main/resources/application-prod.yml index 7cd791c..dcfef97 100644 --- a/script/src/main/resources/application-prod.yml +++ b/script/src/main/resources/application-prod.yml @@ -1,6 +1,12 @@ spring: datasource: - url: jdbc:mysql://172.28.159.213:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true + url: jdbc:mysql://192.168.2.10:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file + password: Admin@123 + driver-class-name: com.mysql.cj.jdbc.Driver + +aliyun: + dns: + RR: + - client + - file \ No newline at end of file diff --git a/script/src/main/resources/application-test.yml b/script/src/main/resources/application-test.yml new file mode 100644 index 0000000..f967109 --- /dev/null +++ b/script/src/main/resources/application-test.yml @@ -0,0 +1,11 @@ +spring: + datasource: + url: jdbc:mysql://172.28.159.213:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true + username: root + password: 123456 + driver-class-name: com.mysql.cj.jdbc.Driver + +aliyun: + dns: + RR: + - test \ No newline at end of file From 3510c6eeca13eb7b0792fb2f723a4db28906516f Mon Sep 17 00:00:00 2001 From: xiang Date: Mon, 28 Jul 2025 00:21:33 +0800 Subject: [PATCH 2/2] =?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 --- script/src/main/resources/application-local.yml | 15 +++++++++++++-- script/src/main/resources/application-prod.yml | 12 ++++++++++++ script/src/main/resources/application-test.yml | 12 ++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/script/src/main/resources/application-local.yml b/script/src/main/resources/application-local.yml index a70c1d5..f30a80e 100644 --- a/script/src/main/resources/application-local.yml +++ b/script/src/main/resources/application-local.yml @@ -1,10 +1,21 @@ spring: datasource: - url: jdbc:mysql:///xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true + url: jdbc:mysql://120.27.153.87:3306/xservice-script-test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver - + redis: + host: r-bp1dqqbzlfw04fldp3pd.redis.rds.aliyuncs.com + port: 6379 + password: Admin@123 # 如果无密码可以省略 + database: 0 + timeout: 5000 + lettuce: + pool: + max-active: 8 + max-idle: 8 + min-idle: 0 + max-wait: 1000 aliyun: dns: RR: diff --git a/script/src/main/resources/application-prod.yml b/script/src/main/resources/application-prod.yml index dcfef97..30da4e8 100644 --- a/script/src/main/resources/application-prod.yml +++ b/script/src/main/resources/application-prod.yml @@ -4,6 +4,18 @@ spring: username: root password: Admin@123 driver-class-name: com.mysql.cj.jdbc.Driver + redis: + host: 192.168.2.10 + port: 6379 + password: Admin@123 # 如果无密码可以省略 + database: 0 + timeout: 5000 + lettuce: + pool: + max-active: 8 + max-idle: 8 + min-idle: 0 + max-wait: 1000 aliyun: dns: diff --git a/script/src/main/resources/application-test.yml b/script/src/main/resources/application-test.yml index f967109..297b5fd 100644 --- a/script/src/main/resources/application-test.yml +++ b/script/src/main/resources/application-test.yml @@ -4,6 +4,18 @@ spring: username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver + redis: + host: r-bp1dqqbzlfw04fldp3pd.redis.rds.aliyuncs.com + port: 6379 + password: Admin@123 # 如果无密码可以省略 + database: 0 + timeout: 5000 + lettuce: + pool: + max-active: 8 + max-idle: 8 + min-idle: 0 + max-wait: 1000 aliyun: dns: