From ea92e1f20de27e7cbe07d1da542be07d824dc1a1 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 25 Sep 2024 11:38:11 +0800 Subject: [PATCH] to dev --- .../com/ai/da/common/RabbitMQ/MQConfig.java | 24 ++++++++--------- .../ai/da/common/config/MyTaskScheduler.java | 4 +-- .../com/ai/da/common/task/AccountTask.java | 26 ++++++++++--------- src/main/resources/application.properties | 4 +-- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java index 5442ae06..b6565c86 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java @@ -12,26 +12,26 @@ public class MQConfig { // 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-dev"; - public static final String GENERATE_QUEUE = "generate-queue-prod"; + 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-prod"; + 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-prod"; + 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"; - public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod"; + public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev"; +// public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod"; -// public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-dev"; - public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-prod"; + public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-dev"; +// public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-prod"; -// public static final String RELIGHT_RESULT_QUEUE = "Relight-dev"; - public static final String RELIGHT_RESULT_QUEUE = "Relight-prod"; + public static final String RELIGHT_RESULT_QUEUE = "Relight-dev"; +// public static final String RELIGHT_RESULT_QUEUE = "Relight-prod"; public MQConfig() { } diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index 69f2ffd9..df7d8677 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -49,7 +49,7 @@ public class MyTaskScheduler { // 定时任务，每十五天执行一次 // @Scheduled(cron = "0 0 0 ? * MON") - @Scheduled(cron = "0 0 0 */15 * ?") +// @Scheduled(cron = "0 0 0 */15 * ?") public void checkExpiry() { // 检测正式用户是否快要过期 QueryWrapper qw = new QueryWrapper<>(); @@ -83,7 +83,7 @@ public class MyTaskScheduler { } } } - @Scheduled(cron = "0 0 8 * * ?") +// @Scheduled(cron = "0 0 8 * * ?") public void sendTrialOrderExcelToManagements() { // 获取前一天日期 LocalDate yesterday = LocalDate.now().minusDays(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 8027cfb8..d48329bc 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/src/main/java/com/ai/da/common/task/AccountTask.java @@ -16,44 +16,46 @@ public class AccountTask { @Resource private AccountService accountService; - /** 每周日晚上刷新 年付用户、月付用户的积分 */ + /** + * 每周日晚上刷新 年付用户、月付用户的积分 + */ // @Scheduled(cron = "59 59 23 ? * SUN") // @Scheduled(cron = "59 59 23 * * ?") - public void refreshCreditsMonthly(){ + public void refreshCreditsMonthly() { log.info("每周日晚11：59：59刷新付费用户积分为 6000"); accountService.refreshCreditsWeekly(); } - @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes - public void getPaidUser(){ +// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes + public void getPaidUser() { // 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单 accountService.extendValidityForCC(); } // 每天凌晨0点执行一次 // @Scheduled(cron = "0 0 0 * * ?") - public void cancelActivityBenefits(){ + public void cancelActivityBenefits() { // 1、查询当前所有参与了活动且过期的用户 List accountList = accountService.getExpiredUserBySystemUser(4); // 2、将到期用户置为游客 - for(Account account : accountList){ - log.info("参与活动的用户{} : {} 于 {} 账号有效期到期，置为游客",account.getId(),account.getUserEmail(),account.getValidEndTime()); + for (Account account : accountList) { + log.info("参与活动的用户{} : {} 于 {} 账号有效期到期，置为游客", account.getId(), account.getUserEmail(), account.getValidEndTime()); accountService.toVisitor(account); } } // 每天检测正式用户到期情况，每天凌晨0点执行 // @Scheduled(cron = "0 0 0 * * ?") - public void paidUserToVisitor(){ + public void paidUserToVisitor() { // 1、查询当前已过期正式用户或试用用户 List accountList = accountService.getExpiredUserBySystemUser(1); accountList.addAll(accountService.getExpiredUserBySystemUser(2)); accountList.addAll(accountService.getExpiredUserBySystemUser(3)); // 2、将到期用户置为游客 - for(Account account : accountList){ - log.info("用户{} : {} 于 {}账号有效期到期，置为游客", account.getId(), account.getUserEmail(),account.getValidEndTime()); + for (Account account : accountList) { + log.info("用户{} : {} 于 {}账号有效期到期，置为游客", account.getId(), account.getUserEmail(), account.getValidEndTime()); accountService.toVisitor(account); } } @@ -61,8 +63,8 @@ public class AccountTask { /** * 将Code-Create上注册的用户添加为AiDA的游客 */ - // @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes - public void registerUserToVisitor(){ + @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes + public void registerUserToVisitor() { accountService.registerUserToVisitor(); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8550475d..974fee23 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ #spring.profiles.active=test #����application-prod�ļ�(��������) -spring.profiles.active=prod +#spring.profiles.active=prod #����application-dev�ļ�(��������) -#spring.profiles.active=dev +spring.profiles.active=dev