Merge branch 'release/3.0' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/config/MyTaskScheduler.java

src/main/java/com/ai/da/common/task/AccountTask.java

@@ -25,20 +25,20 @@ public class AccountTask {
      * 每个月月初只刷新年付用户的积分
      */
 //    @Scheduled(cron = "59 59 23 * * ?")
-//    @Scheduled(cron = "0 0 0 1 * ?")
+    @Scheduled(cron = "0 0 0 1 * ?")
     public void refreshCreditsMonthly() {
         log.info("每月1号0点 将年费用户积分重置为 6000");
         accountService.refreshCreditsWeekly();
     }
 
-//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void getPaidUser() {
         // 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单
         accountService.extendValidityForCC();
     }
 
     // 每天凌晨0点执行一次
-//    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void cancelActivityBenefits() {
         // 1、查询当前所有参与了活动且过期的用户
         List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
@@ -51,7 +51,7 @@ public class AccountTask {
     }
 
     // 每天检测正式用户到期情况，每天凌晨0点执行
-//    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void paidUserToVisitor() {
         // 1、查询当前已过期正式用户或试用用户
         List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
@@ -66,6 +66,7 @@ public class AccountTask {
     }
 
     /**
+     * ！！关闭此定时器！！不再从Code-Create上默认创建AiDA游客
      * 将Code-Create上注册的用户添加为AiDA的游客
      */
 //    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
@@ -73,7 +74,7 @@ public class AccountTask {
         accountService.registerUserToVisitor();
     }
 
-//    @Scheduled(cron = "0 0 0 1 * ?")
+    @Scheduled(cron = "0 0 0 1 * ?")
     // 每月初刷新所有用户用户名剩余修改次数
     public void resetUsernameModifyTimes(){
         log.info("重置所有用户的用户名修改次数");

src/main/java/com/ai/da/common/task/PaymentTask.java

@@ -45,7 +45,7 @@ public class PaymentTask {
     @Resource
     private PayPalCheckoutService payPalCheckoutService;
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void orderConfirmForPaypal() throws SerializeException {
 
 //        log.info("PayPal orderConfirm 被执行......");
@@ -85,7 +85,7 @@ public class PaymentTask {
     }
 
     // 提前7天向用户发送提醒邮件,每天早上8点执行
-//    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0 8 * * ?")
     public void subscriptionReminder(){
         stripeService.subscriptionReminder();
     }
@@ -96,13 +96,13 @@ public class PaymentTask {
         //
     }
 
-//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void updateAffiliateInfoWithPayment(){
 //        log.info("佣金计算定时器");
         affiliateService.updateAffiliateInfoWithPayment();
     }
 
-//    @Scheduled(cron = "0 0 8 28-31 * ?")
+    @Scheduled(cron = "0 0 8 28-31 * ?")
     public void commissionSummaryReminder(){
         // 每个月末的最后一天的早上八点执行
         LocalDate today = LocalDate.now();

src/main/java/com/ai/da/common/utils/PantoneUtils.java

@@ -28,4 +28,70 @@ public class PantoneUtils {
         return new int[]{Math.round(hsv[0]), Math.round(hsv[1] * 100), Math.round(hsv[2] * 100)};
     }
 
+    public static int[] hsvToRgb(int h, int s, int v) {
+        // 确保 h 在 [0, 360) 范围内
+        h = h % 360;
+        if (h < 0) {
+            h += 360;
+        }
+
+        // 确保 s 和 v 在 [0, 100] 范围内
+        s = Math.max(0, Math.min(100, s));
+        v = Math.max(0, Math.min(100, v));
+
+        // 将 s 和 v 映射到 [0, 1] 范围
+        float sNorm = s / 100.0f;
+        float vNorm = v / 100.0f;
+
+        // 计算色相所在的区间
+        int hi = (h / 60) % 6;
+        float f = (h / 60.0f) - hi;
+        float p = vNorm * (1 - sNorm);
+        float q = vNorm * (1 - f * sNorm);
+        float t = vNorm * (1 - (1 - f) * sNorm);
+
+        float r, g, b;
+        switch (hi) {
+            case 0:
+                r = vNorm;
+                g = t;
+                b = p;
+                break;
+            case 1:
+                r = q;
+                g = vNorm;
+                b = p;
+                break;
+            case 2:
+                r = p;
+                g = vNorm;
+                b = t;
+                break;
+            case 3:
+                r = p;
+                g = q;
+                b = vNorm;
+                break;
+            case 4:
+                r = t;
+                g = p;
+                b = vNorm;
+                break;
+            case 5:
+                r = vNorm;
+                g = p;
+                b = q;
+                break;
+            default:
+                throw new RuntimeException("Invalid HSV values");
+        }
+
+        // 将 RGB 值从 [0, 1] 转换为 [0, 255]
+        int red = Math.round(r * 255);
+        int green = Math.round(g * 255);
+        int blue = Math.round(b * 255);
+
+        return new int[]{red, green, blue};
+    }
+
 }