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

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

.gitea/workflows/develop_build_commit.yaml

@@ -0,0 +1,148 @@
+name: git commit 控制 AiDA back-java Develop 分支构建部署
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - dev/3.1_release_merge
+
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    if: "contains(github.event.head_commit.message, '[run build]')"
+
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-version-aida-back
+
+    steps:
+      - name: 1.检出代码
+        uses: actions/checkout@v4
+        with:
+          ref: dev/3.1_release_merge
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+
+      - name: 2.设置JAVA Maven 环境
+        run: |
+          # 适配act的root用户和Gitea Runner普通用户
+          SUDO=""
+          [ "$(id -u)" != "0" ] && SUDO="sudo"
+          
+          # 安装依赖
+          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
+          
+          # 下载并安装Maven
+          MAVEN_VERSION="3.9.11"
+          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
+          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
+          
+          # 解压+软链接
+          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
+          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
+          
+          # 配置PATH
+          echo "/usr/local/maven/bin" >> $GITHUB_PATH
+          export PATH="/usr/local/maven/bin:$PATH"
+          
+          # 验证
+          mvn -v
+
+      - name: 2.构建jar包
+        run:
+          mvn -B clean package -DskipTests --file pom.xml
+
+      - name: 3.检查 Runner 本地文件
+        run: |
+          echo "当前目录：$(pwd)"
+          echo "target 目录内容："
+          ls -la ./target/
+          
+          # 容错:处理通配符无匹配的情况
+          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
+          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
+            echo "❌ Runner 本地无有效 JAR 包！"
+            exit 1
+          fi
+          
+          # 检查Docker配置文件
+          for FILE in Dockerfile docker-compose.yml; do
+            if [ ! -f "./$FILE" ]; then
+              echo "❌ 缺失文件：$FILE"
+              exit 1
+            fi
+          done
+          echo "✅ 本地文件校验通过！"
+
+      - name: 4. 同步文件到远程服务器
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
+          target: ${{ env.REMOTE_DEPLOY_PATH }}
+          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+          strip_components: 0
+
+      - name: 5. 验证远程文件
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 远程部署目录文件列表 ====="
+            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:检查JAR包
+            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
+            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
+              echo "❌ 远程服务器无有效 JAR 包！"
+              exit 1
+            fi
+            
+            # 检查Docker文件
+            for FILE in Dockerfile docker-compose.yml; do
+              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
+                echo "❌ 远程缺失文件：$FILE"
+                exit 1
+              fi
+            done
+            echo "✅ 远程文件校验通过！"
+
+      - name: 6. 部署和运行服务
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 开始部署服务 ====="
+            cd ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:停止旧容器（不存在则跳过）
+            echo "停止旧容器..."
+            docker compose down || true
+            
+            # 清理无效镜像（可选，释放空间）
+            docker system prune -f
+            
+            # 构建并启动新容器
+            echo "构建Docker镜像..."
+            docker compose build --no-cache
+            echo "启动服务..."
+            docker compose up -d
+            
+            # 验证服务状态
+            echo "验证容器状态..."
+            docker compose ps
+            echo "✅ 部署完成！"

.gitea/workflows/develop_build_manual.yaml

@@ -0,0 +1,143 @@
+name: 手动 AiDA back-java Develop 分支构建部署
+on:
+  workflow_dispatch:
+
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-version-aida-back
+
+    steps:
+      - name: 1.检出代码
+        uses: actions/checkout@v4
+        with:
+          ref: dev/3.1_release_merge
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+
+      - name: 2.设置JAVA Maven 环境
+        run: |
+          # 适配act的root用户和Gitea Runner普通用户
+          SUDO=""
+          [ "$(id -u)" != "0" ] && SUDO="sudo"
+          
+          # 安装依赖
+          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
+          
+          # 下载并安装Maven
+          MAVEN_VERSION="3.9.11"
+          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
+          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
+          
+          # 解压+软链接
+          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
+          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
+          
+          # 配置PATH
+          echo "/usr/local/maven/bin" >> $GITHUB_PATH
+          export PATH="/usr/local/maven/bin:$PATH"
+          
+          # 验证
+          mvn -v
+
+      - name: 2.构建jar包
+        run:
+          mvn -B clean package -DskipTests --file pom.xml
+
+      - name: 3.检查 Runner 本地文件
+        run: |
+          echo "当前目录：$(pwd)"
+          echo "target 目录内容："
+          ls -la ./target/
+          
+          # 容错:处理通配符无匹配的情况
+          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
+          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
+            echo "❌ Runner 本地无有效 JAR 包！"
+            exit 1
+          fi
+          
+          # 检查Docker配置文件
+          for FILE in Dockerfile docker-compose.yml; do
+            if [ ! -f "./$FILE" ]; then
+              echo "❌ 缺失文件：$FILE"
+              exit 1
+            fi
+          done
+          echo "✅ 本地文件校验通过！"
+
+      - name: 4. 同步文件到远程服务器
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
+          target: ${{ env.REMOTE_DEPLOY_PATH }}
+          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+          strip_components: 0
+
+      - name: 5. 验证远程文件
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 远程部署目录文件列表 ====="
+            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:检查JAR包
+            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
+            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
+              echo "❌ 远程服务器无有效 JAR 包！"
+              exit 1
+            fi
+            
+            # 检查Docker文件
+            for FILE in Dockerfile docker-compose.yml; do
+              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
+                echo "❌ 远程缺失文件：$FILE"
+                exit 1
+              fi
+            done
+            echo "✅ 远程文件校验通过！"
+
+      - name: 6. 部署和运行服务
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 开始部署服务 ====="
+            cd ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:停止旧容器（不存在则跳过）
+            echo "停止旧容器..."
+            docker compose down || true
+            
+            # 清理无效镜像（可选，释放空间）
+            docker system prune -f
+            
+            # 构建并启动新容器
+            echo "构建Docker镜像..."
+            docker compose build --no-cache
+            echo "启动服务..."
+            docker compose up -d
+            
+            # 验证服务状态
+            echo "验证容器状态..."
+            docker compose ps
+            echo "✅ 部署完成！"

docker-compose.yml

@@ -0,0 +1,9 @@
+services:
+  aida_back:
+    container_name: develop-version-aida-back-test
+    build: .
+    volumes:
+      # 数据挂载
+      - ./log:/log
+    ports:
+      - '10090:5567'

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;
+//                    return;
-                    // throw new BusinessException("user.expired");
+                     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=整体