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

# Conflicts:
#	.gitea/workflows/prod_build_schedule.yaml

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

@@ -306,8 +306,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                     setEduAdminToExpire(account);
                 } else {
                     toVisitor(account);
-                    return;
-                    // throw new BusinessException("user.expired");
+//                    return;
+                     throw new BusinessException("account.expired", ResultEnum.PROMPT.getCode());
                 }
             }
         }
@@ -2492,8 +2492,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         if (Objects.nonNull(subAccount) && personAccRole.contains(subAccount.getSystemUser())) {
             log.info("将用户{} 加入组织{}", addSubAccountDTO.getUserEmail(), adminAcc.getOrganizationName());
             subAccount.setUserName(addSubAccountDTO.getUserName());
-            if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserPassword()))
+            if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserPassword())){
                 subAccount.setUserPassword(addSubAccountDTO.getUserPassword());
+            }
+
+            // 判断当前账号的有效期是否与管理员同步
+            if (subAccount.getValidEndTime() < adminAcc.getValidEndTime()){
+                subAccount.setValidEndTime(adminAcc.getValidEndTime());
+            }
+
             subAccount.setSystemUser(subUserRole);
             subAccount.setOrganizationName(adminAcc.getOrganizationName());
             subAccount.setParentId(adminAcc.getId());

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

@@ -167,6 +167,7 @@ public class StripeServiceImpl implements StripeService {
             String orderId = orderInfo.getOrderNo();
 
 
+            // Alipay - Not supported when using Checkout in subscription mode or setup mode.
             if (payType.equals("recurring")){
                 sessionBuilder.setMode(SessionCreateParams.Mode.SUBSCRIPTION);
                 sessionBuilder.setSubscriptionData(SessionCreateParams.SubscriptionData.builder().setDescription("AiDA - " + orderId).build());

src/main/resources/messages_en.properties

@@ -204,6 +204,7 @@ hsv.value.cannot.exceed.the.maximum.of.8=hsv value cannot exceed the maximum of
 the.workspaceName.already.exists=A workspace with this name already exists.
 unable.to.delete.the.workspace.you.are.currently.using=The workspace you are currently using cannot be deleted. Please select another workspace before trying to delete.
 classificationName.already.exists=The label name you've entered already exists. Please enter a different label name to avoid duplication.
+account.expired=Your subscription has expired, and your account has been reset to a visitor account. Please log in again from the [Individual] entry. If you have any questions, please contact us at info@code-create.com.hk
 
 # Warnings:
 # 用来提醒用户可能会导致不良后果的操作，但不一定是错误。用户需要认真考虑是否继续当前操作。

src/main/resources/messages_zh.properties

@@ -222,6 +222,7 @@ generate.interface.error=生成接口出现错误。（请稍后再试。如果
 chat-bot.interface.exception=聊天机器人接口出现错误。（请稍后再试。如果问题持续，请联系我们的help@aida.com.hk）
 compose-layer.interface.exception=图层合并时出现问题。（请稍后再试。如果问题持续，请联系我们的help@aida.com.hk）
 cloth-classification.interface.exception=获取服装类别时出现问题。（请稍后再试。如果问题持续，请联系我们的help@aida.com.hk）
+account.expired=您的订阅已过期，账号已被重置为访客身份，请从【个人账号】入口重新登录。如有疑问，请联系 info@code-create.com.hk。
 
 # 多语言返回
 OVERALL=整体