Merge branch 'dev/dev_xp' into dev/3.1_release_merge

# Conflicts: # src/main/java/com/ai/da/controller/AccountController.java
2025-12-11 16:12:41 +08:00
parent 4e4b8bd4d2 94cafbd10c
commit 0692b29065
20 changed files with 1221 additions and 26 deletions
--- a/src/main/java/com/ai/da/controller/StripeController.java
+++ b/src/main/java/com/ai/da/controller/StripeController.java
@@ -70,7 +70,7 @@ public class StripeController {
            Long size = redisUtil.getSize(key_1);
            // 给我发送邮件
            if (webhookReminderFlag.equals("1") && size == 3){
-                SendEmailUtil.commonExceptionReminder("Stripe Webhook 回调", new String[]{"xupei3360@163.com"});
+                SendEmailUtil.commonExceptionReminder("Stripe Webhook 回调处理出现异常", new String[]{"xupei3360@163.com"});
            }
            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
        }