From b8048704ba2a2cf0b533251227b893ef0b1d7735 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Sat, 18 May 2024 01:00:42 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E7=9B=91=E5=90=AC;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/common/RabbitMQ/GenerateConsumer.java  | 118 +++++++++---------
 .../com/ai/da/common/RabbitMQ/SRConsumer.java |  24 ++--
 .../resources/application-prod.properties     |   6 +-
 3 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
index 876dfd2c..3e8e6a6e 100644
--- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
@@ -154,63 +154,63 @@ public class GenerateConsumer {
 
     }
 
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer1(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 1");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer2(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 2");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer3(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 3");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer4(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 4");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer5(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 5");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer6(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 6");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer7(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 7");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer8(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 8");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
-//    @RabbitHandler
-//    public void generateConsumer9(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 9");
-//    }
-//
-//    @RabbitListener(queues = MQConfig.GENERATE_RESULT_QUEUE)
-//    @RabbitHandler
-//    public void getGenerateResult(Message msg, Channel channel) {
-//        processGenerateResult(msg, channel);
-//    }
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer1(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 1");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer2(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 2");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer3(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 3");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer4(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 4");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer5(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 5");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer6(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 6");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer7(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 7");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer8(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 8");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitHandler
+    public void generateConsumer9(Message msg, Channel channel) {
+        generate(msg, channel, "consumer 9");
+    }
+
+    @RabbitListener(queues = MQConfig.GENERATE_RESULT_QUEUE)
+    @RabbitHandler
+    public void getGenerateResult(Message msg, Channel channel) {
+        processGenerateResult(msg, channel);
+    }
 }
diff --git a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
index b8ba32f2..6ad261bd 100644
--- a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
@@ -218,17 +218,17 @@ public class SRConsumer {
         taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null);
     }
 
-//    @RabbitListener(queues = MQConfig.SR_QUEUE)
-//    @RabbitHandler
-//    public void SRConsumer1(Message msg, Channel channel) {
-//        superResolution(msg, channel, "consumer 1");
-//    }
-//
-//
-//    @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE)
-//    @RabbitHandler
-//    public void SRResultConsumer1(Message msg, Channel channel) {
-//        getSRResult(msg, channel, "consumer 1");
-//    }
+    @RabbitListener(queues = MQConfig.SR_QUEUE)
+    @RabbitHandler
+    public void SRConsumer1(Message msg, Channel channel) {
+        superResolution(msg, channel, "consumer 1");
+    }
+
+
+    @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE)
+    @RabbitHandler
+    public void SRResultConsumer1(Message msg, Channel channel) {
+        getSRResult(msg, channel, "consumer 1");
+    }
 
 }
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index e9d15e0d..67ed6466 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -66,10 +66,10 @@ spring.rabbitmq.username=rabbit
 spring.rabbitmq.password=123456
 spring.rabbitmq.virtual-host=/
 
-spring.redis.host=172.31.11.32
-#spring.redis.host=18.167.251.121
+#spring.redis.host=172.31.11.32
+spring.redis.host=18.167.251.121
 spring.redis.port=6379
-spring.redis.database=2
+spring.redis.database=1
 spring.redis.password=Aidlab
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-idle=8