From c43a7161045c22fbb97a29a297c1c83d7ae6543d Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 17 Sep 2025 17:46:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUGFIX:=20=E6=89=80=E6=9C=89=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E9=82=AE=E4=BB=B6=E6=B3=A8=E5=86=8C=E3=80=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=AD=89=E7=9A=84=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/common/config/MyTaskScheduler.java | 2 +- .../ai/da/common/config/exception/BusinessException.java | 1 - src/main/java/com/ai/da/common/task/AccountTask.java | 5 ++--- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 4 +--- .../com/ai/da/service/impl/TrialOrderServiceImpl.java | 9 ++++++--- 5 files changed, 10 insertions(+), 11 deletions(-) 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 312b30da..cfed1696 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -265,7 +265,7 @@ public class MyTaskScheduler { } catch (IOException e) { e.printStackTrace(); } - }else { + }else if (env) { // SendEmailUtil.sendNoExcelEmail("1023316923@qq.com", null); SendEmailUtil.sendNoExcelEmail("calvinwong@aidlab.hk", null); SendEmailUtil.sendNoExcelEmail("kaicpang.pang@connect.polyu.hk", null); diff --git a/src/main/java/com/ai/da/common/config/exception/BusinessException.java b/src/main/java/com/ai/da/common/config/exception/BusinessException.java index 7f979db2..0dbb79b9 100644 --- a/src/main/java/com/ai/da/common/config/exception/BusinessException.java +++ b/src/main/java/com/ai/da/common/config/exception/BusinessException.java @@ -49,7 +49,6 @@ public class BusinessException extends RuntimeException { private static Locale getUserLocale() { AuthPrincipalVo userInfo = UserContext.getUserHolder(); - log.info("userinfo: {}", userInfo); if (Objects.isNull(userInfo)) { return new Locale("en"); } 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 ee0950f3..a180c58a 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/src/main/java/com/ai/da/common/task/AccountTask.java @@ -24,9 +24,8 @@ public class AccountTask { * 替换为 * 每个月月初只刷新教育子账号的积分 */ -// @Scheduled(cron = "59 59 23 * * ?") - @Scheduled(cron = "0 15 16 * * ?") -// @Scheduled(cron = "0 0 0 1 * ?") +// @Scheduled(cron = "0 0 16 * * ?") + @Scheduled(cron = "0 0 0 1 * ?") public void refreshCreditsMonthly() { log.info("每月1号0点 重置教育版子账号为默认积分"); accountService.refreshCreditsMonthly(); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 3753c294..75d451ad 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -160,9 +160,7 @@ public class AccountServiceImpl extends ServiceImpl impl } /*发送邮件*/ AuthenticationOperationTypeEnum authenticationOperationTypeEnum = AuthenticationOperationTypeEnum.of(accountDTO.getOperationType()); - log.info(account.getUserEmail()); - log.info(accountDTO.getEmail()); - if (!account.getUserEmail().equals(accountDTO.getEmail())) { + if (!account.getUserEmail().equalsIgnoreCase(accountDTO.getEmail())) { throw new BusinessException("email.error", ResultEnum.PROMPT.getCode()); } if (Objects.isNull(authenticationOperationTypeEnum)) { diff --git a/src/main/java/com/ai/da/service/impl/TrialOrderServiceImpl.java b/src/main/java/com/ai/da/service/impl/TrialOrderServiceImpl.java index 00637c1c..8a6dadfa 100644 --- a/src/main/java/com/ai/da/service/impl/TrialOrderServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TrialOrderServiceImpl.java @@ -54,7 +54,8 @@ public class TrialOrderServiceImpl extends ServiceImpl trialOrderQueryWrapper = new QueryWrapper<>(); - trialOrderQueryWrapper.eq("BINARY email", accountTrialDTO.getEmail()); +// trialOrderQueryWrapper.eq("BINARY email", accountTrialDTO.getEmail()); + trialOrderQueryWrapper.eq("email", accountTrialDTO.getEmail()); // trialOrderQueryWrapper.lambda().eq(TrialOrder::getIp, ipAddress); // trialOrderQueryWrapper.lambda().and(wrapper -> // wrapper.eq(TrialOrder::getEmail, accountTrialDTO.getEmail()) @@ -71,7 +72,8 @@ public class TrialOrderServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("BINARY user_email", accountTrialDTO.getEmail()); +// qw.eq("BINARY user_email", accountTrialDTO.getEmail()); + qw.eq("user_email", accountTrialDTO.getEmail()); List accountList = accountMapper.selectList(qw); if (CollectionUtil.isNotEmpty(accountList) && !accountList.get(0).getSystemUser().equals(0)) { if (accountList.get(0).getIsTrial() == 1) { @@ -176,7 +178,8 @@ public class TrialOrderServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("BINARY user_email", trialOrder.getEmail()); +// qw.eq("BINARY user_email", trialOrder.getEmail()); + qw.eq("user_email", trialOrder.getEmail()); List accountList = accountMapper.selectList(qw); Account account = new Account(); From 9386a2c6c4f1dc5fb6c728b1efed8dded3447e5f Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 17 Sep 2025 17:49:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6=E5=8F=B7=E5=88=B0=E6=9C=9F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/controller/AccountController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 2fb4eda8..2e0eca20 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -391,11 +391,11 @@ public class AccountController { public void refreshCreditsMonthly() { accountService.refreshCreditsMonthly(); }*/ - @GetMapping("/checkEduAdminExpireStatus") + /*@GetMapping("/checkEduAdminExpireStatus") @ApiOperation(value = "检查教育管理员账号到期情况") public void checkEduAdminExpireStatus() { accountService.checkEduAdminExpireStatus(); - } + }*/ }