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();