From c03a8762e756373da63753731d3eb18d2039e461 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Tue, 28 Apr 2026 09:39:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop_3.1_MS_build_manual.yaml | 4 +- .../da/common/RabbitMQ/GenerateConsumer.java | 154 +++++++++--------- .../com/ai/da/common/RabbitMQ/SRConsumer.java | 22 +-- .../com/ai/da/common/task/AccountTask.java | 12 +- .../com/ai/da/common/task/GenerateTask.java | 4 +- .../com/ai/da/common/task/PaymentTask.java | 4 +- .../upload/impl/UploadServiceImpl.java | 2 +- src/main/resources/bootstrap.yml | 3 +- 8 files changed, 103 insertions(+), 102 deletions(-) diff --git a/.gitea/workflows/develop_3.1_MS_build_manual.yaml b/.gitea/workflows/develop_3.1_MS_build_manual.yaml index 0d7cdde9..296204f6 100644 --- a/.gitea/workflows/develop_3.1_MS_build_manual.yaml +++ b/.gitea/workflows/develop_3.1_MS_build_manual.yaml @@ -135,8 +135,8 @@ jobs: cd ${{ env.REMOTE_DEPLOY_PATH }} echo "停止旧容器..." docker compose down || true - echo "清理Docker资源..." - docker system prune -f +# echo "清理Docker资源..." +# docker system prune -f echo "构建镜像..." docker compose build --no-cache echo "启动服务..." 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 e26d8c5a..21a08a7d 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java @@ -559,83 +559,83 @@ public class GenerateConsumer { log.info("============ProcessPoseTransformResult End listening=========="); } - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer1(Message msg, Channel channel) { - generate(msg, channel, "consumer 1"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer2(Message msg, Channel channel) { - generate(msg, channel, "consumer 2"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer3(Message msg, Channel channel) { - generate(msg, channel, "consumer 3"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer4(Message msg, Channel channel) { - generate(msg, channel, "consumer 4"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer5(Message msg, Channel channel) { - generate(msg, channel, "consumer 5"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer6(Message msg, Channel channel) { - generate(msg, channel, "consumer 6"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer7(Message msg, Channel channel) { - generate(msg, channel, "consumer 7"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer8(Message msg, Channel channel) { - generate(msg, channel, "consumer 8"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") - @RabbitHandler - public void generateConsumer9(Message msg, Channel channel) { - generate(msg, channel, "consumer 9"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}") - @RabbitHandler - public void getGenerateResult(Message msg, Channel channel) { - processGenerateResult(msg, channel); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}") - @RabbitHandler - public void getToProductImageResult(Message msg, Channel channel) { - processToProductImageResult(msg, channel); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}") - @RabbitHandler - public void getRelightResult(Message msg, Channel channel) { - processRelightResult(msg, channel); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}") - @RabbitHandler - public void getPoseTransformationResult(Message msg, Channel channel) { - processPoseTransformResult(msg, channel); - } +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer1(Message msg, Channel channel) { +// generate(msg, channel, "consumer 1"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer2(Message msg, Channel channel) { +// generate(msg, channel, "consumer 2"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer3(Message msg, Channel channel) { +// generate(msg, channel, "consumer 3"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer4(Message msg, Channel channel) { +// generate(msg, channel, "consumer 4"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer5(Message msg, Channel channel) { +// generate(msg, channel, "consumer 5"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer6(Message msg, Channel channel) { +// generate(msg, channel, "consumer 6"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer7(Message msg, Channel channel) { +// generate(msg, channel, "consumer 7"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer8(Message msg, Channel channel) { +// generate(msg, channel, "consumer 8"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") +// @RabbitHandler +// public void generateConsumer9(Message msg, Channel channel) { +// generate(msg, channel, "consumer 9"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}") +// @RabbitHandler +// public void getGenerateResult(Message msg, Channel channel) { +// processGenerateResult(msg, channel); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}") +// @RabbitHandler +// public void getToProductImageResult(Message msg, Channel channel) { +// processToProductImageResult(msg, channel); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}") +// @RabbitHandler +// public void getRelightResult(Message msg, Channel channel) { +// processRelightResult(msg, channel); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}") +// @RabbitHandler +// public void getPoseTransformationResult(Message msg, Channel channel) { +// processPoseTransformResult(msg, channel); +// } // @RabbitListener(queues = "#{rabbitMQProperties.queues.designBatch}") // @RabbitHandler // public void getDesignBatchResult(Message msg, Channel 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 b18a2b6f..f795de88 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java @@ -222,16 +222,16 @@ public class SRConsumer { taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null); } - @RabbitListener(queues = "#{rabbitMQProperties.queues.sr}") - @RabbitHandler - public void SRConsumer1(Message msg, Channel channel) { - superResolution(msg, channel, "consumer 1"); - } - - @RabbitListener(queues = "#{rabbitMQProperties.queues.srResult}") - @RabbitHandler - public void SRResultConsumer1(Message msg, Channel channel) { - getSRResult(msg, channel, "consumer 1"); - } +// @RabbitListener(queues = "#{rabbitMQProperties.queues.sr}") +// @RabbitHandler +// public void SRConsumer1(Message msg, Channel channel) { +// superResolution(msg, channel, "consumer 1"); +// } +// +// @RabbitListener(queues = "#{rabbitMQProperties.queues.srResult}") +// @RabbitHandler +// public void SRResultConsumer1(Message msg, Channel channel) { +// getSRResult(msg, channel, "consumer 1"); +// } } diff --git a/src/main/java/com/ai/da/common/task/AccountTask.java b/src/main/java/com/ai/da/common/task/AccountTask.java index e0d90480..ccd60621 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/src/main/java/com/ai/da/common/task/AccountTask.java @@ -28,7 +28,7 @@ public class AccountTask { * 每个月月初只刷新教育子账号的积分 */ // @Scheduled(cron = "0 25 14 * * ?") - @Scheduled(cron = "0 0 0 1 * ?") +// @Scheduled(cron = "0 0 0 1 * ?") public void refreshCreditsMonthly() { log.info("每月1号0点 重置教育版子账号为默认积分"); accountService.refreshCreditsMonthly(); @@ -54,7 +54,7 @@ public class AccountTask { }*/ // 每天检测正式用户到期情况，每天凌晨0点执行 - @Scheduled(cron = "0 0 0 * * ?") +// @Scheduled(cron = "0 0 0 * * ?") public void paidUserToVisitor() { // 1、查询当前已过期正式用户或试用用户 List accountList = accountService.getExpiredUserBySystemUser(1); @@ -77,7 +77,7 @@ public class AccountTask { accountService.registerUserToVisitor(); } - @Scheduled(cron = "0 0 0 1 * ?") +// @Scheduled(cron = "0 0 0 1 * ?") // 每月初刷新所有用户用户名剩余修改次数 public void resetUsernameModifyTimes(){ log.info("重置所有用户的用户名修改次数"); @@ -85,17 +85,17 @@ public class AccountTask { } // @Scheduled(cron = "0 35 14 * * ?") - @Scheduled(cron = "0 5 0 * * ?") +// @Scheduled(cron = "0 5 0 * * ?") public void checkEduAdminExpireStatus() { accountService.checkEduAdminExpireStatus(); } - @Scheduled(cron = "0 5 0 * * ?") +// @Scheduled(cron = "0 5 0 * * ?") public void activeSubscriptionPlan() { subscriptionPlanService.activeSubscriptionPlan(null); } - @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes +// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes public void expireSubscription() { subscriptionPlanService.expireSubscription(); } diff --git a/src/main/java/com/ai/da/common/task/GenerateTask.java b/src/main/java/com/ai/da/common/task/GenerateTask.java index 88551175..bdb01869 100644 --- a/src/main/java/com/ai/da/common/task/GenerateTask.java +++ b/src/main/java/com/ai/da/common/task/GenerateTask.java @@ -38,7 +38,7 @@ public class GenerateTask { * 故这里通过定时任务做补偿 * flux五分钟查询一次，万相1小时查询一次 */ - @Scheduled(cron = "0 */4 * * * ?") +// @Scheduled(cron = "0 */4 * * * ?") public void fluxCompensationMechanism(){ // 1、查所有 任务还没成功、还没失败，正在等待或者执行中的任务id有哪些 // （由于获取结果的polling_url在redis中只存一天，大部分结果超过一天之后就无法再找到任务，小部分可以通过公共路径查到结果） @@ -98,7 +98,7 @@ public class GenerateTask { } // 万相 -> pose transformation 补偿 当前任务执行完后，5分钟再执行一次（不会出现任务重叠的情况） - @Scheduled(fixedDelay = 5 * 60 * 1000) +// @Scheduled(fixedDelay = 5 * 60 * 1000) public void wxCompensationMechanism(){ List apiGenerates = apiGenerateService.getPendingTaskByStatus("wx"); if (apiGenerates != null && !apiGenerates.isEmpty()){ diff --git a/src/main/java/com/ai/da/common/task/PaymentTask.java b/src/main/java/com/ai/da/common/task/PaymentTask.java index e63e9388..65a773a9 100644 --- a/src/main/java/com/ai/da/common/task/PaymentTask.java +++ b/src/main/java/com/ai/da/common/task/PaymentTask.java @@ -104,7 +104,7 @@ public class PaymentTask { } // 定时同步（每分钟一次） - @Scheduled(fixedRate = 60000) +// @Scheduled(fixedRate = 60000) public void syncLinkViewCountToDB(){ affiliateService.syncLinkViewCountToDB(); } @@ -120,7 +120,7 @@ public class PaymentTask { } } - @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes +// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes public void calcCouponsCommission(){ // log.info("优惠券佣金计算定时器"); affiliateService.calcCouponsCommission(); diff --git a/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java b/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java index 7fd29dd1..0c66b127 100644 --- a/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java +++ b/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java @@ -547,7 +547,7 @@ public class UploadServiceImpl implements UploadService { /** * 清理过期上传任务（每小时执行一次） */ - @Scheduled(fixedDelay = 3600000) // 1小时 +// @Scheduled(fixedDelay = 3600000) // 1小时 public void cleanupExpiredUploads() { LocalDateTime now = LocalDateTime.now(); uploadTasks.entrySet().removeIf(entry -> { diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 7abbec69..136570ab 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -22,7 +22,8 @@ spring: namespace: ${nacos.namespace} username: ${nacos.username} password: ${nacos.password} - hostname: aida-back +# ip: ${HOSTNAME} +# hostname: aida-back config: server-addr: ${nacos.host} namespace: ${nacos.namespace}