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 21a08a7d..e26d8c5a 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 f795de88..b18a2b6f 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 bb225471..ee573eaa 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 bdb01869..88551175 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 454fe819..0e5efb03 100644 --- a/src/main/java/com/ai/da/common/task/PaymentTask.java +++ b/src/main/java/com/ai/da/common/task/PaymentTask.java @@ -97,14 +97,14 @@ public class PaymentTask { // } -// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes + @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes public void updateAffiliateInfoWithPayment(){ // log.info("佣金计算定时器"); affiliateService.updateAffiliateInfoWithPayment(); } // 定时同步(每分钟一次) -// @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/impl/GlobalAwardServiceImpl.java b/src/main/java/com/ai/da/service/impl/GlobalAwardServiceImpl.java index f5ecbe7d..e474cb79 100644 --- a/src/main/java/com/ai/da/service/impl/GlobalAwardServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GlobalAwardServiceImpl.java @@ -384,9 +384,6 @@ public class GlobalAwardServiceImpl implements GlobalAwardService { dto.setDesignDescription(existing.getDesignDescription()); dto.setPdfPath(existing.getPdfPath()); dto.setVideoPath(existing.getVideoPath()); - dto.setVideoDuration(existing.getVideoDuration()); - dto.setPdfSize(existing.getPdfSize()); - dto.setVideoSize(existing.getVideoSize()); return dto; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 01612cf2..974fee23 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,11 +1,8 @@ -#����application-test�ļ�(���Ի���) -#spring.profiles.active=test - -#����application-prod�ļ�(��������) -#spring.profiles.active=prod - -#����application-dev�ļ�(��������) -#spring.profiles.active=dev - -spring.profiles.active=local - +#����application-test�ļ�(���Ի���) +#spring.profiles.active=test + +#����application-prod�ļ�(��������) +#spring.profiles.active=prod + +#����application-dev�ļ�(��������) +spring.profiles.active=dev