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

Merge branch 'release/3.0' into dev/dev_xp

Browse Source
This commit is contained in:
xupei
2024-07-15 13:57:20 +08:00
parent f03d32030d 956b72729f
commit 037a0d12ff
4 changed files with 37 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

@@ -86,7 +86,7 @@ public class MyTaskScheduler {
@Scheduled(cron = "0 0 8 * * ?")
public void sendTrialOrderExcelToManagements() {
// 获取前一天日期
LocalDate yesterday = LocalDate.now().minusDays(3);
LocalDate yesterday = LocalDate.now().minusDays(1);
// 查询前一天的试用订单
QueryWrapper<TrialOrder> qw = new QueryWrapper<>();

7
src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
View File

@@ -57,7 +57,7 @@ public class AuthenticationFilter extends OncePerRequestFilter {
protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {
String requestURI = httpServletRequest.getRequestURI();
if (calculateUrl(requestURI)) {
if (calculateUrl(requestURI) || hasAuthorizationToken(httpServletRequest)) {
StopWatch stopWatch = new StopWatch();
HttpServletRequest wrappedRequest = httpServletRequest;
HttpServletResponse wrappedResponse = httpServletResponse;
@@ -88,6 +88,11 @@ public class AuthenticationFilter extends OncePerRequestFilter {
return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
}
private boolean hasAuthorizationToken(HttpServletRequest request) {
String authorizationHeader = request.getHeader("Authorization");
return authorizationHeader != null && authorizationHeader.startsWith("Bearer");
}
private void extracted(HttpServletRequest request) throws AuthenticationException {
String jwtToken = request.getHeader(properties.getJwtTokenHeader());
// log.debug("后台检查令牌:{}", jwtToken);

11
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -716,6 +716,17 @@ public class PythonService {
if (CollectionUtil.isEmpty(attributeRetrievalList)) {
System.out.println(attributeRetrievalAttrDict);
System.out.println(tableName);
if (!StringUtils.isEmpty(style)) {
attributeRetrievalAttrDict.setType(null);
attributeRetrievalAttrDict.setOpeningType(null);
attributeRetrievalAttrDict.setSubtype(null);
attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName, style);
}else {
attributeRetrievalAttrDict.setType(null);
attributeRetrievalAttrDict.setOpeningType(null);
attributeRetrievalAttrDict.setSubtype(null);
attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName, style);
}
}
return toColoectionElementList(attributeRetrievalList, styleCategory, modelSex);
}

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

@@ -560,7 +560,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
account.setCreateDate(new Date());
account.setIsTrial(1);
account.setIsBeginner(1);
account.setSystemUser(1);
account.setSystemUser(3);
account.setCredits(BigDecimal.valueOf(100));
accountMapper.insert(account);
}
// 发送邮件提醒用户试用用户已创建
@@ -928,24 +929,31 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Override
public void upgradeNotification() {
// QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
//// queryWrapper.eq("id", 88L);
// queryWrapper.and(wrapper ->
// wrapper.gt("valid_end_time", 1720540799000L)
// .or().isNull("valid_end_time"))
// .isNotNull("user_email");
QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("id", 88L);
queryWrapper.and(wrapper ->
wrapper.gt("valid_end_time", 1720540799000L)
.or().isNull("valid_end_time"))
.isNotNull("user_email");
queryWrapper.lt("valid_end_time", 1720540799000L);
List<Account> accountList = accountMapper.selectList(queryWrapper);
System.out.println(accountList);
int i = 0;
for (Account account : accountList) {
// SendEmailUtil.sendUpgradeNotification(account, null, 0);
// SendEmailUtil.sendUpgradeNotification(account, null, 1);
if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) {
SendEmailUtil.sendUpgradeNotification(account, null, 0);
} else {
// 英文
SendEmailUtil.sendUpgradeNotification(account, null, 1);
if (i > 6) {
if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) {
SendEmailUtil.sendUpgradeNotification(account, null, 0);
} else {
// 英文
SendEmailUtil.sendUpgradeNotification(account, null, 1);
}
}
i ++;
}
}