From 07f69bd79782adf7352c2add0a96ac0aa8f398ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?= <13694051+wangxizhao123@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 21:21:14 +0800 Subject: [PATCH] =?UTF-8?q?fast()rabbitmq=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/EnterpriseController.java | 15 ++++----------- .../muyu/cloud/controller/CloudController.java | 3 ++- .../muyu/cloud/datasource/config/DruidConfig.java | 3 +-- .../cloud/datasource/util/DataSourceService.java | 2 ++ .../src/main/java/com/muyu/cloud/mq/Consumer.java | 13 +++++++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java index d8f78c4..d79c8f1 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java @@ -9,14 +9,7 @@ import com.muyu.goods.domain.Custom; import com.muyu.goods.domain.Enterprise; import com.muyu.goods.domain.Sources; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; @@ -115,7 +108,7 @@ public class EnterpriseController extends BaseController * @return */ @PostMapping("oneName") - public Result oneName(String enterpriseName) { + public Result oneName(String enterpriseName) { return success(enterpriseService.oneName(enterpriseName)); } @@ -125,7 +118,7 @@ public class EnterpriseController extends BaseController * @return */ @PostMapping("onePhone") - public Result onePhone(String contactPhone) { + public Result onePhone(@RequestParam String contactPhone) { return success(enterpriseService.onePhone(contactPhone)); } @@ -135,7 +128,7 @@ public class EnterpriseController extends BaseController * @return */ @PostMapping("oneEmail") - public Result oneEmail(String email) { + public Result oneEmail(@RequestParam String email) { return success(enterpriseService.oneEmail(email)); } diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java index 4d47a32..8c14a6a 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java @@ -1,6 +1,7 @@ package com.muyu.cloud.controller; -import com.muyu.cloud.datasource.DynamicDataSourceHolder; + +import com.muyu.cloud.datasource.config.DynamicDataSource; import com.muyu.cloud.datasource.config.contents.DataSourceInfo; import com.muyu.cloud.datasource.util.DataSourceService; import com.muyu.cloud.domain.Status; diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java index 88dcf61..03399f2 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java @@ -31,7 +31,7 @@ public class DruidConfig { * 获取多数据源信息列表 * @return */ - public List getDataSourceInfoList(){ + private List getDataSourceInfoList(){ List listResult = remoteSourcesService.listSources().getData(); System.out.println(listResult); List databaseNameList = new ArrayList<>(); @@ -45,7 +45,6 @@ public class DruidConfig { // }}; System.out.println(databaseNameList); List list = databaseNameList.stream().map(DataSourceInfo::dataIpBuild).toList(); -// System.out.println(list); return list; } diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/util/DataSourceService.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/util/DataSourceService.java index 6dac151..10bd44c 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/util/DataSourceService.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/util/DataSourceService.java @@ -32,6 +32,7 @@ public class DataSourceService { * @param dataSourceInfo */ public void addDataSource(DataSourceInfo dataSourceInfo){ + dynamicDataSource.put(dataSourceInfo.getIp(),druidConfig.createDataSourceConnection(dataSourceInfo)); addDefineDynamicDataSource(druidConfig.createDataSourceConnection(dataSourceInfo), dataSourceInfo.getKey()); } @@ -41,6 +42,7 @@ public class DataSourceService { */ public void addDefineDynamicDataSource(DruidDataSource druidDataSource, String dataSourceName){ Map defineTargetDataSources = dynamicDataSource.getDefineTargetDataSources(); + System.out.println(dataSourceName); defineTargetDataSources.put(dataSourceName, druidDataSource); dynamicDataSource.setTargetDataSources(defineTargetDataSources); dynamicDataSource.afterPropertiesSet(); diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/mq/Consumer.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/mq/Consumer.java index 39a2a44..2ebb781 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/mq/Consumer.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/mq/Consumer.java @@ -4,13 +4,20 @@ import com.muyu.cloud.controller.CloudController; import com.muyu.cloud.datasource.config.DruidConfig; import com.muyu.cloud.datasource.config.DynamicDataSource; import com.muyu.cloud.datasource.config.contents.DataSourceInfo; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.annotation.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.io.IOException; import java.util.List; +import java.util.concurrent.TimeoutException; + +import static java.lang.Thread.sleep; @Component @Log4j2 @@ -22,9 +29,7 @@ public class Consumer { @RabbitListener(queuesToDeclare = {@Queue("datasource")}) public void dataSource(String ip){ - System.out.println(ip); - DynamicDataSource dynamicDataSource = druidConfig.dynamicDataSource(); - log.info("初始化:{}",dynamicDataSource); -// druidConfig.getDataSourceInfoList(); + controller.selectIp(ip); + } }