fast()rabbitmq修改

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.*;
-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 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<Integer> 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<Integer> 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<Integer> oneEmail(String email) {
+    public Result oneEmail(@RequestParam String email) {
         return success(enterpriseService.oneEmail(email));
     }
 

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;

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<DataSourceInfo> getDataSourceInfoList(){
+    private List<DataSourceInfo> getDataSourceInfoList(){
         List<Sources> listResult = remoteSourcesService.listSources().getData();
         System.out.println(listResult);
         List<String> databaseNameList = new ArrayList<>();
@@ -45,7 +45,6 @@ public class DruidConfig {
 //        }};
         System.out.println(databaseNameList);
         List<DataSourceInfo> list = databaseNameList.stream().map(DataSourceInfo::dataIpBuild).toList();
-//        System.out.println(list);
         return list;
     }
 

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<Object, Object> defineTargetDataSources = dynamicDataSource.getDefineTargetDataSources();
+        System.out.println(dataSourceName);
         defineTargetDataSources.put(dataSourceName, druidDataSource);
         dynamicDataSource.setTargetDataSources(defineTargetDataSources);
         dynamicDataSource.afterPropertiesSet();

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);
+        controller.selectIp(ip);
-        DynamicDataSource dynamicDataSource = druidConfig.dynamicDataSource();
+
-        log.info("初始化:{}",dynamicDataSource);
-//        druidConfig.getDataSourceInfoList();
     }
 }