From 19e259a15ec9beb929c9697f6d363531a571b204 Mon Sep 17 00:00:00 2001
From: lxj <15683799673@163.com>
Date: Wed, 27 Aug 2025 18:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sis/config/RocketMQClusterConfig.java     | 120 +++++++++---------
 .../src/main/resources/application.properties |   4 +-
 2 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java
index 8096dfc1..3ece5107 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java
@@ -1,61 +1,32 @@
-package org.dromara.sis.config;
-
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author lsm
- * @apiNote RocketMQClusterConfig
- * @since 2025/8/26
- */
-@Configuration
-public class RocketMQClusterConfig {
-
-    // 从配置文件中读取 cluster 的配置
-    @Value("${rocketmq.cluster1.name-server}")
-    private String nameServer1;
-
-    @Value("${rocketmq.cluster1.producer.group}")
-    private String producerGroup1;
-
-    // 为第一个集群创建生产者实例
-    @Bean({"clusterProducerOne"})
-    public DefaultMQProducer clusterProducerOne() throws Exception {
-        DefaultMQProducer producer = new DefaultMQProducer(producerGroup1);
-        producer.setNamesrvAddr(nameServer1);
-        // 设置发送超时时间
-        producer.setSendMsgTimeout(5000);
-        // 设置重试次数
-        producer.setRetryTimesWhenSendFailed(2);
-        producer.setRetryTimesWhenSendAsyncFailed(2);
-        return producer;
-    }
-
-    // 使用上面的生产者实例创建 RocketMQTemplate
-    @Bean("rocketMQTemplateClusterOne")
-    public RocketMQTemplate rocketMQTemplateClusterOne(@Qualifier("clusterProducerOne") DefaultMQProducer producer) {
-        RocketMQTemplate template = new RocketMQTemplate();
-        template.setProducer(producer);
-        return template;
-    }
-
-
-    // 从配置文件中读取 cluster 的配置
-//    @Value("${rocketmq.cluster2.name-server}")
-//    private String nameServer2;
+//package org.dromara.sis.config;
 //
-//    @Value("${rocketmq.cluster2.producer.group}")
-//    private String producerGroup2;
+//import org.apache.rocketmq.client.producer.DefaultMQProducer;
+//import org.apache.rocketmq.spring.core.RocketMQTemplate;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
 //
-//    // 为第二个集群创建生产者实例
-//    @Bean({"clusterProducerTwo"})
-//    public DefaultMQProducer clusterProducerTwo() throws Exception {
-//        DefaultMQProducer producer = new DefaultMQProducer(producerGroup2);
-//        producer.setNamesrvAddr(nameServer2);
+///**
+// * @author lsm
+// * @apiNote RocketMQClusterConfig
+// * @since 2025/8/26
+// */
+//@Configuration
+//public class RocketMQClusterConfig {
+//
+//    // 从配置文件中读取 cluster 的配置
+//    @Value("${rocketmq.cluster1.name-server}")
+//    private String nameServer1;
+//
+//    @Value("${rocketmq.cluster1.producer.group}")
+//    private String producerGroup1;
+//
+//    // 为第一个集群创建生产者实例
+//    @Bean({"clusterProducerOne"})
+//    public DefaultMQProducer clusterProducerOne() throws Exception {
+//        DefaultMQProducer producer = new DefaultMQProducer(producerGroup1);
+//        producer.setNamesrvAddr(nameServer1);
 //        // 设置发送超时时间
 //        producer.setSendMsgTimeout(5000);
 //        // 设置重试次数
@@ -65,11 +36,40 @@ public class RocketMQClusterConfig {
 //    }
 //
 //    // 使用上面的生产者实例创建 RocketMQTemplate
-//    @Bean("rocketMQTemplateClusterTwo")
-//    public RocketMQTemplate rocketMQTemplateClusterTwo(@Qualifier("clusterProducerTwo") DefaultMQProducer producer) {
+//    @Bean("rocketMQTemplateClusterOne")
+//    public RocketMQTemplate rocketMQTemplateClusterOne(@Qualifier("clusterProducerOne") DefaultMQProducer producer) {
 //        RocketMQTemplate template = new RocketMQTemplate();
 //        template.setProducer(producer);
 //        return template;
 //    }
-
-}
+//
+//
+//    // 从配置文件中读取 cluster 的配置
+////    @Value("${rocketmq.cluster2.name-server}")
+////    private String nameServer2;
+////
+////    @Value("${rocketmq.cluster2.producer.group}")
+////    private String producerGroup2;
+////
+////    // 为第二个集群创建生产者实例
+////    @Bean({"clusterProducerTwo"})
+////    public DefaultMQProducer clusterProducerTwo() throws Exception {
+////        DefaultMQProducer producer = new DefaultMQProducer(producerGroup2);
+////        producer.setNamesrvAddr(nameServer2);
+////        // 设置发送超时时间
+////        producer.setSendMsgTimeout(5000);
+////        // 设置重试次数
+////        producer.setRetryTimesWhenSendFailed(2);
+////        producer.setRetryTimesWhenSendAsyncFailed(2);
+////        return producer;
+////    }
+////
+////    // 使用上面的生产者实例创建 RocketMQTemplate
+////    @Bean("rocketMQTemplateClusterTwo")
+////    public RocketMQTemplate rocketMQTemplateClusterTwo(@Qualifier("clusterProducerTwo") DefaultMQProducer producer) {
+////        RocketMQTemplate template = new RocketMQTemplate();
+////        template.setProducer(producer);
+////        return template;
+////    }
+//
+//}
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
index 4385908f..ef3ece6a 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
+++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
@@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
 db.num=1
 
 ### Connect URL of DB:
-db.url.0=jdbc:mysql://113.249.101.254:18000/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://10.20.1.65:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
-db.password.0=by@2025??
+db.password.0=By@2025!
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50