Merge branch 'release/3.0' into dev/dev_xp

src/main/java/com/ai/da/common/config/MyTaskScheduler.java

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

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

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

src/main/java/com/ai/da/python/PythonService.java

@@ -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);
     }

src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

@@ -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,18 +929,23 @@ 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.lt("valid_end_time", 1720540799000L);
-        queryWrapper.and(wrapper ->
-                        wrapper.gt("valid_end_time", 1720540799000L)
-                                .or().isNull("valid_end_time"))
-                .isNotNull("user_email");
 
         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 (i > 6) {
                 if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) {
                     SendEmailUtil.sendUpgradeNotification(account, null, 0);
                 } else {
@@ -947,6 +953,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                     SendEmailUtil.sendUpgradeNotification(account, null, 1);
                 }
             }
+            i ++;
+        }
     }
 
     @Override