aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
This commit is contained in:
xupei
2024-06-17 10:25:20 +08:00
parent 375f717721 0017568cc7
commit 1d60a6a129
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
View File

@@ -72,7 +72,7 @@ public class GenerateConsumer {
try {
generateService.generateThroughImageText(generateThroughImageTextDTO);
}catch (Exception e){
log.error(e.getMessage());
log.error("error message : {}", e.getMessage());
}
// 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除
redisUtil.removeFromZSet(consumptionOrderKey, uniqueId);

13
src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
View File

@@ -13,13 +13,16 @@ public class MQConfig {
// ==================================================================
// public static final String GENERATE_QUEUE = "generate-queue-local";
public static final String GENERATE_QUEUE = "generate-queue-dev";
// public static final String GENERATE_QUEUE = "generate-queue-prod";
//
// public static final String SR_QUEUE = "SR-queue-local";
public static final String SR_QUEUE = "SR-queue-dev";
public static final String SR_QUEUE = "SR-queue-dev";
// public static final String SR_QUEUE = "SR-queue-prod";
//
// public static final String SR_RESULT_QUEUE = "SuperResolution-local";
public static final String SR_RESULT_QUEUE = "SuperResolution-dev";
public static final String SR_RESULT_QUEUE = "SuperResolution-dev";
// public static final String SR_RESULT_QUEUE = "SuperResolution-prod";
//
// public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local";
public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev";

8
src/main/java/com/ai/da/common/constant/CommonConstant.java
View File

@@ -21,6 +21,12 @@ public class CommonConstant {
public static final String GENERATE_SINGLE_LOGO = "/api/generate_single_logo";
public static final String GENERATE_SLOGAN = "/api/slogan";
public static final String GENERATE_SLOGAN = "/apislogan";
public static final String PYTHON_PORT_9996 = "9996";
public static final String PYTHON_PORT_9997 = "9997";
}