aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev/3.1_release_merge

Browse Source
This commit is contained in:
litianxiang
2025-09-18 17:49:36 +08:00
parent 9e6fcb4f73 9386a2c6c4
commit 042501f9b1
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/common/config/MyTaskScheduler.java
View File

@@ -265,7 +265,7 @@ public class MyTaskScheduler {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
}else { }else if (env) {
// SendEmailUtil.sendNoExcelEmail("1023316923@qq.com", null); // SendEmailUtil.sendNoExcelEmail("1023316923@qq.com", null);
SendEmailUtil.sendNoExcelEmail("calvinwong@aidlab.hk", null); SendEmailUtil.sendNoExcelEmail("calvinwong@aidlab.hk", null);
SendEmailUtil.sendNoExcelEmail("kaicpang.pang@connect.polyu.hk", null); SendEmailUtil.sendNoExcelEmail("kaicpang.pang@connect.polyu.hk", null);

1
src/main/java/com/ai/da/common/config/exception/BusinessException.java
View File

@@ -49,7 +49,6 @@ public class BusinessException extends RuntimeException {
private static Locale getUserLocale() { private static Locale getUserLocale() {
AuthPrincipalVo userInfo = UserContext.getUserHolder(); AuthPrincipalVo userInfo = UserContext.getUserHolder();
log.info("userinfo: {}", userInfo);
if (Objects.isNull(userInfo)) { if (Objects.isNull(userInfo)) {
return new Locale("en"); return new Locale("en");
} }

5
src/main/java/com/ai/da/common/task/AccountTask.java
View File

@@ -24,9 +24,8 @@ public class AccountTask {
* 替换为 * 替换为
* 每个月月初只刷新教育子账号的积分 * 每个月月初只刷新教育子账号的积分
*/ */
// @Scheduled(cron = "59 59 23 * * ?") // @Scheduled(cron = "0 0 16 * * ?")
@Scheduled(cron = "0 15 16 * * ?") @Scheduled(cron = "0 0 0 1 * ?")
// @Scheduled(cron = "0 0 0 1 * ?")
public void refreshCreditsMonthly() { public void refreshCreditsMonthly() {
log.info("每月1号0点 重置教育版子账号为默认积分"); log.info("每月1号0点 重置教育版子账号为默认积分");
accountService.refreshCreditsMonthly(); accountService.refreshCreditsMonthly();

4
src/main/java/com/ai/da/controller/AccountController.java
View File

@@ -391,11 +391,11 @@ public class AccountController {
public void refreshCreditsMonthly() { public void refreshCreditsMonthly() {
accountService.refreshCreditsMonthly(); accountService.refreshCreditsMonthly();
}*/ }*/
@GetMapping("/checkEduAdminExpireStatus") /*@GetMapping("/checkEduAdminExpireStatus")
@ApiOperation(value = "检查教育管理员账号到期情况") @ApiOperation(value = "检查教育管理员账号到期情况")
public void checkEduAdminExpireStatus() { public void checkEduAdminExpireStatus() {
accountService.checkEduAdminExpireStatus(); accountService.checkEduAdminExpireStatus();
} }*/
} }

4
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -160,9 +160,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
} }
/*发送邮件*/ /*发送邮件*/
AuthenticationOperationTypeEnum authenticationOperationTypeEnum = AuthenticationOperationTypeEnum.of(accountDTO.getOperationType()); AuthenticationOperationTypeEnum authenticationOperationTypeEnum = AuthenticationOperationTypeEnum.of(accountDTO.getOperationType());
log.info(account.getUserEmail()); if (!account.getUserEmail().equalsIgnoreCase(accountDTO.getEmail())) {
log.info(accountDTO.getEmail());
if (!account.getUserEmail().equals(accountDTO.getEmail())) {
throw new BusinessException("email.error", ResultEnum.PROMPT.getCode()); throw new BusinessException("email.error", ResultEnum.PROMPT.getCode());
} }
if (Objects.isNull(authenticationOperationTypeEnum)) { if (Objects.isNull(authenticationOperationTypeEnum)) {

9
src/main/java/com/ai/da/service/impl/TrialOrderServiceImpl.java
View File

@@ -54,7 +54,8 @@ public class TrialOrderServiceImpl extends ServiceImpl<TrialOrderMapper, TrialOr
} }
// 先检测试用订单 // 先检测试用订单
QueryWrapper<TrialOrder> trialOrderQueryWrapper = new QueryWrapper<>(); QueryWrapper<TrialOrder> 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().eq(TrialOrder::getIp, ipAddress);
// trialOrderQueryWrapper.lambda().and(wrapper -> // trialOrderQueryWrapper.lambda().and(wrapper ->
// wrapper.eq(TrialOrder::getEmail, accountTrialDTO.getEmail()) // wrapper.eq(TrialOrder::getEmail, accountTrialDTO.getEmail())
@@ -71,7 +72,8 @@ public class TrialOrderServiceImpl extends ServiceImpl<TrialOrderMapper, TrialOr
} }
// 先检测用户名和邮箱 // 先检测用户名和邮箱
QueryWrapper<Account> qw = new QueryWrapper<>(); QueryWrapper<Account> qw = new QueryWrapper<>();
qw.eq("BINARY user_email", accountTrialDTO.getEmail()); // qw.eq("BINARY user_email", accountTrialDTO.getEmail());
qw.eq("user_email", accountTrialDTO.getEmail());
List<Account> accountList = accountMapper.selectList(qw); List<Account> accountList = accountMapper.selectList(qw);
if (CollectionUtil.isNotEmpty(accountList) && !accountList.get(0).getSystemUser().equals(0)) { if (CollectionUtil.isNotEmpty(accountList) && !accountList.get(0).getSystemUser().equals(0)) {
if (accountList.get(0).getIsTrial() == 1) { if (accountList.get(0).getIsTrial() == 1) {
@@ -176,7 +178,8 @@ public class TrialOrderServiceImpl extends ServiceImpl<TrialOrderMapper, TrialOr
baseMapper.updateById(trialOrder); baseMapper.updateById(trialOrder);
QueryWrapper<Account> qw = new QueryWrapper<>(); QueryWrapper<Account> qw = new QueryWrapper<>();
qw.eq("BINARY user_email", trialOrder.getEmail()); // qw.eq("BINARY user_email", trialOrder.getEmail());
qw.eq("user_email", trialOrder.getEmail());
List<Account> accountList = accountMapper.selectList(qw); List<Account> accountList = accountMapper.selectList(qw);
Account account = new Account(); Account account = new Account();