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

不等比缩放

Browse Source
This commit is contained in:
xupei
2024-05-28 11:17:46 +08:00
parent f4e9a3474a
commit fb8de15eca
6 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,63 +154,63 @@ public class GenerateConsumer {
} }
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer1(Message msg, Channel channel) { public void generateConsumer1(Message msg, Channel channel) {
// generate(msg, channel, "consumer 1"); generate(msg, channel, "consumer 1");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer2(Message msg, Channel channel) { public void generateConsumer2(Message msg, Channel channel) {
// generate(msg, channel, "consumer 2"); generate(msg, channel, "consumer 2");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer3(Message msg, Channel channel) { public void generateConsumer3(Message msg, Channel channel) {
// generate(msg, channel, "consumer 3"); generate(msg, channel, "consumer 3");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer4(Message msg, Channel channel) { public void generateConsumer4(Message msg, Channel channel) {
// generate(msg, channel, "consumer 4"); generate(msg, channel, "consumer 4");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer5(Message msg, Channel channel) { public void generateConsumer5(Message msg, Channel channel) {
// generate(msg, channel, "consumer 5"); generate(msg, channel, "consumer 5");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer6(Message msg, Channel channel) { public void generateConsumer6(Message msg, Channel channel) {
// generate(msg, channel, "consumer 6"); generate(msg, channel, "consumer 6");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer7(Message msg, Channel channel) { public void generateConsumer7(Message msg, Channel channel) {
// generate(msg, channel, "consumer 7"); generate(msg, channel, "consumer 7");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer8(Message msg, Channel channel) { public void generateConsumer8(Message msg, Channel channel) {
// generate(msg, channel, "consumer 8"); generate(msg, channel, "consumer 8");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
// @RabbitHandler @RabbitHandler
// public void generateConsumer9(Message msg, Channel channel) { public void generateConsumer9(Message msg, Channel channel) {
// generate(msg, channel, "consumer 9"); generate(msg, channel, "consumer 9");
// } }
//
// @RabbitListener(queues = MQConfig.GENERATE_RESULT_QUEUE) @RabbitListener(queues = MQConfig.GENERATE_RESULT_QUEUE)
// @RabbitHandler @RabbitHandler
// public void getGenerateResult(Message msg, Channel channel) { public void getGenerateResult(Message msg, Channel channel) {
// processGenerateResult(msg, channel); processGenerateResult(msg, channel);
// } }
} }

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

@@ -12,16 +12,16 @@ public class MQConfig {
// public static final String GENERATE_QUEUE = "generate-queue-test"; // public static final String GENERATE_QUEUE = "generate-queue-test";
// ================================================================== // ==================================================================
// public static final String GENERATE_QUEUE = "generate-queue-local"; // 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-local";
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-local";
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-local";
public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev"; public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod";
public MQConfig() { public MQConfig() {
} }

24
src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
View File

@@ -218,17 +218,17 @@ public class SRConsumer {
taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null); taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null);
} }
// @RabbitListener(queues = MQConfig.SR_QUEUE) @RabbitListener(queues = MQConfig.SR_QUEUE)
// @RabbitHandler @RabbitHandler
// public void SRConsumer1(Message msg, Channel channel) { public void SRConsumer1(Message msg, Channel channel) {
// superResolution(msg, channel, "consumer 1"); superResolution(msg, channel, "consumer 1");
// } }
//
//
// @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE) @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE)
// @RabbitHandler @RabbitHandler
// public void SRResultConsumer1(Message msg, Channel channel) { public void SRResultConsumer1(Message msg, Channel channel) {
// getSRResult(msg, channel, "consumer 1"); getSRResult(msg, channel, "consumer 1");
// } }
} }

2
src/main/java/com/ai/da/common/task/PaypalTask.java
View File

@@ -23,7 +23,7 @@ public class PaypalTask {
@Resource @Resource
private PayPalCheckoutService payPalCheckoutService; private PayPalCheckoutService payPalCheckoutService;
// @Scheduled(cron = "0/30 * * * * ?") @Scheduled(cron = "0/30 * * * * ?")
public void orderConfirm() throws SerializeException { public void orderConfirm() throws SerializeException {
log.info("PayPal orderConfirm 被执行......"); log.info("PayPal orderConfirm 被执行......");

3
src/main/resources/application-prod.properties
View File

@@ -58,6 +58,7 @@ minio.bucketName.results=aida-results
minio.bucketName.sysImage=aida-sys-image minio.bucketName.sysImage=aida-sys-image
minio.bucketName.users=aida-users minio.bucketName.users=aida-users
minio.bucketName.collectionElement=aida-collection-element minio.bucketName.collectionElement=aida-collection-element
minio.bucketName.gradient=aida-gradient
redirect_url=http://18.167.251.121:7788 redirect_url=http://18.167.251.121:7788
spring.rabbitmq.host=18.167.251.121 spring.rabbitmq.host=18.167.251.121
@@ -69,7 +70,7 @@ spring.rabbitmq.virtual-host=/
spring.redis.host=172.31.11.32 spring.redis.host=172.31.11.32
#spring.redis.host=18.167.251.121 #spring.redis.host=18.167.251.121
spring.redis.port=6379 spring.redis.port=6379
spring.redis.database=1 spring.redis.database=2
spring.redis.password=Aidlab spring.redis.password=Aidlab
spring.redis.lettuce.pool.max-active=8 spring.redis.lettuce.pool.max-active=8
spring.redis.lettuce.pool.max-idle=8 spring.redis.lettuce.pool.max-idle=8

4
src/main/resources/application.properties
View File

@@ -2,7 +2,7 @@
#spring.profiles.active=test #spring.profiles.active=test
#<23><><EFBFBD><EFBFBD>application-prod<6F>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) #<23><><EFBFBD><EFBFBD>application-prod<6F>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
#spring.profiles.active=prod spring.profiles.active=prod
#<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) #<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
spring.profiles.active=dev #spring.profiles.active=dev