flux test

订单表字段改名
视频返回新增字段

.gitea/workflows/develop_3.1_MS_build_manual.yaml

@@ -0,0 +1,111 @@
+name: 手动 AiDA back-java 开发分支构建部署
+on:
+  workflow_dispatch:
+
+jobs:
+  build_and_deploy:
+    runs-on: java21
+
+    outputs:
+      build_status: ${{ job.status }}
+      build_url: ${{ gitea.server_url }}/${{ gitea.repository.owner.name }}/${{ gitea.repository.name }}/actions/runs/${{ gitea.run_id }}
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-MS-version-aida-back
+
+    steps:
+      - name: 0.记录开始时间
+        id: build_start_time
+        run: echo "current_time=$(TZ='Asia/Hong_Kong' date '+%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_OUTPUT
+
+      - name: 1.检出代码
+        uses: actions/checkout@v4
+        with:
+          ref: dev/3.1_release_merge_MS
+
+
+      - name: 3.缓存 Maven 依赖
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: 4.构建项目
+        run: |
+          java -version
+          mvn -v
+          mvn clean package -DskipTests
+
+      - name: 5.生成Dockerfile
+        run: |
+          echo "===== 生成Dockerfile ====="
+          cat > Dockerfile << 'EOF'
+          FROM openjdk:21-ea-21-jdk-slim
+          VOLUME /tmp
+          RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+          RUN echo 'Asia/Shanghai' > /etc/timezone
+          ADD ./target/aida-0.0.1-SNAPSHOT.jar /app.jar
+          ENTRYPOINT ["java","-jar","/app.jar"]
+          EOF
+          echo "Dockerfile内容:"
+          cat Dockerfile
+
+      - name: 6.生成docker-compose.yml
+        run: |
+          echo "===== 生成docker-compose.yml ====="
+          cat > docker-compose.yml << 'EOF'
+          version: '3'
+          services:
+            aida_back:
+              container_name: develop-aida-ms
+              build: .
+              volumes:
+                # 数据挂载
+                - ./log:/log
+                - ./temp:/temp
+                - ./uploads:/temp/uploads
+              ports:
+                - '10092:10092'
+              restart: always
+          EOF
+          # 验证docker-compose.yml生成
+          echo "docker-compose.yml内容:"
+          cat docker-compose.yml
+
+      - name: 7.上传jar到远程服务器
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          port: 22
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "target/*.jar,Dockerfile,docker-compose.yml"
+          target: ${{ env.REMOTE_DEPLOY_PATH }}
+          preserve_host_directory_structure: false
+
+      - name: 8. 重启 Docker 服务
+        uses: appleboy/ssh-action@master   # 👈 专门执行命令的 action
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          key_base64: true
+          script: |
+            echo "========= 进入部署目录 ========="
+            cd ${{ env.REMOTE_DEPLOY_PATH }}
+            ls -l
+            
+            echo "========= 停止旧服务 ========="
+            docker compose down
+            
+            echo "========= 启动新服务 ========="
+            docker compose up -d --build
+            
+            echo "========= 查看运行状态 ========="
+            docker compose ps

.gitea/workflows/develop_build_manual.yaml

@@ -0,0 +1,182 @@
+name: 手动 AiDA back-java 开发分支构建部署
+on:
+  workflow_dispatch:
+
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    outputs:
+      build_status: ${{ job.status }}
+      build_url: ${{ gitea.server_url }}/${{ gitea.repository.owner.name }}/${{ gitea.repository.name }}/actions/runs/${{ gitea.run_id }}
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REMOTE_DEPLOY_PATH: /workspace/workspace_aida/DevelopVersion/develop-version-aida-back
+
+    steps:
+      - name: 0.记录开始时间
+        id: build_start_time
+        run: echo "current_time=$(TZ='Asia/Hong_Kong' date '+%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_OUTPUT
+
+      - name: 1.检出代码
+        uses: actions/checkout@v4
+        with:
+          ref: dev/3.1_release_merge
+
+      - name: 2.Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: 3.设置JAVA Maven 环境
+        run: |
+          # 适配root/普通用户
+          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: 4.构建jar包
+        run: |
+          echo "===== 开始构建JAR包 ====="
+              # 新增：打印当前构建分支（两种方式双重确认）
+          echo "当前工作目录分支：$(git branch --show-current)"
+          echo "Gitea检出分支:${{ github.ref_name }}"
+          echo "预期构建分支:dev/3.1_release_merge"
+          echo "========================"
+          mvn -B clean install -DskipTests -Pdev 2>&1
+          # 检查构建是否成功
+          if [ $? -ne 0 ]; then
+          echo "JAR包构建失败!"
+          exit 1
+          fi
+
+      - name: 5.生成Dockerfile
+        run: |
+          echo "===== 生成Dockerfile ====="
+          cat > Dockerfile << 'EOF'
+          FROM openjdk:21-ea-21-jdk-slim
+          VOLUME /tmp
+          RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+          RUN echo 'Asia/Shanghai' > /etc/timezone
+          ADD ./aida-0.0.1-SNAPSHOT.jar /app.jar
+          ENTRYPOINT ["java","-jar","/app.jar"]
+          EOF
+          echo "Dockerfile内容:"
+          cat Dockerfile
+
+      - name: 6.生成docker-compose.yml
+        run: |
+          echo "===== 生成docker-compose.yml ====="
+          cat > docker-compose.yml << 'EOF'
+          version: '3'
+          services:
+            aida_back:
+              container_name: develop-version-aida-back
+              build: .
+              volumes:
+                # 数据挂载
+                - ./log:/log
+                - ./temp:/temp
+                - ./uploads:/temp/uploads
+              ports:
+                - '10090:5567'
+              networks:
+                - aida_java_net
+              restart: always
+          networks:
+            aida_java_net:
+              external: true
+              name: aida_java_net
+          EOF
+          # 验证docker-compose.yml生成
+          echo "docker-compose.yml内容:"
+          cat docker-compose.yml
+
+      - name: 7.安装SSH工具
+        run: |
+          $SUDO apt install -y sshpass openssh-client --no-install-recommends
+          # 配置SSH免密
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts
+
+      - name: 8.同步文件到远程服务器
+        run: |
+          echo "===== 同步文件到远程服务器 ====="
+          # 使用scp同步文件
+          scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+            ./target/*.jar ./Dockerfile ./docker-compose.yml \
+            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ env.REMOTE_DEPLOY_PATH }} 2>&1
+
+      - name: 9.部署和运行服务
+        run: |
+          echo "===== 开始部署服务 ====="
+          # SSH执行部署命令
+          ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF_SSH'
+            cd ${{ env.REMOTE_DEPLOY_PATH }}
+            echo "停止旧容器..."
+            docker compose down || true
+            echo "清理Docker资源..."
+            docker system prune -f
+            echo "构建镜像..."
+            docker compose build --no-cache
+            echo "启动服务..."
+            docker compose up -d
+            echo "验证容器状态..."
+            docker compose ps
+            echo "部署完成！"
+          EOF_SSH
+
+      - name: 10.发送构建结果邮件
+        if: always() # 无论上一步是否失败，都执行此步骤
+        uses: dawidd6/action-send-mail@v3
+        with:
+
+          from: ${{ secrets.MAIL_USERNAME }}
+          # --- 邮件配置 ---
+          server_address: smtp.gmail.com # 替换为你的SMTP服务器地址
+          server_port: 465 # 替换为你的SMTP端口 (通常是465或587)
+          username: ${{ secrets.MAIL_USERNAME }} # 存储在Secrets中的邮箱用户名
+          password: ${{ secrets.MAIL_PASSWORD }} # 存储在Secrets中的邮箱密码
+          subject: 'Gitea Actions 构建通知: ${{ job.status }} - AiDA back-java Develop'
+          # 收件人列表，可以根据需要更改
+          to: 'cgzhou@aidlab.hk,zchengrong@yeah.net' # 替换为实际收件人邮箱
+
+          # --- 邮件正文内容 ---
+          body: |
+            项目: AiDA back-java Develop
+            分支: dev/3.1_release_merge
+
+            🎉 构建结果: ${{ job.status }}
+
+            📅 构建时间: ${{ steps.build_start_time.outputs.current_time }}
+
+            🔗 构建链接: ${{ gitea.server_url }}/${{ gitea.repository.owner.name }}/${{ gitea.repository.name }}/actions/runs/${{ gitea.run_id }}
+
+          # 确保邮件内容为纯文本，或者你可以设置为 html: true 并调整 body
+          content_type: text/plain

src/main/java/com/ai/da/AiDaApplication.java

@@ -1,20 +1,24 @@
-package com.ai.da;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@Slf4j
-@SpringBootApplication
-@EnableScheduling
-@EnableAsync
-public class AiDaApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(AiDaApplication.class, args);
-        log.info("AiDaApplication 启动完成!");
-    }
-
-}
+package com.ai.da;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Slf4j
+@SpringBootApplication
+@EnableScheduling
+@EnableAsync
+@EnableFeignClients
+@EnableDiscoveryClient
+public class AiDaApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AiDaApplication.class, args);
+        log.info("AiDaApplication 启动完成!");
+    }
+
+}

src/main/java/com/ai/da/common/RabbitMQ/EmailRetryConsumer.java

@@ -13,9 +13,8 @@ import org.springframework.stereotype.Component;
 import software.amazon.awssdk.core.exception.RetryableException;
 import org.springframework.amqp.core.Message;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
-import javax.mail.MessagingException;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Objects;

src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java

@@ -559,103 +559,103 @@ public class GenerateConsumer {
         log.info("============ProcessPoseTransformResult End listening==========");
     }
 
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer1(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 1");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer2(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 2");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer3(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 3");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer4(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 4");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer5(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 5");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer6(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 6");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer7(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 7");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer8(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 8");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-    @RabbitHandler
-    public void generateConsumer9(Message msg, Channel channel) {
-        generate(msg, channel, "consumer 9");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}")
-    @RabbitHandler
-    public void getGenerateResult(Message msg, Channel channel) {
-        processGenerateResult(msg, channel);
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}")
-    @RabbitHandler
-    public void getToProductImageResult(Message msg, Channel channel) {
-        processToProductImageResult(msg, channel);
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}")
-    @RabbitHandler
-    public void getRelightResult(Message msg, Channel channel) {
-        processRelightResult(msg, channel);
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}")
-    @RabbitHandler
-    public void getPoseTransformationResult(Message msg, Channel channel) {
-        processPoseTransformResult(msg, channel);
-    }
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.designBatch}")
-    @RabbitHandler
-    public void getDesignBatchResult(Message msg, Channel channel) {
-        processDesignBatchResult(msg, channel);
-    }
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageBatch}")
-    @RabbitHandler
-    public void getToProductImageBatchResult(Message msg, Channel channel) {
-        processToProductImageBatchResult(msg, channel);
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.relightBatch}")
-    @RabbitHandler
-    public void getRelightBatchResult(Message msg, Channel channel) {
-        processRelightBatchResult(msg, channel);
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransformBatch}")
-    @RabbitHandler
-    public void getPoseTransformBatchResult(Message msg, Channel channel) {
-        processPoseTransformBatchResult(msg, channel);
-    }
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer1(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 1");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer2(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 2");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer3(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 3");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer4(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 4");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer5(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 5");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer6(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 6");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer7(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 7");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer8(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 8");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+//    @RabbitHandler
+//    public void generateConsumer9(Message msg, Channel channel) {
+//        generate(msg, channel, "consumer 9");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}")
+//    @RabbitHandler
+//    public void getGenerateResult(Message msg, Channel channel) {
+//        processGenerateResult(msg, channel);
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}")
+//    @RabbitHandler
+//    public void getToProductImageResult(Message msg, Channel channel) {
+//        processToProductImageResult(msg, channel);
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}")
+//    @RabbitHandler
+//    public void getRelightResult(Message msg, Channel channel) {
+//        processRelightResult(msg, channel);
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}")
+//    @RabbitHandler
+//    public void getPoseTransformationResult(Message msg, Channel channel) {
+//        processPoseTransformResult(msg, channel);
+//    }
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.designBatch}")
+//    @RabbitHandler
+//    public void getDesignBatchResult(Message msg, Channel channel) {
+//        processDesignBatchResult(msg, channel);
+//    }
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageBatch}")
+//    @RabbitHandler
+//    public void getToProductImageBatchResult(Message msg, Channel channel) {
+//        processToProductImageBatchResult(msg, channel);
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.relightBatch}")
+//    @RabbitHandler
+//    public void getRelightBatchResult(Message msg, Channel channel) {
+//        processRelightBatchResult(msg, channel);
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransformBatch}")
+//    @RabbitHandler
+//    public void getPoseTransformBatchResult(Message msg, Channel channel) {
+//        processPoseTransformBatchResult(msg, channel);
+//    }
 }

src/main/java/com/ai/da/common/RabbitMQ/MQPublisher.java

@@ -5,7 +5,7 @@ import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Map;
 
 @Slf4j
@@ -28,6 +28,11 @@ public class MQPublisher {
         amqpTemplate.convertAndSend(rabbitMQProperties.getQueues().getSr(), mm);
     }
 
+    public void sendGenerateResultMessage(String mm) {
+        log.info("send generate result message: {}", mm);
+        amqpTemplate.convertAndSend(rabbitMQProperties.getQueues().getGenerateResult(), mm);
+    }
+
     /**
      *
      * @param mailParams 含有的字段

src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java

@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -222,16 +222,16 @@ public class SRConsumer {
         taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null);
     }
 
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.sr}")
-    @RabbitHandler
-    public void SRConsumer1(Message msg, Channel channel) {
-        superResolution(msg, channel, "consumer 1");
-    }
-
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.srResult}")
-    @RabbitHandler
-    public void SRResultConsumer1(Message msg, Channel channel) {
-        getSRResult(msg, channel, "consumer 1");
-    }
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.sr}")
+//    @RabbitHandler
+//    public void SRConsumer1(Message msg, Channel channel) {
+//        superResolution(msg, channel, "consumer 1");
+//    }
+//
+//    @RabbitListener(queues = "#{rabbitMQProperties.queues.srResult}")
+//    @RabbitHandler
+//    public void SRResultConsumer1(Message msg, Channel channel) {
+//        getSRResult(msg, channel, "consumer 1");
+//    }
 
 }

src/main/java/com/ai/da/common/aspect/ControllerLoggingAspect.java

@@ -0,0 +1,170 @@
+package com.ai.da.common.aspect;
+
+import com.ai.da.common.context.UserContext;
+import com.ai.da.model.vo.AuthPrincipalVo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Controller日志切面
+ * 记录所有Controller接口的请求参数和用户信息
+ */
+@Aspect
+@Component
+public class ControllerLoggingAspect {
+
+    private static final Logger logger = LoggerFactory.getLogger(ControllerLoggingAspect.class);
+
+    /**
+     * 定义切点：所有Controller方法
+     */
+    @Pointcut("execution(* com.ai.da.controller..*(..))")
+    public void controllerMethods() {
+    }
+
+    /**
+     * Controller方法执行前记录日志
+     */
+//    @Before("controllerMethods()")
+    public void logControllerBefore(JoinPoint joinPoint) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+
+            // 获取当前用户ID
+            Long userId = null;
+            AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder();
+            if (authPrincipalVo != null) {
+                userId = authPrincipalVo.getId();
+            }
+
+            // 获取请求参数
+            Map<String, Object> params = getRequestParams(joinPoint, request);
+
+            logger.info("=== 请求开始 ===");
+            logger.info("用户ID: {}", userId);
+            logger.info("请求URL: {}", request.getRequestURL().toString());
+            logger.info("请求方法: {}", request.getMethod());
+            logger.info("请求IP: {}", getClientIpAddress(request));
+            logger.info("调用方法: {}.{}", joinPoint.getSignature().getDeclaringType().getSimpleName(), joinPoint.getSignature().getName());
+            logger.info("请求参数: {}", params);
+        }
+    }
+
+    /**
+     * 获取请求参数
+     */
+    private Map<String, Object> getRequestParams(JoinPoint joinPoint, HttpServletRequest request) {
+        Map<String, Object> params = new HashMap<>();
+
+        // 1. 获取Query String参数
+        String queryString = request.getQueryString();
+        if (queryString != null && !queryString.isEmpty()) {
+            params.put("queryString", queryString);
+        }
+
+        // 2. 获取方法参数（包含 @PathVariable, @RequestParam, @RequestBody 等）
+        Object[] args = joinPoint.getArgs();
+
+        if (args != null && args.length > 0) {
+            Map<String, Object> methodParams = new HashMap<>();
+            for (int i = 0; i < args.length; i++) {
+                Object arg = args[i];
+                // 过滤掉不可序列化的参数
+                if (arg != null) {
+                    if (isIgnorable(arg)) {
+                        // 对于可忽略的类型，记录类型名
+                        methodParams.put("arg" + i, "[" + arg.getClass().getSimpleName() + "]");
+                    } else {
+                        try {
+                            methodParams.put("arg" + i, arg);
+                        } catch (Exception e) {
+                            methodParams.put("arg" + i, arg.toString());
+                        }
+                    }
+                }
+            }
+            if (!methodParams.isEmpty()) {
+                params.put("methodParams", methodParams);
+            }
+        }
+
+        return params;
+    }
+
+    /**
+     * 判断是否需要过滤的参数类型
+     */
+    private boolean isIgnorable(Object obj) {
+        return obj instanceof HttpServletRequest
+                || obj instanceof HttpServletResponse
+                || obj instanceof MultipartFile
+                || obj instanceof MultipartFile[];
+    }
+
+    /**
+     * Controller方法抛出异常时记录日志
+     */
+    @AfterThrowing(pointcut = "controllerMethods()", throwing = "exception")
+    public void logControllerAfterThrowing(JoinPoint joinPoint, Throwable exception) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+
+        Long userId = null;
+        AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder();
+        if (authPrincipalVo != null) {
+            userId = authPrincipalVo.getId();
+        }
+
+        // 获取请求参数
+        Map<String, Object> params = new HashMap<>();
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+            params = getRequestParams(joinPoint, request);
+        }
+
+        logger.error("=== 请求异常 ===");
+        logger.error("用户ID: {}", userId);
+        logger.error("调用方法: {}.{}", joinPoint.getSignature().getDeclaringType().getSimpleName(), joinPoint.getSignature().getName());
+        logger.error("请求参数: {}", params);
+        logger.error("异常信息: ", exception);
+        logger.error("=== 异常结束 ===");
+    }
+
+    /**
+     * 获取客户端真实IP地址
+     */
+    private String getClientIpAddress(HttpServletRequest request) {
+        String xForwardedFor = request.getHeader("X-Forwarded-For");
+        if (xForwardedFor != null && !xForwardedFor.isEmpty() && !"unknown".equalsIgnoreCase(xForwardedFor)) {
+            return xForwardedFor.split(",")[0];
+        }
+
+        String xRealIp = request.getHeader("X-Real-IP");
+        if (xRealIp != null && !xRealIp.isEmpty() && !"unknown".equalsIgnoreCase(xRealIp)) {
+            return xRealIp;
+        }
+
+        String proxyClientIp = request.getHeader("Proxy-Client-IP");
+        if (proxyClientIp != null && !proxyClientIp.isEmpty() && !"unknown".equalsIgnoreCase(proxyClientIp)) {
+            return proxyClientIp;
+        }
+
+        String wlProxyClientIp = request.getHeader("WL-Proxy-Client-IP");
+        if (wlProxyClientIp != null && !wlProxyClientIp.isEmpty() && !"unknown".equalsIgnoreCase(wlProxyClientIp)) {
+            return wlProxyClientIp;
+        }
+
+        return request.getRemoteAddr();
+    }
+}

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

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Configuration
 //加载配置文件

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

@@ -24,6 +24,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.core.parameters.P;
@@ -32,8 +33,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StopWatch;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -201,7 +202,7 @@ public class MyTaskScheduler {
         }
     }
 
-    @Scheduled(cron = "0 0 9 * * ?")
+    //    @Scheduled(cron = "0 0 9 * * ?")
     public void sendTrialOrderExcelToManagements() {
         // 获取前一天日期
         LocalDate yesterday = LocalDate.now().minusDays(1);
@@ -307,7 +308,7 @@ public class MyTaskScheduler {
     private MinioUtil minioUtil;
     @Resource
     private UserLikeService userLikeService;
-    public void clearMinio() {
+   /* public void clearMinio() {
         List<CollectionElement> collectionElements = collectionElementMapper.selectDeleteList();
         for (CollectionElement collectionElement : collectionElements) {
             String url = collectionElement.getUrl();
@@ -471,7 +472,7 @@ public class MyTaskScheduler {
 //        }
 //        String preSignedUrl = minioUtil.getPreSignedUrl("aida-clothing/image/image_1698374859.3031476.png", 10000);
 //        System.out.println(preSignedUrl);
-    }
+    }*/
 
     @Resource
     private AttributeRetrievalMapper attributeRetrievalMapper;

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

@@ -0,0 +1,34 @@
+package com.ai.da.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
+
+/**
+ * Spring Security 配置。
+ * 由于鉴权逻辑已迁移至 Gateway（GlobalAuthWebFilter），
+ * 后端服务 (aida-back) 默认放行所有请求，仅依赖网关传递的用户信息。
+ */
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                // 禁用 CSRF（微服务通常不需要）
+                .csrf(AbstractHttpConfigurer::disable)
+                // 允许所有请求，具体鉴权在网关层完成
+                .authorizeHttpRequests(auth -> auth
+                        .anyRequest().permitAll()
+                )
+                // 禁用默认的表单登录和 HTTP Basic 认证，防止 302 重定向
+                .formLogin(AbstractHttpConfigurer::disable)
+                .httpBasic(AbstractHttpConfigurer::disable);
+
+        return http.build();
+    }
+}

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

@@ -14,8 +14,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -1,42 +1,54 @@
-package com.ai.da.common.config;
-
-
-import org.hibernate.validator.HibernateValidator;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
-@Configuration
-public class WebConfig extends WebMvcConfigurerAdapter {
-
-    static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE"};
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**").allowedOrigins("*").allowCredentials(true).allowedMethods(ORIGINS).maxAge(3600);
-    }
-
-    @Bean
-    public Validator validator() {
-        ValidatorFactory validatorFactory = Validation.byProvider(HibernateValidator.class)
-                .configure()
-                //failFast为true出现校验失败的情况，立即结束校验，不再进行后续的校验
-                .failFast(true)
-                .buildValidatorFactory();
-
-        return validatorFactory.getValidator();
-    }
-
-    @Bean
-    public MethodValidationPostProcessor methodValidationPostProcessor() {
-        MethodValidationPostProcessor methodValidationPostProcessor = new MethodValidationPostProcessor();
-        methodValidationPostProcessor.setValidator(validator());
-        return methodValidationPostProcessor;
-    }
-}
+package com.ai.da.common.config;
+
+
+import com.ai.da.common.interceptor.UserContextInterceptor;
+import org.hibernate.validator.HibernateValidator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import jakarta.annotation.Resource;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE"};
+
+    @Resource
+    private UserContextInterceptor userContextInterceptor;
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**").allowedOriginPatterns("*").allowCredentials(true).allowedMethods(ORIGINS).maxAge(3600);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userContextInterceptor)
+                .addPathPatterns("/**");
+    }
+
+    @Bean
+    public Validator validator() {
+        ValidatorFactory validatorFactory = Validation.byProvider(HibernateValidator.class)
+                .configure()
+                //failFast为true出现校验失败的情况，立即结束校验，不再进行后续的校验
+                .failFast(true)
+                .buildValidatorFactory();
+
+        return validatorFactory.getValidator();
+    }
+
+    @Bean
+    public MethodValidationPostProcessor methodValidationPostProcessor() {
+        MethodValidationPostProcessor methodValidationPostProcessor = new MethodValidationPostProcessor();
+        methodValidationPostProcessor.setValidator(validator());
+        return methodValidationPostProcessor;
+    }
+}

src/main/java/com/ai/da/common/config/exception/ExceptionCatch.java

@@ -1,89 +1,99 @@
-package com.ai.da.common.config.exception;
-
-import com.ai.da.common.response.Response;
-import com.google.common.collect.ImmutableMap;
-import com.ai.da.common.response.ResultEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.BindException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * @author: dangweijian
- * @description: 全局异常捕获
- * @create: 2019-12-03 10:24
- **/
-@Slf4j
-@ControllerAdvice
-public class ExceptionCatch {
-
-    /**
-     * 线程安全,且构建后不可更改
-     */
-    private static ImmutableMap<Class<? extends Throwable>, ResultEnum> EXCEPTIONS;
-
-    /**
-     * 用于构建ImmutableMap
-     */
-    private static ImmutableMap.Builder<Class<? extends Throwable>, ResultEnum> builder = ImmutableMap.builder();
-
-    @ResponseBody
-    @ExceptionHandler(BusinessException.class)
-    public Response<String> businessExceptionCatch(BusinessException e) {
-        log.error("发生业务异常,code:[{}],msg:[{}]", e.getCode(), e.getMsg(), e);
-        return Response.error(e.getCode(), e.getMsg());
-    }
-
-    @ResponseBody
-    @ExceptionHandler(Exception.class)
-    public Response<String> exceptionCatch(Exception e) {
-        log.error("发生系统异常,message:[{}]", e.getMessage(), e);
-        //如果ImmutableMap集合为空,构建ImmutableMap
-        if (EXCEPTIONS == null || EXCEPTIONS.size() == 0) {
-            EXCEPTIONS = builder.build();
-        }
-        //获取不可预知异常自定义错误码
-        if (EXCEPTIONS != null) {
-            ResultEnum resultEnum = EXCEPTIONS.get(e.getClass());
-            if (resultEnum != null) {
-                return Response.error(resultEnum.getCode(), resultEnum.getMsg());
-            }
-        }
-        return Response.error(ResultEnum.ERROR.getCode(), e.getMessage() == null ? ResultEnum.ERROR.getMsg() : e.getMessage());
-    }
-
-    /**
-     * 处理参数校验异常
-     *
-     * @param e
-     * @return ResponseData
-     */
-    @ResponseBody
-    @ExceptionHandler(BindException.class)
-    public Response<String> bindExceptionHandler(BindException e) {
-        log.error("参数错误bind：{}", e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
-        BusinessException businessException = new BusinessException(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
-        return Response.error(businessException.getCode(), businessException.getMsg());
-    }
-
-    /**
-     * 处理参数校验异常
-     *
-     * @param e
-     * @return ResponseData
-     */
-    @ResponseBody
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public Response<String> handleValidationException(MethodArgumentNotValidException e) {
-        log.error("参数错误bind：{}", e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
-        BusinessException businessException = new BusinessException(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
-        return Response.error(businessException.getCode(), businessException.getMsg());
-    }
-
-    //初始化,不可预知异常自定义错误编码
-    static {
-//        builder.put(FileNotFoundException.class, ResultEnum.FILE_NOT_EXIST);
-    }
-}
+package com.ai.da.common.config.exception;
+
+import com.ai.da.common.response.Response;
+import com.google.common.collect.ImmutableMap;
+import com.ai.da.common.response.ResultEnum;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * @author: dangweijian
+ * @description: 全局异常捕获
+ * @create: 2019-12-03 10:24
+ **/
+@Slf4j
+@ControllerAdvice
+public class ExceptionCatch {
+
+    /**
+     * 线程安全,且构建后不可更改
+     */
+    private static ImmutableMap<Class<? extends Throwable>, ResultEnum> EXCEPTIONS;
+
+    /**
+     * 用于构建ImmutableMap
+     */
+    private static ImmutableMap.Builder<Class<? extends Throwable>, ResultEnum> builder = ImmutableMap.builder();
+
+    @ResponseBody
+    @ExceptionHandler(BusinessException.class)
+    public Response<String> businessExceptionCatch(BusinessException e) {
+        log.error("发生业务异常,code:[{}],msg:[{}]", e.getCode(), e.getMsg(), e);
+        return Response.error(e.getCode(), e.getMsg());
+    }
+
+    @ResponseBody
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    @ExceptionHandler(UnauthorizedException.class)
+    public Response<String> unauthorizedExceptionCatch(UnauthorizedException e) {
+        log.error("Unauthorized: {}", e.getMessage());
+        return Response.error(401, e.getMessage());
+    }
+
+    @ResponseBody
+    @ExceptionHandler(Exception.class)
+    public Response<String> exceptionCatch(Exception e) {
+        log.error("发生系统异常,message:[{}]", e.getMessage(), e);
+        //如果ImmutableMap集合为空,构建ImmutableMap
+        if (EXCEPTIONS == null || EXCEPTIONS.size() == 0) {
+            EXCEPTIONS = builder.build();
+        }
+        //获取不可预知异常自定义错误码
+        if (EXCEPTIONS != null) {
+            ResultEnum resultEnum = EXCEPTIONS.get(e.getClass());
+            if (resultEnum != null) {
+                return Response.error(resultEnum.getCode(), resultEnum.getMsg());
+            }
+        }
+        return Response.error(ResultEnum.ERROR.getCode(), e.getMessage() == null ? ResultEnum.ERROR.getMsg() : e.getMessage());
+    }
+
+    /**
+     * 处理参数校验异常
+     *
+     * @param e
+     * @return ResponseData
+     */
+    @ResponseBody
+    @ExceptionHandler(BindException.class)
+    public Response<String> bindExceptionHandler(BindException e) {
+        log.error("参数错误bind：{}", e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        BusinessException businessException = new BusinessException(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        return Response.error(businessException.getCode(), businessException.getMsg());
+    }
+
+    /**
+     * 处理参数校验异常
+     *
+     * @param e
+     * @return ResponseData
+     */
+    @ResponseBody
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Response<String> handleValidationException(MethodArgumentNotValidException e) {
+        log.error("参数错误bind：{}", e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        BusinessException businessException = new BusinessException(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        return Response.error(businessException.getCode(), businessException.getMsg());
+    }
+
+    //初始化,不可预知异常自定义错误编码
+    static {
+//        builder.put(FileNotFoundException.class, ResultEnum.FILE_NOT_EXIST);
+    }
+}

src/main/java/com/ai/da/common/config/exception/TokenMissingOrExpiredException.java

@@ -1,12 +0,0 @@
-package com.ai.da.common.config.exception;
-
-public class TokenMissingOrExpiredException extends RuntimeException {
-    public TokenMissingOrExpiredException(String message) {
-        super(message);
-    }
-
-    @Override
-    public Throwable fillInStackTrace() {
-        return this;
-    }
-}

src/main/java/com/ai/da/common/config/exception/UnauthorizedException.java

@@ -0,0 +1,12 @@
+package com.ai.da.common.config.exception;
+
+public class UnauthorizedException extends RuntimeException {
+
+    public UnauthorizedException(String message) {
+        super(message);
+    }
+
+    public UnauthorizedException() {
+        super("Gateway token verification failed");
+    }
+}

src/main/java/com/ai/da/common/config/swagger/AidaConfiguration.java

@@ -1,37 +0,0 @@
-package com.ai.da.common.config.swagger;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
-
-@Configuration
-@EnableSwagger2WebMvc
-public class AidaConfiguration {
-
-    @Bean(value = "IntelligentCurtainApis")
-    public Docket gxyd5aThemeApis() {
-        Contact contact = new Contact("Mr.Y", "", "136");
-
-        Docket docket = new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(new ApiInfoBuilder()
-                        .description("aida接口文档")
-                        .contact(contact)
-                        .termsOfServiceUrl("暂无")
-                        .version("1.0")
-                        .build())
-                //分组名称
-                .groupName("1.0")
-                .select()
-                //这里指定Controller扫描包路径
-                .apis(RequestHandlerSelectors.basePackage("com.ai.da.controller"))
-                .paths(PathSelectors.any())
-                .build();
-        return docket;
-    }
-}

src/main/java/com/ai/da/common/constant/CommonConstant.java

@@ -10,7 +10,7 @@ public class CommonConstant {
     // 单位 秒  两天过期
     public static final Long CREDITS_EXPIRE_TIME = 2 * 24 * 60 * 60L;
     // 单位 分钟
-    public static final Integer MINIO_IMAGE_EXPIRE_TIME = 24 * 60;
+    public static final Integer MINIO_IMAGE_EXPIRE_TIME = 24 * 60 * 7;
     // 单位 秒 一天过期 in redis
     public static final Long GENERATE_RESULT_EXPIRE_TIME = 24 * 60 * 60L;
     // 单位 秒 7天过期
@@ -23,6 +23,7 @@ public class CommonConstant {
     }
 
     public static final String GENERATE_PATH = "/api/generate_image";
+    public static final String GENERATE_PATH_FLUX2_KLEIN = "/api/generate_image_flux2_klein";
 
     public static final String GENERATE_SINGLE_LOGO = "/api/generate_single_logo";
 

src/main/java/com/ai/da/common/constant/ModelConstants.java

@@ -18,9 +18,9 @@ public class ModelConstants {
 
     // 模型名称常量
     public static final String PRINTBOARD_ADVANCED_T2I = "qwen-image";
-    public static final String MOODBOARD_ADVANCED = "doubao-seedream-3-0-t2i-250415";
-    public static final String PRINTBOARD_HIGH_T2I = "doubao-seedream-3-0-t2i-250415";
-    public static final String PRINTBOARD_HIGH_I2I = "doubao-seededit-3-0-i2i-250628";
+    public static final String MOODBOARD_ADVANCED = "doubao-seedream-4-5-251128";
+    public static final String PRINTBOARD_HIGH_T2I = "doubao-seedream-4-0-250828-high";
+    public static final String PRINTBOARD_HIGH_I2I = "doubao-seedream-4-0-250828-fast";
     public static final String PRINTBOARD_ADVANCED_I2I = "doubao-seedream-4-0-250828";
     public static final String IMAGEN_MODEL = "imagen-4.0-generate-001";
     public static final String NANO_BANANA = "gemini-2.5-flash-image";

src/main/java/com/ai/da/common/constant/TokenConstant.java

@@ -1,14 +0,0 @@
-package com.ai.da.common.constant;
-
-/**
- * @author yanglei
- * 异常类常量
- */
-public class TokenConstant {
-    /**
-     * 固定session
-     */
-    public static final String FIX_SESSION = "qrLS_003af9d8c1363fc4_6c97e932665c4460a1fdbfbf47ce3490";
-
-    public static final String PERMISSIONS = "9672233956";
-}

src/main/java/com/ai/da/common/context/UserContext.java

@@ -1,19 +1,41 @@
-package com.ai.da.common.context;
-
-import com.ai.da.model.vo.AuthPrincipalVo;
-
-public class UserContext {
-    private static ThreadLocal<AuthPrincipalVo> userHolder = new ThreadLocal<AuthPrincipalVo>();
-
-    public static AuthPrincipalVo getUserHolder() {
-        return userHolder.get();
-    }
-
-    public static void delete() {
-        userHolder.remove();
-    }
-
-    public static void setUserHolder(AuthPrincipalVo authPrincipalVo) {
-        userHolder.set(authPrincipalVo);
-    }
-}
+package com.ai.da.common.context;
+
+import com.ai.da.model.vo.AuthPrincipalVo;
+
+public class UserContext {
+    private static final ThreadLocal<AuthPrincipalVo> userHolder = new ThreadLocal<>();
+
+    public static void setUserHolder(AuthPrincipalVo authPrincipalVo) {
+        userHolder.set(authPrincipalVo);
+    }
+
+    public static AuthPrincipalVo getUserHolder() {
+        AuthPrincipalVo holder = userHolder.get();
+        if (holder == null) {
+            throw new RuntimeException("User not authenticated");
+        }
+        if (!"AIDA".equals(holder.getSource())) {
+            throw new RuntimeException("Access denied: source must be AIDA");
+        }
+        return holder;
+    }
+
+    public static void delete() {
+        userHolder.remove();
+    }
+
+    public static Long getUserId() {
+        return getUserHolder().getId();
+    }
+
+    public static Long getBuyerId() {
+        AuthPrincipalVo holder = userHolder.get();
+        if (holder == null) {
+            throw new RuntimeException("User not authenticated");
+        }
+        if (!"BUYER".equals(holder.getSource())) {
+            throw new RuntimeException("Access denied: source must be BUYER");
+        }
+        return holder.getId();
+    }
+}

src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java

@@ -33,7 +33,11 @@ public enum AuthenticationOperationTypeEnum {
      */
     UPDATE_USERINFO,
 
-    REGISTER;
+    REGISTER,
+    /**
+     * Global_Award 活动验证
+     */
+    GLOBAL_AWARD;
 
     public static AuthenticationOperationTypeEnum of(String name) {
         return Stream.of(AuthenticationOperationTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null);

src/main/java/com/ai/da/common/httpdata/token/TokenApis.java

@@ -1,33 +0,0 @@
-package com.ai.da.common.httpdata.token;
-
-public enum TokenApis {
-    /**
-     * token
-     */
-    GET_TOKEN("POST", "/api/openApi/v2/Weixin/QrCodeLoginCheck?session="),
-    GENERATE_USER("POST", "/api/openApi/v2/Welink/TopicGetjson");
-
-    private String method;
-    private String url;
-
-    TokenApis(String method, String url) {
-        this.method = method;
-        this.url = url;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-}

src/main/java/com/ai/da/common/httpdata/token/TokenQuery.java

@@ -1,42 +0,0 @@
-package com.ai.da.common.httpdata.token;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-public class TokenQuery {
-
-    private static final String GET_TOKEN_DOMAIN = "https://www.szsige.com";
-    private static final String GENERATE_USER_DOMAIN = "https://www.szsige.com";
-
-    public static JSONObject getToken(String session) {
-        String url = GET_TOKEN_DOMAIN + TokenApis.GET_TOKEN.getUrl() + session;
-        log.info("获取用户token接口请求url:" + url);
-        HttpResponse httpResponse = HttpUtil.createPost(url).execute();
-        log.info("获取用户token接口响应：" + httpResponse);
-        if (httpResponse.isOk() && StrUtil.isNotEmpty(httpResponse.body())) {
-            return JSONObject.parseObject(httpResponse.body());
-        }
-        return null;
-    }
-
-    public static JSONObject generateUser(Map<String, Object> param, String token) {
-        HttpResponse httpResponse = HttpUtil.createPost(GENERATE_USER_DOMAIN + TokenApis.GENERATE_USER.getUrl())
-                .body(JSONObject.toJSONString(param != null ? param : new HashMap<>()))
-                .header("Authorization", "Bearer " + token)
-                .header("X-Promiss", "9672233956")
-                .execute();
-        log.info("生成用户信息接口响应：" + httpResponse);
-        if (httpResponse.isOk() && StrUtil.isNotEmpty(httpResponse.body())) {
-            return JSONObject.parseObject(httpResponse.body());
-        }
-        return null;
-    }
-
-}

src/main/java/com/ai/da/common/interceptor/UserContextInterceptor.java

@@ -0,0 +1,51 @@
+package com.ai.da.common.interceptor;
+
+import com.ai.da.common.context.UserContext;
+import com.ai.da.model.vo.AuthPrincipalVo;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+/**
+ * 从 Gateway 转发的请求头中读取已鉴权的用户身份，写入 UserContext。
+ * <p>
+ * Gateway 验证 JWT 后将 X-User-Id 和 X-User-Info 写入请求头，
+ * 此拦截器负责将信息填充到 ThreadLocal，供业务代码使用。
+ * 不需要 Gateway 鉴权路径（如 login、静态资源）不会有这两个头，
+ * 此时 UserContext 保持为空，业务代码应自行处理。
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class UserContextInterceptor implements HandlerInterceptor {
+
+    private static final String USER_ID_HEADER = "X-User-Id";
+    private static final String USER_INFO_HEADER = "X-User-Info";
+
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        String userInfoJson = request.getHeader(USER_INFO_HEADER);
+        if (userInfoJson != null && !userInfoJson.isBlank()) {
+            try {
+                AuthPrincipalVo principal = objectMapper.readValue(userInfoJson, AuthPrincipalVo.class);
+                UserContext.setUserHolder(principal);
+            } catch (Exception e) {
+                log.warn("Failed to parse X-User-Info header: {}", e.getMessage());
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
+                                Object handler, Exception ex) {
+        UserContext.delete();
+    }
+}

src/main/java/com/ai/da/common/response/PageBaseResponse.java

@@ -1,8 +1,7 @@
 package com.ai.da.common.response;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -16,17 +15,17 @@ import java.util.List;
  */
 @Data
 @NoArgsConstructor
-@ApiModel("分页响应结果")
+@Schema(description = "分页响应结果")
 public class PageBaseResponse<T> {
-    @ApiModelProperty("页码")
+    @Schema(description = "页码")
     private long page;
-    @ApiModelProperty("每页数量")
+    @Schema(description = "每页数量")
     private long size;
-    @ApiModelProperty("总页数")
+    @Schema(description = "总页数")
     private long pages;
-    @ApiModelProperty("总条数")
+    @Schema(description = "总条数")
     private long total;
-    @ApiModelProperty("结果集")
+    @Schema(description = "结果集")
     private List<T> content;
 
 

src/main/java/com/ai/da/common/response/PageResponse.java

@@ -1,8 +1,7 @@
 package com.ai.da.common.response;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -16,18 +15,18 @@ import java.util.List;
  */
 @Data
 @NoArgsConstructor
-@ApiModel("分页响应结果")
+@Schema(description = "分页响应结果")
 public class PageResponse<T> extends Response<List<T>> {
-    @ApiModelProperty("页码")
+    @Schema(description = "页码")
     private long page;
-    @ApiModelProperty("每页数量")
+    @Schema(description = "每页数量")
     private long size;
-    @ApiModelProperty("总页数")
+    @Schema(description = "总页数")
     private long pages;
-    @ApiModelProperty("总条数")
+    @Schema(description = "总条数")
     private long total;
 
-    @ApiModelProperty("结果集")
+    @Schema(description = "结果集")
     private List<T> content;
 
 

src/main/java/com/ai/da/common/response/Response.java

@@ -1,7 +1,6 @@
 package com.ai.da.common.response;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,14 +16,14 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel("响应结果")
+@Schema(description = "响应结果")
 public class Response<T> implements Serializable {
 
-    @ApiModelProperty("响应状态码 0：成功 -1：失败")
+    @Schema(description = "响应状态码 0：成功 -1：失败")
     private int errCode;
-    @ApiModelProperty("提示消息")
+    @Schema(description = "提示消息")
     private String errMsg;
-    @ApiModelProperty("数据结果")
+    @Schema(description = "数据结果")
     private T data;
 
     public static <T> Response<T> success() {

src/main/java/com/ai/da/common/response/TransactionPageResponse.java

@@ -1,6 +1,6 @@
 package com.ai.da.common.response;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 
 @Data
 @NoArgsConstructor
-@ApiModel("交易记录分页响应结果")
+@Schema(description = "交易记录分页响应结果")
 public class TransactionPageResponse<T> extends PageBaseResponse<T> {
 
     private BigDecimal totalAmount;

src/main/java/com/ai/da/common/security/UserAuthAccessDeniedHandler.java

@@ -1,27 +0,0 @@
-package com.ai.da.common.security;
-
-import com.ai.da.common.response.Response;
-import com.ai.da.common.response.ResultEnum;
-import com.ai.da.common.utils.JSONResponseUtils;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.web.access.AccessDeniedHandler;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @ClassName UserAuthAccessDeniedHandler
- * @Description 无权限处理类
- * @Author dwjian
- * @Date 2020/7/9 20:30
- */
-@Component
-public class UserAuthAccessDeniedHandler implements AccessDeniedHandler {
-    @Override
-    public void handle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AccessDeniedException exception) throws IOException {
-        Response<String> response = Response.error(ResultEnum.NO_PERMISSION.getCode(), ResultEnum.NO_PERMISSION.getMsg());
-        JSONResponseUtils.build(httpServletResponse, response);
-    }
-}

src/main/java/com/ai/da/common/security/UserAuthenticationEntryPointHandler.java

@@ -1,29 +0,0 @@
-package com.ai.da.common.security;
-
-import com.ai.da.common.response.Response;
-import com.ai.da.common.response.ResultEnum;
-import com.ai.da.common.utils.JSONResponseUtils;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @ClassName UserAuthenticationEntryPointHandler
- * @Description 未登录处理类
- * @Author dwjian
- * @Date 2020/7/9 20:13
- */
-@Component
-public class UserAuthenticationEntryPointHandler implements AuthenticationEntryPoint {
-    @Override
-    public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException e) throws IOException, ServletException {
-        Response<String> response = Response.error(ResultEnum.NO_LOGIN.getCode(), ResultEnum.NO_LOGIN.getMsg());
-        httpServletResponse.setStatus(401);
-        JSONResponseUtils.build(httpServletResponse, response);
-    }
-}

src/main/java/com/ai/da/common/security/UserAuthenticationManager.java

@@ -1,25 +0,0 @@
-package com.ai.da.common.security;
-
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * @author: dangweijian
- * @description: 认证管理器
- * @create: 2020-07-10 15:58
- **/
-@Component
-public class UserAuthenticationManager implements AuthenticationManager {
-
-    @Resource
-    private UserAuthenticationProvider userAuthenticationProvider;
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        return userAuthenticationProvider.authenticate(authentication);
-    }
-}

src/main/java/com/ai/da/common/security/UserAuthenticationProvider.java

@@ -1,59 +0,0 @@
-package com.ai.da.common.security;
-
-import com.ai.da.common.config.RsaProperties;
-import com.ai.da.common.utils.RsaDecryptUtils;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.stereotype.Component;
-
-/**
- * @author: dangweijian
- * @description: 登录校验处理类
- * @create: 2020-07-09 14:39
- **/
-@Component
-public class UserAuthenticationProvider implements AuthenticationProvider {
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        String userName = (String) authentication.getPrincipal();
-        String password = (String) authentication.getCredentials();
-        try {
-            password = RsaDecryptUtils.decrypt(password, RsaProperties.privateKey);
-        } catch (Exception e) {
-            throw new BadCredentialsException("用户名或密码错误");
-        }
-//        User user = userService.getByUsername(userName);
-//        if (user == null) {
-//            throw new UsernameNotFoundException("用户名或密码错误");
-//        }
-//        //账号已冻结
-//        if(user.getStatus() == 1){
-//            throw new LockedException("账号已冻结");
-//        }
-//        if(!passwordEncoder.matches(password, user.getPassword())){
-//            throw new BadCredentialsException("用户名或密码错误");
-//        }
-//        //超级管理员
-//        Set<SimpleGrantedAuthority> authorities = new HashSet<>();
-//        if(user.getIsAdmin()) {
-//            authorities.add(new SimpleGrantedAuthority("admin"));
-//            return new UsernamePasswordAuthenticationToken(user, password, authorities);
-//        }else {
-//            List<RoleMenuDto> userMenus = menuService.getRoleMenusByUserId(user.getId(), null);
-//            if(CollUtil.isNotEmpty(userMenus)){
-//                authorities.addAll(userMenus.stream().map(RoleMenuDto::getPermission).filter(StringUtils::isNotEmpty).map(SimpleGrantedAuthority::new).collect(Collectors.toSet()));
-//            }
-//            return new UsernamePasswordAuthenticationToken(user, password, authorities);
-//        }
-        return null;
-    }
-
-    @Override
-    public boolean supports(Class<?> aClass) {
-        return UsernamePasswordAuthenticationToken.class.isAssignableFrom(aClass);
-    }
-}

src/main/java/com/ai/da/common/security/UserLoginFailureHandler.java

@@ -1,48 +0,0 @@
-package com.ai.da.common.security;
-
-import com.ai.da.common.response.Response;
-import com.ai.da.common.response.ResultEnum;
-import com.ai.da.common.utils.JSONResponseUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.*;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.web.authentication.AuthenticationFailureHandler;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @ClassName UserLoginFailureHandler
- * @Description 登录失败处理类
- * @Author dwjian
- * @Date 2020/7/9 20:17
- */
-@Slf4j
-@Component
-public class UserLoginFailureHandler implements AuthenticationFailureHandler {
-    @Override
-    public void onAuthenticationFailure(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException e) throws IOException, ServletException {
-        Response<String> response;
-        if (e instanceof UsernameNotFoundException || e instanceof BadCredentialsException) {
-            response = Response.fail(e.getMessage());
-        } else if (e instanceof LockedException) {
-            response = Response.fail(ResultEnum.ACCOUNT_LOCK);
-        } else if (e instanceof CredentialsExpiredException) {
-            response = Response.fail("证书过期，请联系管理员!");
-        } else if (e instanceof AccountExpiredException) {
-            response = Response.fail("账户过期，请联系管理员!");
-        } else if (e instanceof DisabledException) {
-            response = Response.fail("账户被禁用，请联系管理员!");
-        } else if (e instanceof AuthenticationServiceException) {
-            response = Response.fail(e.getMessage());
-        } else {
-            log.error("登录失败：", e);
-            response = Response.fail("登录失败!");
-        }
-        JSONResponseUtils.build(httpServletResponse, response);
-    }
-}

src/main/java/com/ai/da/common/security/UserLoginSuccessHandler.java

@@ -1,51 +0,0 @@
-package com.ai.da.common.security;
-
-import com.ai.da.common.response.ResultEnum;
-import com.ai.da.common.utils.JSONResponseUtils;
-import com.ai.da.common.response.Response;
-import com.ai.da.common.security.jwt.JWTTokenHelper;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @author: dangweijian
- * @description: 登录成功处理类
- * @create: 2020-07-09 14:58
- **/
-@Component
-public class UserLoginSuccessHandler implements AuthenticationSuccessHandler {
-
-    @Resource
-    private JWTTokenHelper jwtTokenHelper;
-
-    @Override
-    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
-//        User user = (User) authentication.getPrincipal();
-//        AuthPrincipalVo principal = new AuthPrincipalVo();
-//        BeanUtils.copyProperties(user, principal);
-//        // 获取用户角色
-//        List<UserRoleDto> userRoles = roleService.getUserRoles(user.getId(), 0);
-//        principal.setRoles(userRoles);
-//        // 获取角色部门
-//        if(CollUtil.isNotEmpty(userRoles)){
-//            principal.setDepts(deptService.getDeptByRoleIds(userRoles.stream().map(UserRoleDto::getRoleId).collect(Collectors.toList())));
-//        }
-//        // 用户角色权限
-//        List<String> authorities = new ArrayList<>(authentication.getAuthorities()).stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
-//        principal.setAuthorities(authorities);
-//        AuthVo authVo = new AuthVo();
-//        authVo.setAuthorities(authorities);
-//        authVo.setToken(jwtTokenHelper.createToken(principal));
-//        authVo.setPrincipal(principal);
-//        user.setLastLoginTime(new Date());
-//        userService.updateById(user);
-        JSONResponseUtils.build(response, Response.success(ResultEnum.SUCCESS.getCode(), ResultEnum.SUCCESS.getMsg(), null));
-    }
-}

src/main/java/com/ai/da/common/security/UserPermissionEvaluator.java

@@ -1,34 +0,0 @@
-package com.ai.da.common.security;
-
-import org.springframework.security.access.PermissionEvaluator;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-
-/**
- * @ClassName UserPermissionEvaluator
- * @Description 权限校验处理器
- * @Author dwjian
- * @Date 2020/7/12 10:16
- */
-@Component
-public class UserPermissionEvaluator implements PermissionEvaluator {
-
-    @Override
-    public boolean hasPermission(Authentication authentication, Object targetUrl, Object permission) {
-        System.out.println(authentication);
-        System.out.println(targetUrl);
-        System.out.println(permission);
-        return false;
-    }
-
-    @Override
-    public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permission) {
-        System.out.println(authentication);
-        System.out.println(targetId);
-        System.out.println(targetType);
-        System.out.println(permission);
-        return false;
-    }
-}

src/main/java/com/ai/da/common/security/config/SecurityConfig.java

@@ -1,84 +0,0 @@
-package com.ai.da.common.security.config;
-
-import com.ai.da.common.security.*;
-import com.ai.da.common.security.filter.AuthenticationFilter;
-import com.ai.da.common.security.filter.UserAuthenticationProcessingFilter;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
-
-import javax.annotation.Resource;
-
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-@EnableConfigurationProperties(SecurityProperties.class)
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Resource
-    private SecurityProperties securityProperties;
-    @Resource
-    private UserLoginSuccessHandler userLoginSuccessHandler;
-    @Resource
-    private UserLoginFailureHandler userLoginFailureHandler;
-    @Resource
-    private UserAuthAccessDeniedHandler userAuthAccessDeniedHandler;
-    @Resource
-    private UserAuthenticationEntryPointHandler userAuthenticationEntryPointHandler;
-    @Resource
-    private UserAuthenticationManager userAuthenticationManager;
-    @Resource
-    private UserAuthenticationProcessingFilter userAuthenticationProcessingFilter;
-
-    /**
-     * 不通过注入spring管理 让Security来管理 这样自定义的Filter就不会走,.permitAll()才能起作用
-     */
-    @Resource
-    private AuthenticationFilter authenticationFilter;
-    @Resource
-    private UserPermissionEvaluator userPermissionEvaluator;
-
-
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return this.userAuthenticationManager;
-    }
-
-    @Override
-    protected void configure(HttpSecurity httpSecurity/*, WebSecurity web*/) throws Exception {
-//        web.ignoring().antMatchers("/test/**");//禁止所有过滤器
-        httpSecurity.cors().disable()//禁用 CSRF
-                .authorizeRequests()//认证请求
-                .antMatchers(securityProperties.getIgnorePaths()).permitAll()//忽略的请求
-                .anyRequest().authenticated()//其余所有的请求都需要认证
-                .and().headers().frameOptions().disable()// 防止iframe 造成跨域
-                .and().exceptionHandling().authenticationEntryPoint(userAuthenticationEntryPointHandler)//未登录请求处理
-                .accessDeniedHandler(userAuthAccessDeniedHandler)//无权限访问处理类 (此配置可以忽略，全局异常会先于Security框架处理异常，全局异常已特殊处理)
-                .and().formLogin().loginProcessingUrl(securityProperties.getAuthApi())//指定认证接口
-                .successHandler(userLoginSuccessHandler)//登录成功处理器
-                .failureHandler(userLoginFailureHandler)//登录失败处理器
-                .and().cors().and().csrf().disable();//允许跨域
-        //自定义过滤器在登录时认证用户名、密码
-        httpSecurity.addFilterAt(userAuthenticationProcessingFilter, UsernamePasswordAuthenticationFilter.class)
-                .addFilterBefore(authenticationFilter, BasicAuthenticationFilter.class);
-        //不创建session会话
-        httpSecurity.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
-        //取消头缓存控制
-        httpSecurity.headers().cacheControl();
-    }
-
-    @Bean
-    public DefaultWebSecurityExpressionHandler userSecurityExpressionHandler() {
-        DefaultWebSecurityExpressionHandler handler = new DefaultWebSecurityExpressionHandler();
-        handler.setPermissionEvaluator(userPermissionEvaluator);
-        return handler;
-    }
-}

src/main/java/com/ai/da/common/security/config/SecurityProperties.java

@@ -1,26 +0,0 @@
-package com.ai.da.common.security.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * @author: dangweijian
- * @description: JWT配置类
- * @create: 2020-07-09 09:38
- **/
-@Data
-@ConfigurationProperties(prefix = "spring.security")
-public class SecurityProperties {
-
-    private String jwtSecret;
-
-    private String jwtTokenHeader;
-
-    private String jwtTokenPrefix;
-
-    private long jwtExpiration;
-
-    private String[] ignorePaths;
-
-    private String authApi;
-}

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

@@ -1,148 +0,0 @@
-package com.ai.da.common.security.filter;
-
-import cn.hutool.core.util.StrUtil;
-import com.ai.da.common.config.exception.TokenMissingOrExpiredException;
-import com.ai.da.common.context.UserContext;
-import com.ai.da.common.security.config.SecurityProperties;
-import com.ai.da.common.security.jwt.JWTTokenHelper;
-import com.ai.da.common.utils.LocalCacheUtils;
-import com.ai.da.common.utils.MultiReadHttpServletRequest;
-import com.ai.da.common.utils.MultiReadHttpServletResponse;
-import com.ai.da.common.utils.RequestInfoUtil;
-import com.ai.da.model.vo.AuthPrincipalVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.lang.NonNull;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.StopWatch;
-import org.springframework.util.StringUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.annotation.Resource;
-import javax.security.sasl.AuthenticationException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author: dangweijian
- * @description: 认证拦截器
- * @create: 2020-07-10 16:50
- **/
-@Slf4j
-@Configuration
-public class AuthenticationFilter extends OncePerRequestFilter {
-
-    @Resource
-    private JWTTokenHelper jwtTokenHelper;
-    @Resource
-    private SecurityProperties properties;
-
-    private static final List<String> FILTER_URL =
-            Arrays.asList("/favicon.ico", "/doc.html", "/api/account/login", "/api/account/preLogin", "api/account/sendEmail","api/account/noLoginRequired",
-                    "/webjars/", "/swagger-resources", "/v2/api-docs", "/api/account/resetPwd",
-                    "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId",
-                    "/api/third/party/addUser","/api/third/party/addTrialUser", "/api/third/party/editUser", "/api/element/initDefaultSysFile",
-                    "/api/third/party/addNoLoginRequiredNew","/api/third/party/deleteNoLoginRequiredNew","/api/third/party/updateNoLoginRequiredNew",
-                    "/api/third/party/existNoLoginRequired","/api/third/party/getRedirectUrl",
-                    "/api/python/flush","/api/account/healthy","/api/ali-pay/trade/notify","/api/paypal/ipn/back","/api/alipay-hk/trade/notify",
-                    "/api/portfolio/page", "/api/portfolio/detail", "/api/portfolio/commentPage", "/api/portfolio/viewsIncrease",
-                    "/api/account/designWorksRegister","/api/account/questionnaire","/api/stripe/trade/notify",
-                    "/notification","/api/account/activateNewEmail","/api/third/party/auth/google_callback","/api/third/party/parseGoogleCredential","/api/third/party/receiveDesignResults","/api/third/party/parseWeChatCode","/api/third/party/receiveDesignParams"
-                    , "/api/account/schoolLogin", "/api/account/enterpriseLogin", "/api/account/organizationNameSearch",
-                    "/api/llm/stream"
-            );
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {
-        String requestURI = httpServletRequest.getRequestURI();
-
-        if (calculateUrl(requestURI)/* || hasAuthorizationToken(httpServletRequest)*/) {
-            StopWatch stopWatch = new StopWatch();
-            HttpServletRequest wrappedRequest = httpServletRequest;
-            HttpServletResponse wrappedResponse = httpServletResponse;
-            try {
-                stopWatch.start();
-                if ((httpServletRequest.getContentType() == null && httpServletRequest.getContentLength() > 0) || (httpServletRequest.getContentType() != null && !httpServletRequest.getContentType().contains("application/json"))) {
-                    extracted(wrappedRequest);
-                    filterChain.doFilter(wrappedRequest, wrappedResponse);
-                } else {
-                    wrappedRequest = new MultiReadHttpServletRequest(httpServletRequest);
-                    wrappedResponse = new MultiReadHttpServletResponse(httpServletResponse);
-                    extracted(wrappedRequest);
-                    // excel导出使用原始response,不对响应做包装
-                    if (requestURI.equals("/api/account/exportAccountsToExcel")) {
-                        filterChain.doFilter(httpServletRequest, httpServletResponse); // 不包装
-                    } else {
-                        filterChain.doFilter(wrappedRequest, wrappedResponse);
-                    }
-                }
-            } catch (Exception e) {
-                SecurityContextHolder.clearContext();
-                throw e;
-            } finally {
-                stopWatch.stop();
-            }
-        } else {
-            //先清空当前线程变量,防止上一个线程遗留
-            UserContext.delete();
-            filterChain.doFilter(httpServletRequest, httpServletResponse);
-        }
-    }
-
-    private Boolean calculateUrl(String requestURI) {
-        String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
-        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);
-
-        if (StrUtil.isBlank(jwtToken)) {
-            String ipAddress = RequestInfoUtil.getIpAddress(request);
-            log.info("本次请求的ip为 ： " + ipAddress);
-//            throw new RuntimeException("请传入token！");
-            throw new TokenMissingOrExpiredException("请传入token！");
-        }
-        if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){
-            //写死 暂时放行
-            return;
-        }
-        // 检查token
-        boolean validate = jwtTokenHelper.validateToken(jwtToken);
-        if (validate) {
-            AuthPrincipalVo principal = jwtTokenHelper.parserToUser(jwtToken);
-            if (principal == null) {
-//                throw new RuntimeException("TOKEN已过期，请重新登录！");
-                throw new TokenMissingOrExpiredException("TOKEN已过期，请重新登录！(token without userInfo)");
-            }
-            //先清空当前线程变量,防止上一个线程遗留
-            UserContext.delete();
-            //存取用户信息到缓存
-            UserContext.setUserHolder(principal);
-            //校验token
-            String cacheToken = LocalCacheUtils.getTokenCache(String.valueOf(principal.getId()));
-
-            if(StringUtils.isEmpty(cacheToken)){
-//                throw new RuntimeException("TOKEN已过期，请重新登录！");
-                throw new TokenMissingOrExpiredException("TOKEN已过期，请重新登录！(local cache empty)");
-            }
-            if(!cacheToken.equals(jwtToken) ){
-//                throw new RuntimeException("TOKEN已过期，请重新登录！");
-                throw new TokenMissingOrExpiredException("TOKEN已过期，请重新登录！(token not match local cache)");
-            }
-//                UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(null, null);
-//                SecurityContextHolder.getContext().setAuthentication(authentication);
-        }
-    }
-}

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

@@ -1,69 +0,0 @@
-package com.ai.da.common.security.filter;
-
-import cn.hutool.core.util.StrUtil;
-import com.ai.da.common.security.UserLoginSuccessHandler;
-import com.ai.da.common.security.config.SecurityProperties;
-import com.ai.da.common.utils.RedisCacheUtils;
-import com.alibaba.fastjson.JSONObject;
-import com.ai.da.common.security.UserAuthenticationManager;
-import com.ai.da.common.security.UserLoginFailureHandler;
-import com.ai.da.common.utils.MultiReadHttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationServiceException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author: dangweijian
- * @description: 用户认证过滤器
- * @create: 2020-07-10 15:58
- **/
-@Slf4j
-@Component
-public class UserAuthenticationProcessingFilter extends AbstractAuthenticationProcessingFilter {
-
-    /**
-     * @param securityProperties                配置（从配置中读取登录url）
-     * @param authenticationManager             认证管理器
-     * @param adminAuthenticationSuccessHandler 认证成功处理器
-     * @param adminAuthenticationFailureHandler 认证失败处理器
-     */
-    public UserAuthenticationProcessingFilter(SecurityProperties securityProperties, UserAuthenticationManager authenticationManager, UserLoginSuccessHandler adminAuthenticationSuccessHandler, UserLoginFailureHandler adminAuthenticationFailureHandler) {
-        super(new AntPathRequestMatcher(securityProperties.getAuthApi(), HttpMethod.POST.name()));
-        this.setAuthenticationManager(authenticationManager);
-        this.setAuthenticationSuccessHandler(adminAuthenticationSuccessHandler);
-        this.setAuthenticationFailureHandler(adminAuthenticationFailureHandler);
-    }
-
-    @Override
-    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-        if (request.getContentType() == null || !request.getContentType().contains("application/json")) {
-            throw new AuthenticationServiceException("请求头类型不支持: " + request.getContentType());
-        }
-        UsernamePasswordAuthenticationToken authRequest;
-        try {
-            MultiReadHttpServletRequest wrappedRequest = new MultiReadHttpServletRequest(request);
-            // 将前端传递的数据转换成jsonBean数据格式
-            JSONObject jsonObject = JSONObject.parseObject(wrappedRequest.getBodyJsonStrByJson(wrappedRequest));
-            String code = jsonObject.getString("code");
-            String uuid = jsonObject.getString("uuid");
-            if (StrUtil.isEmpty(code) || StrUtil.isEmpty(uuid) || !code.equals(RedisCacheUtils.get("code-key-" + uuid, String.class))) {
-                throw new AuthenticationServiceException("验证码错误");
-            }
-            RedisCacheUtils.delete("code-key-" + uuid);
-            authRequest = new UsernamePasswordAuthenticationToken(jsonObject.get("username"), jsonObject.get("password"), null);
-            authRequest.setDetails(authenticationDetailsSource.buildDetails(wrappedRequest));
-        } catch (Exception e) {
-            throw new AuthenticationServiceException(e.getMessage());
-        }
-        return this.getAuthenticationManager().authenticate(authRequest);
-    }
-}

src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java

@@ -1,87 +0,0 @@
-package com.ai.da.common.security.jwt;
-
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import com.ai.da.common.constant.CommonConstant;
-import com.ai.da.common.security.config.SecurityProperties;
-import com.ai.da.model.vo.AuthPrincipalVo;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-
-/**
- * @author: dangweijian
- * @description: JWT工具
- * @create: 2020-07-09 09:27
- **/
-@Slf4j
-@Component
-public class JWTTokenHelper {
-
-    @Resource
-    private SecurityProperties securityProperties;
-
-    private static final String ISSUER = "DWJ";
-    private static final String AUTHORITIES = "authorities";
-    private static final String CHANGE_MAILBOX = "changeMailbox";
-
-    public String createToken(AuthPrincipalVo principal) {
-        String token = Jwts.builder()
-                .setId(String.valueOf(principal.getId()))
-                .setSubject(JSONObject.toJSONString(principal))
-                .setIssuedAt(new Date())
-                .setIssuer(ISSUER)
-                .claim(AUTHORITIES, JSON.toJSONString(new ArrayList<>()))//自定义属性  权限
-                .setExpiration(new Date(System.currentTimeMillis() + securityProperties.getJwtExpiration()))
-                .signWith(SignatureAlgorithm.HS512, securityProperties.getJwtSecret())
-                .compact();
-        token = securityProperties.getJwtTokenPrefix() + token;
-        return token;
-    }
-
-    public boolean validateToken(String token) {
-        Claims claims = parser(token);
-        if (MapUtil.isEmpty(claims)) {
-            return false;
-        }
-        return true;
-    }
-
-    public AuthPrincipalVo parserToUser(String token) {
-        String subject = parser(token).getSubject();
-        if (StrUtil.isNotEmpty(subject)) {
-            return JSONObject.parseObject(subject, AuthPrincipalVo.class);
-        }
-        return null;
-    }
-
-    public Claims parser(String token) {
-        token = token.replaceAll(securityProperties.getJwtTokenPrefix(), "");
-        return Jwts.parser().setSigningKey(securityProperties.getJwtSecret()).parseClaimsJws(token).getBody();
-    }
-
-    public String createToken(Long userId, String userEmail){
-        String token = Jwts.builder()
-                .setId(String.valueOf(userId))
-                .setSubject(userEmail + "_" + userId)
-                .setIssuedAt(new Date())
-                .setIssuer(ISSUER)
-                .claim(CHANGE_MAILBOX, JSON.toJSONString(new ArrayList<>()))//自定义属性  权限
-                .setExpiration(new Date(System.currentTimeMillis() + CommonConstant.CHANGE_MAILBOX_LINK_VALIDITY))
-                .signWith(SignatureAlgorithm.HS256, securityProperties.getJwtSecret())
-                .compact();
-        return token;
-    }
-
-    public String parseToEmailAndId(String token) {
-        return parser(token).getSubject();
-    }
-}

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

@@ -3,11 +3,12 @@ package com.ai.da.common.task;
 import com.ai.da.common.utils.RedisUtil;
 import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.service.AccountService;
+import com.ai.da.service.SubscriptionPlanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 @Component
@@ -18,6 +19,8 @@ public class AccountTask {
     private AccountService accountService;
     @Resource
     private RedisUtil redisUtil;
+    @Resource
+    private SubscriptionPlanService subscriptionPlanService;
 
     /**
      * 每周日晚上刷新 年付用户、月付用户的积分
@@ -25,20 +28,20 @@ public class AccountTask {
      * 每个月月初只刷新教育子账号的积分
      */
 //    @Scheduled(cron = "0 25 14 * * ?")
-    @Scheduled(cron = "0 0 0 1 * ?")
+//    @Scheduled(cron = "0 0 0 1 * ?")
     public void refreshCreditsMonthly() {
         log.info("每月1号0点 重置教育版子账号为默认积分");
         accountService.refreshCreditsMonthly();
     }
 
-//    @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 * * ?")
+    // 每天凌晨0点执行一次  目前已没有角色类型为4的用户
+    /*@Scheduled(cron = "0 0 0 * * ?")
     public void cancelActivityBenefits() {
         // 1、查询当前所有参与了活动且过期的用户
         List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
@@ -48,10 +51,10 @@ public class AccountTask {
             log.info("参与活动的用户{} : {} 于 {} 账号有效期到期，置为游客", account.getId(), account.getUserEmail(), account.getValidEndTime());
             accountService.toVisitor(account);
         }
-    }
+    }*/
 
     // 每天检测正式用户到期情况，每天凌晨0点执行
-    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")
     public void paidUserToVisitor() {
         // 1、查询当前已过期正式用户或试用用户
         List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
@@ -74,7 +77,7 @@ public class AccountTask {
         accountService.registerUserToVisitor();
     }
 
-    @Scheduled(cron = "0 0 0 1 * ?")
+//    @Scheduled(cron = "0 0 0 1 * ?")
     // 每月初刷新所有用户用户名剩余修改次数
     public void resetUsernameModifyTimes(){
         log.info("重置所有用户的用户名修改次数");
@@ -82,8 +85,18 @@ public class AccountTask {
     }
 
     //    @Scheduled(cron = "0 35 14 * * ?")
-    @Scheduled(cron = "0 5 0 * * ?")
+//    @Scheduled(cron = "0 5 0 * * ?")
     public void checkEduAdminExpireStatus() {
         accountService.checkEduAdminExpireStatus();
     }
+
+//    @Scheduled(cron = "0 5 0 * * ?")
+    public void activeSubscriptionPlan() {
+        subscriptionPlanService.activeSubscriptionPlan(null);
+    }
+
+//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    public void expireSubscription() {
+        subscriptionPlanService.expireSubscription();
+    }
 }

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

@@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -39,7 +38,7 @@ public class GenerateTask {
      * 故这里通过定时任务做补偿
      * flux五分钟查询一次，万相1小时查询一次
      */
-    @Scheduled(cron = "0 */4 * * * ?")
+//    @Scheduled(cron = "0 */4 * * * ?")
     public void fluxCompensationMechanism(){
         // 1、查所有 任务还没成功、还没失败，正在等待或者执行中的任务id有哪些
         // （由于获取结果的polling_url在redis中只存一天，大部分结果超过一天之后就无法再找到任务，小部分可以通过公共路径查到结果）
@@ -99,7 +98,7 @@ public class GenerateTask {
     }
 
     // 万相 -> pose transformation 补偿 当前任务执行完后，5分钟再执行一次（不会出现任务重叠的情况）
-    @Scheduled(fixedDelay = 5 * 60 * 1000)
+//    @Scheduled(fixedDelay = 5 * 60 * 1000)
     public void wxCompensationMechanism(){
         List<APIGenerate> apiGenerates = apiGenerateService.getPendingTaskByStatus("wx");
         if (apiGenerates != null && !apiGenerates.isEmpty()){

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

@@ -17,8 +17,8 @@
 //import org.springframework.stereotype.Component;
 //import org.springframework.util.CollectionUtils;
 //
-//import javax.annotation.PostConstruct;
-//import javax.annotation.Resource;
+//import jakarta.annotation.PostConstruct;
+//import jakarta.annotation.Resource;
 //import java.io.FileOutputStream;
 //import java.io.IOException;
 //import java.nio.file.Files;

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

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -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 被执行......");
@@ -97,19 +97,19 @@ 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(fixedRate = 60000)
+//    @Scheduled(fixedRate = 60000)
     public void syncLinkViewCountToDB(){
         affiliateService.syncLinkViewCountToDB();
     }
 
-//    @Scheduled(cron = "0 0 8 28-31 * ?")
+    //    @Scheduled(cron = "0 0 8 28-31 * ?")
     public void commissionSummaryReminder(){
         // 每个月末的最后一天的早上八点执行
         LocalDate today = LocalDate.now();
@@ -120,9 +120,9 @@ public class PaymentTask {
         }
     }
 
-    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void calcCouponsCommission(){
-        log.info("优惠券佣金计算定时器");
+//        log.info("优惠券佣金计算定时器");
         affiliateService.calcCouponsCommission();
     }
 

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

@@ -10,8 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.netty.util.internal.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 @Slf4j
+@Component
 @RequiredArgsConstructor
 public class SubscriptionReminderTask {
 
@@ -32,10 +36,11 @@ public class SubscriptionReminderTask {
     private static final Map<String, Integer> REMINDER_DAYS_CONFIG = new HashMap<>();
 
     static {
-        REMINDER_DAYS_CONFIG.put("monthly", 7);
-        REMINDER_DAYS_CONFIG.put("yearly", 14);
+        REMINDER_DAYS_CONFIG.put("month", 7);
+        REMINDER_DAYS_CONFIG.put("year", 14);
     }
 
+    //    @Scheduled(cron = "0 0 9 * * ?")
     public void subscriptionReminder() {
         // 获取所有需要通知的订阅
         List<SubscriptionInfo> subscriptionInfos = getDueSubscriptions();
@@ -52,7 +57,7 @@ public class SubscriptionReminderTask {
                 continue;
             }
 
-            boolean success = stripeService.sendEmail(subscriptionInfo.getSubscriptionId(), "reminder_subscriber", null);
+            boolean success = stripeService.sendEmail(subscriptionInfo.getSubscriptionId(), emailType, subscriptionInfo.getOrderNo());
             if (success) {
                 log.info("提前{}天向用户 {} 发送续订通知邮件，订阅类型: {}",
                         daysBefore, subscriptionInfo.getAccountId(), subscriptionInfo.getType());
@@ -78,26 +83,30 @@ public class SubscriptionReminderTask {
         LocalDateTime startOfDay = targetDate.toLocalDate().atStartOfDay();
         LocalDateTime endOfDay = targetDate.toLocalDate().atTime(23, 59, 59);
 
-        long startTimestamp = startOfDay.toEpochSecond(ZoneOffset.UTC);
-        long endTimestamp = endOfDay.toEpochSecond(ZoneOffset.UTC);
+        // 使用系统默认时区
+        ZoneId zoneId = ZoneId.systemDefault();
+        long startTimestamp = startOfDay.atZone(zoneId).toEpochSecond();
+        long endTimestamp = endOfDay.atZone(zoneId).toEpochSecond();
 
         QueryWrapper<SubscriptionInfo> qw = new QueryWrapper<>();
-        qw.ge("current_period_end", startTimestamp);
-        qw.lt("current_period_end", endTimestamp);
+        qw.lambda().ge(SubscriptionInfo::getCurrentPeriodEnd, startTimestamp);
+        qw.lambda().lt(SubscriptionInfo::getCurrentPeriodEnd, endTimestamp);
 //        qw.eq("status", "active");
-        qw.eq("subscription_type", subscriptionType);
+        qw.lambda().eq(SubscriptionInfo::getType, subscriptionType);
 
         return subscriptionInfoMapper.selectList(qw);
     }
 
+    //    @Scheduled(cron = "0 0 9 * * ?")
     public void trialReminder() {
         // 今天的 00:00:00 和 23:59:59
         LocalDateTime startOfDay = LocalDateTime.now().toLocalDate().atStartOfDay();
         LocalDateTime endOfDay = LocalDateTime.now().toLocalDate().atTime(23, 59, 59);
 
-        // 转为时间戳
-        long startTimestamp = startOfDay.toEpochSecond(ZoneOffset.UTC);
-        long endTimestamp = endOfDay.toEpochSecond(ZoneOffset.UTC);
+        // 使用系统默认时区
+        ZoneId zoneId = ZoneId.systemDefault();
+        long startTimestamp = startOfDay.atZone(zoneId).toEpochSecond() * 1000;
+        long endTimestamp = endOfDay.atZone(zoneId).toEpochSecond() * 1000;
 
         QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().gt(Account::getValidEndTime, startTimestamp)

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

@@ -1,313 +1,325 @@
-package com.ai.da.common.utils;
-
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import com.ai.da.common.config.exception.BusinessException;
-import com.ai.da.model.vo.FileVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.net.URL;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-public class FileUtil extends cn.hutool.core.io.FileUtil {
-
-    private static final Logger log = LoggerFactory.getLogger(com.ai.da.common.utils.FileUtil.class);
-
-    /**
-     * 系统临时目录
-     * <br>
-     * windows 包含路径分割符，但Linux 不包含,
-     * 在windows \\==\ 前提下，
-     * 为安全起见 同意拼装 路径分割符，
-     * <pre>
-     *       java.io.tmpdir
-     *       windows : C:\Users/xxx\AppData\Local\Temp\
-     *       linux: /temp
-     * </pre>
-     */
-    public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir") + File.separator;
-    /**
-     * 定义GB的计算常量
-     */
-    private static final int GB = 1024 * 1024 * 1024;
-    /**
-     * 定义MB的计算常量
-     */
-    private static final int MB = 1024 * 1024;
-    /**
-     * 定义KB的计算常量
-     */
-    private static final int KB = 1024;
-
-    /**
-     * 格式化小数
-     */
-    private static final DecimalFormat DF = new DecimalFormat("0.00");
-
-    public static final String IMAGE = "图片";
-    public static final String TXT = "文档";
-    public static final String MUSIC = "音乐";
-    public static final String VIDEO = "视频";
-    public static final String OTHER = "其他";
-
-
-    /**
-     * MultipartFile转File
-     */
-    public static File toFile(MultipartFile multipartFile) {
-        // 获取文件名
-        String fileName = multipartFile.getOriginalFilename();
-        // 获取文件后缀
-        String prefix = "." + getExtensionName(fileName);
-        File file = null;
-        try {
-            // 用uuid作为文件名，防止生成的临时文件重复
-            file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
-            // MultipartFile to File
-            multipartFile.transferTo(file);
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        return file;
-    }
-
-//    public static void main(String[] args) {
-//        File file = new File(
-//                "http://18.162.111.141:5568/download/202211/userFile/collection/Printboard/1/a3c9838c-2171-44d7-af54-c94ee6affcd9print_2.jpg.png");
-//        FileUtil.getFileSize()
-//    }
-
-    /**
-     * 获取文件扩展名，不带 .
-     */
-    public static String getExtensionName(String filename) {
-        if ((filename != null) && (filename.length() > 0)) {
-            int dot = filename.lastIndexOf('.');
-            if ((dot > -1) && (dot < (filename.length() - 1))) {
-                return filename.substring(dot + 1);
-            }
-        }
-        return filename;
-    }
-
-
-    /**
-     * inputStream 转 File
-     */
-    static File inputStreamToFile(InputStream ins, String name) {
-        File file = new File(SYS_TEM_DIR + name);
-        if (file.exists()) {
-            return file;
-        }
-        OutputStream os = null;
-        try {
-            os = new FileOutputStream(file);
-            int bytesRead;
-            int len = 8192;
-            byte[] buffer = new byte[len];
-            while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
-                os.write(buffer, 0, bytesRead);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            CloseUtil.close(os);
-            CloseUtil.close(ins);
-        }
-        return file;
-    }
-
-    /**
-     * 获取文件尺寸
-     */
-    public static FileVO getFileSize(MultipartFile file) {
-        int width = 0;
-        int height = 0;
-        try {
-            // 图片对象
-            BufferedImage bufferedImage = ImageIO.read(file.getInputStream());
-            // 宽度
-            width = bufferedImage.getWidth();
-            // 高度
-            height = bufferedImage.getHeight();
-        } catch (IOException ioException) {
-            log.error("获取文件尺寸异常###{}", ExceptionUtil.stacktraceToString(ioException));
-        }
-        return new FileVO(height, width);
-    }
-
-    /**
-     * 获取文件尺寸
-     */
-    public static FileVO getFileSize(InputStream inputStream) {
-        int width = 0;
-        int height = 0;
-        try {
-            // 图片对象
-            BufferedImage bufferedImage = ImageIO.read(inputStream);
-            // 宽度
-            width = bufferedImage.getWidth();
-            // 高度
-            height = bufferedImage.getHeight();
-        } catch (IOException ioException) {
-            log.error("获取文件尺寸异常###{}", ExceptionUtil.stacktraceToString(ioException));
-        }
-        return new FileVO(height, width);
-    }
-
-    /**
-     * 获取远程文件流
-     */
-    public static InputStream getOriginFile(String path) {
-
-        try {
-            //远程
-            URL url = new URL(path);
-            return url.openStream();
-        } catch (IOException ioException) {
-            log.error("获取源文件异常###{}###path##{}", ExceptionUtil.stacktraceToString(ioException), path);
-            throw new BusinessException("get.file.failed");
-        }
-    }
-
-    /**
-     * 将文件名解析成文件的上传路径
-     */
-    public static File upload(MultipartFile file, String filePath) {
-        Date date = new Date();
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS");
-        String suffix = getExtensionName(file.getOriginalFilename());
-        String nowStr = format.format(date) + "-";
-        try {
-            String fileName = file.getOriginalFilename();
-            String fileSuffix = fileName.substring(fileName.lastIndexOf("."));
-            String path = filePath + fileSuffix;
-            // getCanonicalFile 可解析正确各种路径
-            File dest = new File(path).getCanonicalFile();
-            // 检测是否存在目录
-            if (!dest.getParentFile().exists()) {
-                if (!dest.getParentFile().mkdirs()) {
-                    System.out.println("was not successful.");
-                }
-            }
-            // 文件写入
-            file.transferTo(dest);
-            return dest;
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    /**
-     * 将文件名解析成文件的上传路径
-     */
-    public static File upload2(MultipartFile file, String filePath) {
-        Date date = new Date();
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS");
-        String suffix = getExtensionName(file.getOriginalFilename());
-        String nowStr = format.format(date) + "-";
-        try {
-            String fileName = file.getOriginalFilename();
-            String path = filePath + fileName;
-            // getCanonicalFile 可解析正确各种路径
-            File dest = new File(path).getCanonicalFile();
-            // 检测是否存在目录
-            if (!dest.getParentFile().exists()) {
-                if (!dest.getParentFile().mkdirs()) {
-                    System.out.println("was not successful.");
-                }
-            }
-            // 文件写入
-            file.transferTo(dest);
-            return dest;
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    /**
-     * 删除文件
-     */
-    public static boolean delete(String path) {
-        File file = new File(path);
-        if (file.exists()) {
-            return file.delete();
-        }
-        return false;
-    }
-
-    /**
-     * 获取指定文件夹下所有文件，不含文件夹里的文件
-     *
-     * @param dirFilePath 文件夹路径
-     * @return
-     */
-    public static List<File> getAllFile(String dirFilePath) {
-        if (StrUtil.isBlank(dirFilePath)) {
-            return null;
-        }
-        return getAllFile(new File(dirFilePath));
-    }
-
-    /**
-     * 获取指定文件夹下所有文件，不含文件夹里的文件
-     *
-     * @param dirFile 文件夹
-     * @return
-     */
-    public static List<File> getAllFile(File dirFile) {
-        // 如果文件夹不存在或着不是文件夹，则返回 null
-        if (Objects.isNull(dirFile) || !dirFile.exists() || dirFile.isFile()) {
-            return null;
-        }
-        File[] childrenFiles = dirFile.listFiles();
-        if (Objects.isNull(childrenFiles) || childrenFiles.length == 0) {
-            return null;
-        }
-        List<File> files = new ArrayList<>();
-        for (File childFile : childrenFiles) {
-            // 如果是文件，直接添加到结果集合
-            if (childFile.isFile()) {
-                files.add(childFile);
-            }
-            //以下几行代码取消注释后可以将所有子文件夹里的文件也获取到列表里
-            else {
-                // 如果是文件夹，则将其内部文件添加进结果集合
-                List<File> cFiles = getAllFile(childFile);
-                if (Objects.isNull(cFiles) || cFiles.isEmpty()) {
-                    continue;
-                }
-                files.addAll(cFiles);
-            }
-        }
-        return files;
-    }
-
-    // 判断文件是否存在
-    public static boolean isFileExists(String filePath) {
-        File file = new File(filePath);
-        return file.exists() && file.isFile();
-    }
-
-    // 根据路径获取文件
-    public static File getFile(String filePath) {
-        File file = new File(filePath);
-        if (file.exists() && file.isFile()) {
-            return file;
-        } else {
-            return null;
-        }
-    }
-
-}
+package com.ai.da.common.utils;
+
+import cn.hutool.core.exceptions.ExceptionUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.model.vo.FileVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URL;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class FileUtil extends cn.hutool.core.io.FileUtil {
+
+    private static final Logger log = LoggerFactory.getLogger(com.ai.da.common.utils.FileUtil.class);
+
+    /**
+     * 系统临时目录
+     * <br>
+     * windows 包含路径分割符，但Linux 不包含,
+     * 在windows \\==\ 前提下，
+     * 为安全起见 同意拼装 路径分割符，
+     * <pre>
+     *       java.io.tmpdir
+     *       windows : C:\Users/xxx\AppData\Local\Temp\
+     *       linux: /temp
+     * </pre>
+     */
+    public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir") + File.separator;
+    /**
+     * 定义GB的计算常量
+     */
+    private static final int GB = 1024 * 1024 * 1024;
+    /**
+     * 定义MB的计算常量
+     */
+    private static final int MB = 1024 * 1024;
+    /**
+     * 定义KB的计算常量
+     */
+    private static final int KB = 1024;
+
+    /**
+     * 格式化小数
+     */
+    private static final DecimalFormat DF = new DecimalFormat("0.00");
+
+    public static final String IMAGE = "图片";
+    public static final String TXT = "文档";
+    public static final String MUSIC = "音乐";
+    public static final String VIDEO = "视频";
+    public static final String OTHER = "其他";
+
+
+    /**
+     * MultipartFile转File
+     */
+    public static File toFile(MultipartFile multipartFile) {
+        // 获取文件名
+        String fileName = multipartFile.getOriginalFilename();
+        // 获取文件后缀
+        String prefix = "." + getExtensionName(fileName);
+        File file = null;
+        try {
+            // 用uuid作为文件名，防止生成的临时文件重复
+            file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
+            // MultipartFile to File
+            multipartFile.transferTo(file);
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+        }
+        return file;
+    }
+
+//    public static void main(String[] args) {
+//        File file = new File(
+//                "http://18.162.111.141:5568/download/202211/userFile/collection/Printboard/1/a3c9838c-2171-44d7-af54-c94ee6affcd9print_2.jpg.png");
+//        FileUtil.getFileSize()
+//    }
+
+    /**
+     * 获取文件扩展名，不带 .
+     */
+    public static String getExtensionName(String filename) {
+        if ((filename != null) && (filename.length() > 0)) {
+            int dot = filename.lastIndexOf('.');
+            if ((dot > -1) && (dot < (filename.length() - 1))) {
+                return filename.substring(dot + 1);
+            }
+        }
+        return filename;
+    }
+
+
+    /**
+     * inputStream 转 File
+     */
+    static File inputStreamToFile(InputStream ins, String name) {
+        File file = new File(SYS_TEM_DIR + name);
+        if (file.exists()) {
+            return file;
+        }
+        OutputStream os = null;
+        try {
+            os = new FileOutputStream(file);
+            int bytesRead;
+            int len = 8192;
+            byte[] buffer = new byte[len];
+            while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            CloseUtil.close(os);
+            CloseUtil.close(ins);
+        }
+        return file;
+    }
+
+    /**
+     * 获取文件尺寸
+     */
+    public static FileVO getFileSize(MultipartFile file) {
+        int width = 0;
+        int height = 0;
+        try {
+            // 图片对象
+            BufferedImage bufferedImage = ImageIO.read(file.getInputStream());
+            // 宽度
+            width = bufferedImage.getWidth();
+            // 高度
+            height = bufferedImage.getHeight();
+        } catch (IOException ioException) {
+            log.error("获取文件尺寸异常###{}", ExceptionUtil.stacktraceToString(ioException));
+        }
+        return new FileVO(height, width);
+    }
+
+    /**
+     * 获取文件尺寸
+     */
+    public static FileVO getFileSize(InputStream inputStream) {
+        int width = 0;
+        int height = 0;
+        try {
+            // 图片对象
+            BufferedImage bufferedImage = ImageIO.read(inputStream);
+            // 宽度
+            width = bufferedImage.getWidth();
+            // 高度
+            height = bufferedImage.getHeight();
+        } catch (IOException ioException) {
+            log.error("获取文件尺寸异常###{}", ExceptionUtil.stacktraceToString(ioException));
+        }
+        return new FileVO(height, width);
+    }
+
+    /**
+     * 获取远程文件流
+     */
+    public static InputStream getOriginFile(String path) {
+
+        try {
+            //远程
+            URL url = new URL(path);
+            return url.openStream();
+        } catch (IOException ioException) {
+            log.error("获取源文件异常###{}###path##{}", ExceptionUtil.stacktraceToString(ioException), path);
+            throw new BusinessException("get.file.failed");
+        }
+    }
+
+    /**
+     * 将文件名解析成文件的上传路径
+     */
+    public static File upload(MultipartFile file, String filePath) {
+        Date date = new Date();
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS");
+        String suffix = getExtensionName(file.getOriginalFilename());
+        String nowStr = format.format(date) + "-";
+        try {
+            String fileName = file.getOriginalFilename();
+            String fileSuffix = fileName.substring(fileName.lastIndexOf("."));
+            String path = filePath + fileSuffix;
+            // getCanonicalFile 可解析正确各种路径
+            File dest = new File(path).getCanonicalFile();
+            // 检测是否存在目录
+            if (!dest.getParentFile().exists()) {
+                if (!dest.getParentFile().mkdirs()) {
+                    System.out.println("was not successful.");
+                }
+            }
+            // 文件写入
+            file.transferTo(dest);
+            return dest;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 将文件名解析成文件的上传路径
+     */
+    public static File upload2(MultipartFile file, String filePath) {
+        Date date = new Date();
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS");
+        String suffix = getExtensionName(file.getOriginalFilename());
+        String nowStr = format.format(date) + "-";
+        try {
+            String fileName = file.getOriginalFilename();
+            String path = filePath + fileName;
+            // getCanonicalFile 可解析正确各种路径
+            File dest = new File(path).getCanonicalFile();
+            // 检测是否存在目录
+            if (!dest.getParentFile().exists()) {
+                if (!dest.getParentFile().mkdirs()) {
+                    System.out.println("was not successful.");
+                }
+            }
+            // 文件写入
+            file.transferTo(dest);
+            return dest;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 删除文件
+     */
+    public static boolean delete(String path) {
+        File file = new File(path);
+        if (file.exists()) {
+            return file.delete();
+        }
+        return false;
+    }
+
+    /**
+     * 获取指定文件夹下所有文件，不含文件夹里的文件
+     *
+     * @param dirFilePath 文件夹路径
+     * @return
+     */
+    public static List<File> getAllFile(String dirFilePath) {
+        if (StrUtil.isBlank(dirFilePath)) {
+            return null;
+        }
+        return getAllFile(new File(dirFilePath));
+    }
+
+    /**
+     * 获取指定文件夹下所有文件，不含文件夹里的文件
+     *
+     * @param dirFile 文件夹
+     * @return
+     */
+    public static List<File> getAllFile(File dirFile) {
+        // 如果文件夹不存在或着不是文件夹，则返回 null
+        if (Objects.isNull(dirFile) || !dirFile.exists() || dirFile.isFile()) {
+            return null;
+        }
+        File[] childrenFiles = dirFile.listFiles();
+        if (Objects.isNull(childrenFiles) || childrenFiles.length == 0) {
+            return null;
+        }
+        List<File> files = new ArrayList<>();
+        for (File childFile : childrenFiles) {
+            // 如果是文件，直接添加到结果集合
+            if (childFile.isFile()) {
+                files.add(childFile);
+            }
+            //以下几行代码取消注释后可以将所有子文件夹里的文件也获取到列表里
+            else {
+                // 如果是文件夹，则将其内部文件添加进结果集合
+                List<File> cFiles = getAllFile(childFile);
+                if (Objects.isNull(cFiles) || cFiles.isEmpty()) {
+                    continue;
+                }
+                files.addAll(cFiles);
+            }
+        }
+        return files;
+    }
+
+    // 判断文件是否存在
+    public static boolean isFileExists(String filePath) {
+        File file = new File(filePath);
+        return file.exists() && file.isFile();
+    }
+
+    // 根据路径获取文件
+    public static File getFile(String filePath) {
+        File file = new File(filePath);
+        if (file.exists() && file.isFile()) {
+            return file;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 将 FileItem 转换为 MultipartFile
+     * 用于 Spring Boot 3.x 兼容性（CommonsMultipartFile 已移除）
+     */
+    public static MultipartFile fileItemToMultipartFile(org.apache.commons.fileupload.FileItem fileItem) {
+        String fieldName = fileItem.getFieldName();
+        String fileName = fileItem.getName();
+        String contentType = fileItem.getContentType();
+        byte[] content = fileItem.get();
+        return new MockMultipartFile(fieldName, fileName, contentType, content);
+    }
+
+}

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.ai.da.common.response.Response;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
 import java.io.PrintWriter;
 
 

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

@@ -1,178 +1,171 @@
-package com.ai.da.common.utils;
-
-import com.ai.da.common.constant.CommonConstant;
-import com.ai.da.model.dto.BasicEmailParamDTO;
-import com.alibaba.fastjson.JSONObject;
-import com.sun.mail.smtp.SMTPTransport;
-import io.netty.util.internal.StringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.InputStreamSource;
-import org.springframework.mail.MailException;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.stereotype.Component;
-import org.thymeleaf.TemplateEngine;
-import org.thymeleaf.context.Context;
-
-import javax.annotation.Resource;
-import javax.mail.MessagingException;
-import javax.mail.internet.*;
-import java.util.List;
-import java.util.Objects;
-
-@Slf4j
-@Component
-public class MailUtil {
-
-    @Resource
-    private JavaMailSender javaMailSender;
-
-    @Resource
-    private TemplateEngine templateEngine;
-
-    /**
-     * 发送邮件 - 默认发件人
-     *
-     * @param basicEmailParamDTO 发送邮件所需参数
-     * @param inputStreamSource  附件（如果有）
-     */
-    public int sendMail(BasicEmailParamDTO basicEmailParamDTO, String fileName, InputStreamSource inputStreamSource) throws MessagingException {
-        MimeMessage mimeMessage = createSimpleMail(basicEmailParamDTO, fileName, inputStreamSource);
-        // 提取配置
-        String host;
-        String username;
-        String password;
-        if (StringUtil.isNullOrEmpty(basicEmailParamDTO.getServiceAddress())) {
-            host = ((JavaMailSenderImpl) javaMailSender).getHost();
-        } else {
-            host = basicEmailParamDTO.getServiceAddress();
-        }
-        if (StringUtil.isNullOrEmpty(basicEmailParamDTO.getSenderUser())) {
-            username = ((JavaMailSenderImpl) javaMailSender).getUsername();
-        } else {
-            username = basicEmailParamDTO.getSenderUser();
-        }
-        if (StringUtil.isNullOrEmpty(basicEmailParamDTO.getServiceAddress())) {
-            password = ((JavaMailSenderImpl) javaMailSender).getPassword();
-        } else {
-            password = basicEmailParamDTO.getPassword();
-        }
-        return sendMail(mimeMessage, host, username, password);
-    }
-
-    private int sendMail(MimeMessage mimeMessage, String host, String username, String password) throws MessagingException {
-        SMTPTransport transport = null;
-        try {
-            // 获取 SMTPTransport
-            transport = (SMTPTransport) mimeMessage.getSession().getTransport("smtp");
-            // 连接到 SMTP 服务器
-            transport.connect(host, username, password);
-            // 发送邮件
-            transport.sendMessage(mimeMessage, mimeMessage.getAllRecipients());
-            // 获取 SMTP 服务器的响应
-            String lastServerResponse = transport.getLastServerResponse();
-            int lastReturnCode = transport.getLastReturnCode();
-
-            log.info("SMTP 状态码: {}, SMTP 服务器响应: {}", lastReturnCode, lastServerResponse);
-            return lastReturnCode;
-        } catch (MailException | MessagingException e) {
-            // 记录日志或执行其他补偿逻辑
-            log.info("邮件发送失败：{}", e.getMessage());
-        } finally {
-            // 关闭连接
-            assert transport != null;
-            transport.close();
-        }
-        return 0;
-    }
-
-    /**
-     * 创建一封邮件
-     *
-     * @param basicEmailParamDTO 创建邮件需要的参数
-     * @param inputStreamSource  附件（如果有）
-     * @return 一封邮件
-     */
-    private MimeMessage createSimpleMail(BasicEmailParamDTO basicEmailParamDTO, String fileName, InputStreamSource inputStreamSource) throws MessagingException {
-        // 创建邮件对象
-        MimeMessage message = javaMailSender.createMimeMessage();
-        // 使用 MimeMessageHelper 简化邮件内容和附件的设置
-        MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(message, true);
-        // 设置发件人
-        mimeMessageHelper.setFrom(new InternetAddress(basicEmailParamDTO.getSenderUserMail()));
-        // 设置收件人
-        mimeMessageHelper.setTo(basicEmailParamDTO.getMailTo());
-        // 设置抄送人
-        if (basicEmailParamDTO.getCc() != null && basicEmailParamDTO.getCc().length > 0) {
-            mimeMessageHelper.setCc(basicEmailParamDTO.getCc());
-        }
-        // 设置暗送人
-        if (basicEmailParamDTO.getBcc() != null && basicEmailParamDTO.getBcc().length > 0) {
-            mimeMessageHelper.setBcc(basicEmailParamDTO.getBcc());
-        }
-        // 设置邮件主题
-        mimeMessageHelper.setSubject(basicEmailParamDTO.getSubject());
-        // 设置邮件内容（HTML 格式）
-        mimeMessageHelper.setText(basicEmailParamDTO.getContent(), true);
-        // 设置附件
-        if (inputStreamSource != null) {
-            mimeMessageHelper.addAttachment(fileName, inputStreamSource);
-        }
-        return message;
-    }
-
-
-    /**
-     * 设置实体参数
-     *
-     * @param mailTo     接收邮件的邮箱地址
-     * @param jsonObject 模板中变量的值
-     * @return 返回一个MailEntity
-     * @throws AddressException 邮箱地址值异常
-     */
-    public BasicEmailParamDTO setBasicEmailParams(List<String> mailTo, JSONObject jsonObject, String templatePath, String title) throws AddressException {
-        BasicEmailParamDTO basicEmailParamDTO = new BasicEmailParamDTO();
-//        basicEmailParamDTO.setSenderUserMail("info@aida.com.hk");
-        basicEmailParamDTO.setSenderUserMail(CommonConstant.senderEmail);
-        basicEmailParamDTO.setMailTo(getInternetAddressList(mailTo));
-        basicEmailParamDTO.setSubject(title);
-        // todo 邮件模板不存在的报错与重试机制
-        basicEmailParamDTO.setContent(setContent(jsonObject, templatePath));
-        return basicEmailParamDTO;
-    }
-
-    public BasicEmailParamDTO setBasicEmailParams(List<String> mailTo, String title) throws AddressException {
-        BasicEmailParamDTO basicEmailParamDTO = new BasicEmailParamDTO();
-        basicEmailParamDTO.setSenderUserMail("info@aida.com.hk");
-        basicEmailParamDTO.setMailTo(getInternetAddressList(mailTo));
-        basicEmailParamDTO.setSubject(title);
-        return basicEmailParamDTO;
-    }
-
-    /**
-     * 将地址转换为InternetAddress类型
-     *
-     * @param addressList 普通的地址字符串列表
-     * @return InternetAddress类型的地址列表
-     * @throws AddressException 地址异常
-     */
-    public InternetAddress[] getInternetAddressList(List<String> addressList) throws AddressException {
-        InternetAddress[] toAddress = new InternetAddress[addressList.size()];
-        for (String address : addressList) {
-            toAddress[addressList.indexOf(address)] = new InternetAddress(address);
-        }
-        return toAddress;
-    }
-
-    public String setContent(JSONObject jsonObject, String templatePath) {
-        Context context = new Context();
-        if (Objects.nonNull(jsonObject)) {
-            for (String key : jsonObject.keySet()) {
-                context.setVariable(key, jsonObject.get(key));
-            }
-        }
-        return templateEngine.process(templatePath, context);
-    }
-
-}
+package com.ai.da.common.utils;
+
+import com.ai.da.common.constant.CommonConstant;
+import com.ai.da.model.dto.BasicEmailParamDTO;
+import com.alibaba.fastjson.JSONObject;
+import io.netty.util.internal.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.InputStreamSource;
+import org.springframework.mail.MailException;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Component;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
+import jakarta.annotation.Resource;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.*;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Component
+public class MailUtil {
+
+    @Resource
+    private JavaMailSender javaMailSender;
+
+    @Resource
+    private TemplateEngine templateEngine;
+
+    /**
+     * 发送邮件 - 默认发件人
+     *
+     * @param basicEmailParamDTO 发送邮件所需参数
+     * @param fileName 附件名（如果有）
+     * @param inputStreamSource 附件（如果有）
+     */
+    public int sendMail(BasicEmailParamDTO basicEmailParamDTO, String fileName, InputStreamSource inputStreamSource) throws MessagingException {
+        MimeMessage mimeMessage = createSimpleMail(basicEmailParamDTO, fileName, inputStreamSource);
+        // 提取配置
+        String host;
+        String username;
+        String password;
+        if (StringUtil.isNullOrEmpty(basicEmailParamDTO.getServiceAddress())) {
+            host = ((JavaMailSenderImpl) javaMailSender).getHost();
+        } else {
+            host = basicEmailParamDTO.getServiceAddress();
+        }
+        if (StringUtil.isNullOrEmpty(basicEmailParamDTO.getSenderUser())) {
+            username = ((JavaMailSenderImpl) javaMailSender).getUsername();
+        } else {
+            username = basicEmailParamDTO.getSenderUser();
+        }
+        if (StringUtil.isNullOrEmpty(basicEmailParamDTO.getServiceAddress())) {
+            password = ((JavaMailSenderImpl) javaMailSender).getPassword();
+        } else {
+            password = basicEmailParamDTO.getPassword();
+        }
+        return sendMail(mimeMessage, host, username, password);
+    }
+
+    private int sendMail(MimeMessage mimeMessage, String host, String username, String password) throws MessagingException {
+        try {
+            // 配置连接属性
+            java.util.Properties props = mimeMessage.getSession().getProperties();
+            props.put("mail.smtp.auth", "true");
+            props.put("mail.smtp.host", host);
+            props.put("mail.user", username);
+            props.put("mail.password", password);
+
+            // 使用 JavaMailSender 发送邮件（Spring Boot 3.x 标准方式）
+            javaMailSender.send(mimeMessage);
+            log.info("邮件发送成功至: {}", host);
+            return 1;
+        } catch (MailException e) {
+            log.info("邮件发送失败：{}", e.getMessage());
+            return 0;
+        }
+    }
+
+    /**
+     * 创建一封邮件
+     *
+     * @param basicEmailParamDTO 创建邮件需要的参数
+     * @param inputStreamSource 附件（如果有）
+     * @return 一封邮件
+     */
+    private MimeMessage createSimpleMail(BasicEmailParamDTO basicEmailParamDTO, String fileName, InputStreamSource inputStreamSource) throws MessagingException {
+        // 创建邮件对象
+        MimeMessage message = javaMailSender.createMimeMessage();
+        // 使用 MimeMessageHelper 简化邮件内容和附件的设置
+        MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(message, true);
+        // 设置发件人
+        mimeMessageHelper.setFrom(new InternetAddress(basicEmailParamDTO.getSenderUserMail()));
+        // 设置收件人
+        mimeMessageHelper.setTo(basicEmailParamDTO.getMailTo());
+        // 设置抄送人
+        if (basicEmailParamDTO.getCc() != null && basicEmailParamDTO.getCc().length > 0) {
+            mimeMessageHelper.setCc(basicEmailParamDTO.getCc());
+        }
+        // 设置暗送人
+        if (basicEmailParamDTO.getBcc() != null && basicEmailParamDTO.getBcc().length > 0) {
+            mimeMessageHelper.setBcc(basicEmailParamDTO.getBcc());
+        }
+        // 设置邮件主题
+        mimeMessageHelper.setSubject(basicEmailParamDTO.getSubject());
+        // 设置邮件内容（HTML 格式）
+        mimeMessageHelper.setText(basicEmailParamDTO.getContent(), true);
+        // 设置附件
+        if (inputStreamSource != null) {
+            mimeMessageHelper.addAttachment(fileName, inputStreamSource);
+        }
+        return message;
+    }
+
+
+    /**
+     * 设置实体参数
+     *
+     * @param mailTo     接收邮件的邮箱地址
+     * @param jsonObject 模板中变量的值
+     * @return 返回一个MailEntity
+     * @throws AddressException 邮箱地址值异常
+     */
+    public BasicEmailParamDTO setBasicEmailParams(List<String> mailTo, JSONObject jsonObject, String templatePath, String title) throws AddressException {
+        BasicEmailParamDTO basicEmailParamDTO = new BasicEmailParamDTO();
+//        basicEmailParamDTO.setSenderUserMail("info@aida.com.hk");
+        basicEmailParamDTO.setSenderUserMail(CommonConstant.senderEmail);
+        basicEmailParamDTO.setMailTo(getInternetAddressList(mailTo));
+        basicEmailParamDTO.setSubject(title);
+        // todo 邮件模板不存在的报错与重试机制
+        basicEmailParamDTO.setContent(setContent(jsonObject, templatePath));
+        return basicEmailParamDTO;
+    }
+
+    public BasicEmailParamDTO setBasicEmailParams(List<String> mailTo, String title) throws AddressException {
+        BasicEmailParamDTO basicEmailParamDTO = new BasicEmailParamDTO();
+        basicEmailParamDTO.setSenderUserMail("info@aida.com.hk");
+        basicEmailParamDTO.setMailTo(getInternetAddressList(mailTo));
+        basicEmailParamDTO.setSubject(title);
+        return basicEmailParamDTO;
+    }
+
+    /**
+     * 将地址转换为InternetAddress类型
+     *
+     * @param addressList 普通的地址字符串列表
+     * @return InternetAddress类型的地址列表
+     * @throws AddressException 地址异常
+     */
+    public InternetAddress[] getInternetAddressList(List<String> addressList) throws AddressException {
+        InternetAddress[] toAddress = new InternetAddress[addressList.size()];
+        for (String address : addressList) {
+            toAddress[addressList.indexOf(address)] = new InternetAddress(address);
+        }
+        return toAddress;
+    }
+
+    public String setContent(JSONObject jsonObject, String templatePath) {
+        Context context = new Context();
+        if (Objects.nonNull(jsonObject)) {
+            for (String key : jsonObject.keySet()) {
+                context.setVariable(key, jsonObject.get(key));
+            }
+        }
+        return templateEngine.process(templatePath, context);
+    }
+
+}

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

@@ -14,6 +14,7 @@ import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -41,6 +42,16 @@ public class MinioUtil {
     @Autowired
     private MinioClient minioClient;
 
+    @Value("${minio.endpoint}")
+    private String endpoint;
+
+    /**
+     * 获取MinIO客户端实例
+     */
+    public MinioClient getMinioClient() {
+        return minioClient;
+    }
+
     /**
      * description: 判断bucket是否存在，不存在则创建
      *
@@ -951,6 +962,166 @@ public class MinioUtil {
         }
     }
 
+    /**
+     * 检测字符串是否为预签名URL
+     * 通过检查URL中是否包含minio endpoint来判断
+     *
+     * @param str 待检测的字符串
+     * @return true表示是预签名URL，false表示不是
+     */
+    public boolean isPresignedUrl(String str) {
+        if (str == null || str.isEmpty()) {
+            return false;
+        }
+        try {
+            // 检查字符串是否是一个有效的URL
+            URL url = new URL(str);
+            String host = url.getHost();
+            // 获取endpoint中的主机部分（去掉http://或https://）
+            String endpointHost = endpoint;
+            if (endpointHost.startsWith("http://")) {
+                endpointHost = endpointHost.substring(7);
+            } else if (endpointHost.startsWith("https://")) {
+                endpointHost = endpointHost.substring(8);
+            }
+            // 去掉端口号
+            if (endpointHost.contains(":")) {
+                endpointHost = endpointHost.substring(0, endpointHost.indexOf(":"));
+            }
+            // 检查URL的host是否与endpoint的host匹配
+            return host.equals(endpointHost);
+        } catch (Exception e) {
+            // 不是有效的URL
+            return false;
+        }
+    }
+
+    /**
+     * 检测字符串是否为MinIO逻辑路径（bucketName/objectName格式）
+     * 逻辑路径特点：
+     * 1. 包含 "/"（桶名和对象名之间的分隔符）
+     * 2. 不是完整的URL（不以http://或https://开头）
+     * 3. 路径中没有查询参数
+     *
+     * @param str 待检测的字符串
+     * @return true表示是MinIO逻辑路径，false表示不是
+     */
+    public boolean isMinioLogicalPath(String str) {
+        if (str == null || str.isEmpty()) {
+            return false;
+        }
+        // 必须是字符串
+        if (!(str instanceof String)) {
+            return false;
+        }
+        String trimStr = str.trim();
+        // 不应该以http://或https://开头
+        if (trimStr.startsWith("http://") || trimStr.startsWith("https://")) {
+            return false;
+        }
+        // 应该包含 "/"（bucket/object格式）
+        if (!trimStr.contains("/")) {
+            return false;
+        }
+        // 不应该包含空格或特殊字符
+        if (trimStr.contains(" ") || trimStr.contains("\n") || trimStr.contains("\t")) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 将预签名URL转换为逻辑路径
+     *
+     * @param presignedUrl 预签名URL
+     * @return 逻辑路径（格式：bucketName/objectName）
+     */
+    public String getLogicalPathFromPresignedUrl(String presignedUrl) {
+        try {
+            // 解析URL
+            URL url = new URL(presignedUrl);
+
+            // 获取路径部分（去掉开头的/）
+            String path = url.getPath();
+            if (path.startsWith("/")) {
+                path = path.substring(1);
+            }
+
+            // 路径格式为 bucketName/objectName
+            // Minio路径中可能包含多个/，需要正确分割
+            int firstSlashIndex = path.indexOf("/");
+            if (firstSlashIndex <= 0) {
+                throw new MinioException("预签名URL路径格式无效，应包含桶名和对象名: " + presignedUrl);
+            }
+
+            String bucketName = path.substring(0, firstSlashIndex);
+            String objectName = path.substring(firstSlashIndex + 1);
+
+//            log.info("预签名URL转换成功，桶名: {}, 对象名: {}", bucketName, objectName);
+            return bucketName + "/" + objectName;
+        } catch (Exception e) {
+            log.error("预签名URL解析失败: {}", e.getMessage(), e);
+            throw new BusinessException("system.error");
+        }
+    }
+
+
+    /**
+     * 处理MinIO资源（预签名URL或逻辑路径），统一生成预签名URL
+     *
+     * @param resource 预签名URL或逻辑路径
+     * @param expires  过期时间（秒）
+     * @return 新的预签名URL
+     */
+    public String processMinioResource(String resource, int expires) {
+        try {
+            String logicalPath;
+            if (isPresignedUrl(resource)) {
+                // 是预签名URL，解析为逻辑路径
+                logicalPath = getLogicalPathFromPresignedUrl(resource);
+            } else if (isMinioLogicalPath(resource)) {
+                // 本身就是逻辑路径
+                logicalPath = resource.trim();
+            } else {
+                // 不认识的内容，直接返回原始值
+                log.warn("未识别的MinIO资源格式: {}", resource);
+                return resource;
+            }
+
+            // 统一生成预签名URL
+            return getPreSignedUrl(logicalPath, expires);
+        } catch (Exception e) {
+            log.error("处理MinIO资源失败: {}, error: {}", resource, e.getMessage(), e);
+            // 如果失败，返回原始内容
+            return resource;
+        }
+    }
+
+    /**
+     * 将任意MinIO URL转换为逻辑路径
+     * 检测URL类型并转换为逻辑路径返回
+     *
+     * @param url 预签名URL或逻辑路径
+     * @return 逻辑路径（格式：bucketName/objectName）
+     * @throws MinioException 如果不是有效的MinIO资源
+     */
+    public String convertToLogicalPath(String url) {
+        if (url == null || url.isEmpty()) {
+            throw new BusinessException("url.cannot.be.empty");
+        }
+        if (isMinioLogicalPath(url)) {
+            // 本身就是逻辑路径，直接返回
+            return url.trim();
+        } else if (isPresignedUrl(url)) {
+            // 是预签名URL，转换为逻辑路径
+            return getLogicalPathFromPresignedUrl(url);
+        } else {
+            // 不认识的内容，抛出异常
+            throw new BusinessException("无法识别的MinIO资源格式: " + url + "，请提供有效的预签名URL或逻辑路径");
+        }
+    }
+
+
 }
 
 

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

@@ -3,11 +3,11 @@ package com.ai.da.common.utils;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;

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

@@ -3,10 +3,10 @@ package com.ai.da.common.utils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;

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

@@ -13,8 +13,8 @@ import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;

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

@@ -3,7 +3,7 @@ package com.ai.da.common.utils;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;

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

@@ -19,7 +19,7 @@ import software.amazon.awssdk.services.s3.presigner.S3Presigner;
 import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
 import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.*;
 import java.time.Duration;
 import java.util.*;

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

@@ -1,32 +0,0 @@
-package com.ai.da.common.utils;
-
-import com.ai.da.model.vo.AuthPrincipalVo;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-public class SecurityContextUtils {
-
-    public static AuthPrincipalVo getCurrentUser() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication != null && authentication.getPrincipal() != null) {
-            return (AuthPrincipalVo) authentication.getPrincipal();
-        }
-        return null;
-    }
-
-    public static Long getCurrentUserId() {
-        AuthPrincipalVo currentUser = getCurrentUser();
-        if (currentUser != null) {
-            return currentUser.getId();
-        }
-        return null;
-    }
-
-    public static String getCurrentUsername() {
-        AuthPrincipalVo currentUser = getCurrentUser();
-        if (currentUser != null) {
-            return currentUser.getUsername();
-        }
-        return null;
-    }
-}

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

@@ -21,6 +21,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.Base64;
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * 邮件发送类
@@ -832,7 +833,7 @@ public class SendEmailUtil {
                     if (language.equals("ENGLISH")) {
                         user.setSubject("[Code-Create] AiDA Subscription Renewal Reminder");
                         templateUser.setTemplateID(156072L);
-                    } else if (language.equals("CHINESE")){
+                    } else if (language.equals("CHINESE_SIMPLIFIED")){
                         user.setSubject("[Code-Create] AiDA续订提醒");
                         templateUser.setTemplateID(156073L);
                     } else {
@@ -844,7 +845,7 @@ public class SendEmailUtil {
                     if (language.equals("ENGLISH")) {
                         user.setSubject("[Code-Create] AiDA account is about to expire");
                         templateUser.setTemplateID(156749L);
-                    } else if (language.equals("CHINESE")){
+                    } else if (language.equals("CHINESE_SIMPLIFIED")){
                         user.setSubject("[Code-Create] 您的AiDA账号即将到期");
                         templateUser.setTemplateID(156750L);
                     } else {
@@ -856,7 +857,7 @@ public class SendEmailUtil {
                     if (language.equals("ENGLISH")) {
                         user.setSubject("[Code-Create] AiDA — Free Trial Ending");
                         templateUser.setTemplateID(156075L);
-                    } else if (language.equals("CHINESE")){
+                    } else if (language.equals("CHINESE_SIMPLIFIED")){
                         user.setSubject("[Code-Create] AiDA — 免费试用结束提醒");
                         templateUser.setTemplateID(156076L);
                     } else {
@@ -874,14 +875,16 @@ public class SendEmailUtil {
             templateUser.setTemplateData(JSON.toJSONString(subscriptionEmailParamsDTO));
             user.setTemplate(templateUser);
 
-            subscriptionEmailParamsDTO.setEndDate("When cancelled");
+            if (Objects.nonNull(subscriptionEmailParamsDTO)) {
+                subscriptionEmailParamsDTO.setEndDate("When cancelled");
+            }
             templateMerchant.setTemplateData(JSON.toJSONString(subscriptionEmailParamsDTO));
             merchant.setTemplate(templateMerchant);
 
             if (!type.equals("cancel") && !type.equals("fail_new")) {
                 // 返回的resp是一个SendEmailResponse的实例，与请求对象对应
                 SendEmailResponse respUser = client.SendEmail(user);
-                log.info("邮件主题：{}，发送结果toUser###{}", user.getSubject(), SendEmailResponse.toJsonString(respUser));
+                log.info("邮件主题：{}，发送结果toUser###{}, email:{}", user.getSubject(), SendEmailResponse.toJsonString(respUser), receiverAddress);
             }
             if (!type.startsWith("reminder")) {
                 SendEmailResponse respMerchant = client.SendEmail(merchant);
@@ -1021,7 +1024,7 @@ public class SendEmailUtil {
             log.info("邮件发送结果res###{}", SendEmailResponse.toJsonString(resp));
         } catch (TencentCloudSDKException e) {
             log.info("邮件发送失败###{}", e.toString());
-            throw new BusinessException("failed.to.send.mail");
+//            throw new BusinessException("failed.to.send.mail");
         }
     }
 

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

@@ -88,7 +88,7 @@ public class SendRequestUtil {
         }
     }
 
-    public String sendFluxPost(String url, String requestBodyStr){
+    /*public String sendFluxPost(String url, String requestBodyStr){
         int status;
         String body;
         try (HttpResponse execute = HttpRequest.post(url)
@@ -103,9 +103,63 @@ public class SendRequestUtil {
             if (status == 200) {
                 return body;
             }
+            if (status == 402 || status == 403) {
+                SendEmailUtil.commonExceptionReminder("Flux账户积分不足，flux生成任务",
+                        new String[]{"xupei3360@163.com, fangjianliao@aidlab.hk, investigation@aidlab.hk"});
+            }
         }
         log.warn("请求失败，状态码为 ： {}", status);
         return null;
+    }*/
+
+    public String sendFluxPost(String url, String requestBodyStr) {
+        // 尝试两个API key
+        String[] apiKeys = {"84e8f5d5-b0b3-49aa-b244-ab7ba27e7ae7",
+                "d447a0ac-2291-4f1c-9a36-f7614c385989"};
+        boolean[] notified = {false, false}; // 记录是否已发送过不足提醒
+
+        for (int i = 0; i < apiKeys.length; i++) {
+            int status;
+            String body;
+
+            try (HttpResponse execute = HttpRequest.post(url)
+                    .header(Header.CONTENT_TYPE, "application/json")
+                    .header("x-key", apiKeys[i])
+                    .body(requestBodyStr)
+                    .timeout(180000)
+                    .execute()) {
+
+                status = execute.getStatus();
+                body = execute.body();
+
+                if (status == 200) {
+                    return body;
+                }
+
+                // 余额不足处理
+                if (status == 402 || status == 403) {
+                    if (!notified[i]) {
+                        SendEmailUtil.commonExceptionReminder(
+                                "Flux账户积分不足，flux生成任务失败。（key:）" + apiKeys[i],
+                                new String[]{"xupei3360@163.com", "fangjianliao@aidlab.hk", "investigation@aidlab.hk"}
+                        );
+                        notified[i] = true;
+                    }
+                    continue; // 尝试下一个key
+                }
+
+                // 其他错误直接返回null
+                log.warn("请求失败，状态码为：{}，使用key：{}", status, apiKeys[i]);
+                return null;
+
+            } catch (Exception e) {
+                log.error("请求异常，使用key：{}", apiKeys[i], e);
+                if (i == apiKeys.length - 1) return null; // 最后一个key也失败则返回null
+            }
+        }
+
+        log.warn("所有API key均余额不足");
+        return null;
     }
 
     public String sendPost(String url, String requestBodyStr){

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

@@ -0,0 +1,131 @@
+package com.ai.da.common.utils;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.digest.DigestUtil;
+import com.ai.da.common.constant.CommonConstant;
+import com.ai.da.model.vo.AuthPrincipalVo;
+import com.alibaba.fastjson.JSONObject;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.SecretKey;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
+/**
+ * Token 生成工具类（仅负责生成，不负责鉴权）。
+ * 鉴权逻辑已迁移至 Gateway（GlobalAuthWebFilter）。
+ */
+@Slf4j
+@Component
+public class TokenGenerateUtils {
+
+    private static final String ISSUER = "DWJ";
+
+    @Value("${spring.security.jwtSecret:JWTSECRET}")
+    private String jwtSecret;
+
+    @Value("${spring.security.jwtExpiration:8640000000}")
+    private long jwtExpiration;
+
+    @Value("${spring.security.jwtTokenPrefix:Bearer-}")
+    private String jwtTokenPrefix;
+
+    /**
+     * 生成 JWT Token。
+     * @param principal 用户信息
+     * @return 完整的 token（含 prefix）
+     */
+    public String createToken(AuthPrincipalVo principal) {
+        SecretKey key = buildSigningKey();
+        String token = Jwts.builder()
+                .id(String.valueOf(principal.getId()))
+                .subject(JSONObject.toJSONString(principal))
+                .issuedAt(new Date())
+                .issuer(ISSUER)
+                .expiration(new Date(System.currentTimeMillis() + jwtExpiration))
+                .signWith(key)
+                .compact();
+        return jwtTokenPrefix + token;
+    }
+
+    /**
+     * 获取 Token 过期时间（毫秒）。
+     */
+    public long getJwtExpiration() {
+        return jwtExpiration;
+    }
+
+    /**
+     * 生成用于邮箱变更的简化 Token。
+     * @param userId  用户 ID
+     * @param mailbox 新邮箱
+     * @return token（不含 prefix）
+     */
+    public String createMailboxToken(Long userId, String mailbox) {
+        SecretKey key = buildSigningKey();
+        return Jwts.builder()
+                .id(String.valueOf(userId))
+                .subject(mailbox + "_" + userId)
+                .issuedAt(new Date())
+                .issuer(ISSUER)
+                .expiration(new Date(System.currentTimeMillis() + CommonConstant.CHANGE_MAILBOX_LINK_VALIDITY))
+                .signWith(key)
+                .compact();
+    }
+
+    /**
+     * 验证 Token 是否有效（签名和有效期）。
+     */
+    public boolean validateToken(String token) {
+        try {
+            Claims claims = parseTokenBody(token);
+            return claims != null;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * 从 Token 中解析用户信息。
+     */
+    public AuthPrincipalVo parserToUser(String token) {
+        try {
+            String subject = parseTokenBody(token).getSubject();
+            if (StrUtil.isNotEmpty(subject)) {
+                return JSONObject.parseObject(subject, AuthPrincipalVo.class);
+            }
+        } catch (Exception e) {
+            log.error("JWT解析用户信息失败: {}", e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * 解析邮箱变更 Token，返回 "email_id" 格式字符串。
+     */
+    public String parseMailboxToken(String token) {
+        return parseTokenBody(token).getSubject();
+    }
+
+    private Claims parseTokenBody(String token) {
+        SecretKey key = buildSigningKey();
+        return Jwts.parser()
+                .verifyWith(key)
+                .build()
+                .parseSignedClaims(token)
+                .getPayload();
+    }
+
+    private SecretKey buildSigningKey() {
+        byte[] raw = jwtSecret.getBytes(StandardCharsets.UTF_8);
+        if (raw.length < 32) {
+            raw = DigestUtil.sha256(raw);
+        }
+        return Keys.hmacShaKeyFor(raw);
+    }
+}

src/main/java/com/ai/da/common/websocket/NotificationConnection.java

@@ -4,11 +4,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.*;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -58,7 +57,7 @@ public class NotificationConnection {
 
     //收到了客户端消息执行的操作
     @OnMessage
-    public void onMessage(@RequestParam String text){
+    public void onMessage(String text){
         Map<String, String> textMap = JSONObject.parseObject(text, Map.class);
         log.info("收到了一条来自 {} 的消息：{}， sessionId：{}", this.userId, textMap.get("text"), this.session.getId());
 //        return "已收到你的消息";

src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java

@@ -1,5 +1,7 @@
 package com.ai.da.common.websocket.config;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
@@ -8,6 +10,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
  * Configuration of WebSocket
  */
 @Configuration
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
+@ConditionalOnProperty(name = "websocket.enabled", havingValue = "true", matchIfMissing = true)
 public class WebSocketConfig {
     @Bean
     public ServerEndpointExporter serverEndpointExporter() {

src/main/java/com/ai/da/controller/AccountController.java

@@ -13,25 +13,25 @@ import com.ai.da.model.vo.AccountPreLoginVO;
 import com.ai.da.model.vo.BindEmailVO;
 import com.ai.da.model.vo.PersonalHomepageVO;
 import com.ai.da.service.AccountService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 
-@Api(tags = "Account模块")
+@Tag(name = "Account模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/account")
@@ -40,139 +40,139 @@ public class AccountController {
     @Resource
     private AccountService accountService;
 
-    @ApiOperation(value = "预先登入")
+    @Operation(summary = "预先登入")
     @PostMapping("/preLogin")
     public Response<AccountPreLoginVO> preLogin(@Valid @RequestBody AccountPreLoginDTO accountDTO) {
         return Response.success(accountService.preLogin(accountDTO));
     }
 
-    @ApiOperation(value = "登入")
+    @Operation(summary = "登入")
     @PostMapping("/login")
     public Response<AccountLoginVO> login(@Valid @RequestBody AccountLoginDTO accountDTO, HttpServletRequest request) {
         return Response.success(accountService.login(accountDTO, request));
     }
 
-    @ApiOperation(value = "绑定邮箱")
+    @Operation(summary = "绑定邮箱")
     @PostMapping("/bindEmail")
     public Response<BindEmailVO> bindEmail(@Valid @RequestBody AccountBindEmailDTO accountBindEmailDTO, HttpServletRequest request) {
         return Response.success(accountService.bindEmail(accountBindEmailDTO, request));
     }
 
-    @ApiOperation(value = "忘记密码")
+    @Operation(summary = "忘记密码")
     @PostMapping("/resetPwd")
     public Response<Boolean> resetPwd(@Valid @RequestBody AccountRegisterDTO accountRegisterDTO) {
         return Response.success(accountService.forgetPwd(accountRegisterDTO));
     }
 
-    @ApiOperation(value = "发送邮件")
+    @Operation(summary = "发送邮件")
     @PostMapping("/sendEmail")
     public Response<Boolean> sendEmail(@Valid @RequestBody EmailSendDTO emailSendDTO) {
         return Response.success(accountService.sendEmail(emailSendDTO));
     }
 
-    @ApiOperation(value = "登出")
+    @Operation(summary = "登出")
     @PostMapping("/logout")
     public Response<Boolean> logout(@Valid @RequestBody AccountLogoutDTO accountLogoutDTO) {
         return Response.success(accountService.logout(accountLogoutDTO));
     }
 
-    @ApiOperation(value = "是否登入")
+    @Operation(summary = "是否登入")
     @PostMapping("/isLogin")
     public Response<Boolean> isLogin(@Valid @RequestBody AccountLogoutDTO accountLogoutDTO) {
         return Response.success(accountService.isLogin(accountLogoutDTO));
     }
 
-    @ApiOperation(value = "获取当前用户语言")
+    @Operation(summary = "获取当前用户语言")
     @PostMapping("/getUserLanguage")
     public Response<String> getUserLanguage() {
         return Response.success(accountService.getUserLanguage());
     }
 
-    @ApiOperation(value = "切换当前用户语言")
+    @Operation(summary = "切换当前用户语言")
     @GetMapping("/changeUserLanguage")
     public Response<String> changeUserLanguage(String language) {
         return Response.success(accountService.changeUserLanguage(language));
     }
 
-    @ApiOperation(value = "试用用户退出登录")
+    @Operation(summary = "试用用户退出登录")
     @GetMapping("/trialUserLogout")
     public Response<Boolean> trialUserLogout() {
         return Response.success(accountService.trialUserLogout());
     }
 
-    @ApiOperation(value = "完成新手教程")
+    @Operation(summary = "完成新手教程")
     @PostMapping("/completeGuidance")
     public Response<Boolean> completeGuidance() {
         return Response.success(accountService.completeGuidance());
     }
 
-    @ApiOperation(value = "试用订单列表")
+    @Operation(summary = "试用订单列表")
     @PostMapping("/trialOrderList")
     public Response<PageBaseResponse<TrialOrder>> trialOrderList(@Valid @RequestBody TrialOrderDTO trialOrderDTO) {
         return Response.success(PageBaseResponse.success(accountService.trialOrderList(trialOrderDTO)));
     }
 
-    @ApiOperation(value = "通过试用订单审批")
+    @Operation(summary = "通过试用订单审批")
     @PostMapping("/trialOrderApproval")
     public Response<Boolean> trialOrderApproval(@RequestParam("ids") List<Long> ids) {
         return Response.success(accountService.trialOrderApproval(ids));
     }
 
-    @ApiOperation(value = "拒绝试用订单审批")
+    @Operation(summary = "拒绝试用订单审批")
     @PostMapping("/trialOrderRefuse")
     public Response<Boolean> trialOrderRefuse(@RequestParam("ids") List<Long> ids) {
         return Response.success(accountService.trialOrderRefuse(ids));
     }
 
-    @ApiOperation(value = "获取是否自动审评")
+    @Operation(summary = "获取是否自动审评")
     @PostMapping("/getIsAutoApproval")
     public Response<Boolean> getIsAutoApproval() {
         return Response.success(accountService.getIsAutoApproval());
     }
 
-    @ApiOperation(value = "切换是否自动审评")
+    @Operation(summary = "切换是否自动审评")
     @PostMapping("/switchIsAutoApproval")
     public Response<Boolean> switchIsAutoApproval() {
         return Response.success(accountService.switchIsAutoApproval());
     }
 
-    @ApiOperation(value = "aws状态检测")
+    @Operation(summary = "aws状态检测")
     @GetMapping("/healthy")
     @ResponseStatus(HttpStatus.OK)
-    public Response<Map<String,Integer>> checkStatus(){
-        Map<String,Integer> returnMap = new HashMap<>();
-        returnMap.put("code",200);
+    public Response<Map<String, Integer>> checkStatus() {
+        Map<String, Integer> returnMap = new HashMap<>();
+        returnMap.put("code", 200);
         return Response.success(returnMap);
     }
 
-    @ApiOperation(value = "查询账号到期时间")
+    @Operation(summary = "查询账号到期时间")
     @PostMapping("/getExpiredTime")
-    public Response<Long> getExpiredTime(){
+    public Response<Long> getExpiredTime() {
         return Response.success(accountService.getExpiredTime());
     }
 
-    @ApiOperation(value = "免密登录")
+    @Operation(summary = "免密登录")
     @PostMapping("/noLoginRequired")
-    public Response<AccountLoginVO> noLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request){
+    public Response<AccountLoginVO> noLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
         return Response.success(accountService.noLoginRequired(noLoginRequiredDTO, request));
     }
 
     @PostMapping("upgradeNotification")
-    @ApiOperation(value = "升级邮件通知")
+    @Operation(summary = "升级邮件通知")
     public Response<Boolean> upgradeNotification() {
         accountService.upgradeNotification();
         return Response.success(true);
     }
 
     @CrossOrigin
-    @ApiOperation(value = "广场用户注册")
+    @Operation(summary = "广场用户注册")
     @PostMapping("/designWorksRegister")
     public Response<Boolean> designWorksRegister(@Valid @RequestBody AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) {
         return Response.success(accountService.designWorksRegister(accountDesignWorksRegisterDTO));
     }
 
     @CrossOrigin
-    @ApiOperation(value = "广场用户注册")
+    @Operation(summary = "广场用户注册")
     @PostMapping("/designWorksRegisterCode")
     public Response<AccountLoginVO> designWorksRegisterCode(@Valid @RequestBody AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO,
                                                             HttpServletRequest request) {
@@ -183,7 +183,7 @@ public class AccountController {
      * 填写调查问卷
      * @return
      */
-/*    @ApiOperation(value = "填写调查问卷")
+/*    @Operation(summary = "填写调查问卷")
     @PostMapping("/questionnaire")
     public Response<Boolean> questionnaire(@Valid @RequestBody String questionnaireInfo){
         return Response.success(accountService.collectQuestionnaires(questionnaireInfo));
@@ -191,22 +191,23 @@ public class AccountController {
 
     /**
      * 参与活动 获取福利
+     *
      * @return
      */
-/*    @ApiOperation(value = "参与活动 获取福利")
+/*    @Operation(summary = "参与活动 获取福利")
     @GetMapping("/activity")
     public Response<String> getActivityBenefits(){
         return Response.success(accountService.getActivityBenefits());
     }*/
 
-    @ApiOperation(value = "将用户账号过期时间设置为过期当天的23：59：59")
+    @Operation(summary = "将用户账号过期时间设置为过期当天的23：59：59")
     @GetMapping("/setUserValidToDayEnd")
-    public Response<List<Long>> setUserValidToDayEnd(){
+    public Response<List<Long>> setUserValidToDayEnd() {
         return Response.success(accountService.setUserValidToDayEnd());
     }
 
     // 用户上传头像
-    @ApiOperation(value = "上传头像")
+    @Operation(summary = "上传头像")
     @PostMapping(path = "/uploadAvatar")
     public Response<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
         if (null == file || StringUtils.isEmpty(file.getOriginalFilename())) {
@@ -215,27 +216,27 @@ public class AccountController {
         return Response.success(accountService.uploadAvatar(file));
     }
 
-    @ApiOperation(value = "个人主页浏览量增加")
+    @Operation(summary = "个人主页浏览量增加")
     @GetMapping("/viewsIncrease")
     public Response<Boolean> viewsGet(@RequestParam("id") Long id) {
         return Response.success(accountService.viewsIncrease(id));
     }
 
-    @ApiOperation(value = "获取个人主页信息")
+    @Operation(summary = "获取个人主页信息")
     @GetMapping("/personalHomepage")
-    public Response<PersonalHomepageVO> getPersonalHomepage(@RequestParam("id") Long id){
+    public Response<PersonalHomepageVO> getPersonalHomepage(@RequestParam("id") Long id) {
         return Response.success(accountService.getPersonalHomepage(id));
     }
 
-    @ApiOperation(value = "getUsernameModifyTimes")
+    @Operation(summary = "getUsernameModifyTimes")
     @GetMapping("/getNicknameModifyTimes")
-    public Response<Long> getNicknameModifyTimes(){
+    public Response<Long> getNicknameModifyTimes() {
         return Response.success(accountService.getNicknameModifyTimes());
     }
 
-    @ApiOperation(value = "editUserName")
+    @Operation(summary = "editUserName")
     @GetMapping("/editUserName")
-    public Response<String> editUserName(@RequestParam("newUserName") String newUserName){
+    public Response<String> editUserName(@RequestParam("newUserName") String newUserName) {
         accountService.editUserName(newUserName);
         return Response.success("success");
     }
@@ -247,14 +248,14 @@ public class AccountController {
         return Response.success("success");
     }
 
-    @ApiOperation(value = "changeUserEmail")
+    @Operation(summary = "changeUserEmail")
     @GetMapping("/changeUserEmail")
     public Response<String> changeUserEmail(@RequestParam("newMailbox") String newMailbox){
         accountService.changeUserEmail(newMailbox);
         return Response.success("success");
     }
 
-    @ApiOperation(value = "activateNewEmail")
+    @Operation(summary = "activateNewEmail")
     @GetMapping("/activateNewEmail")
     public Response<String> activateNewEmail(@RequestParam("token") String token){
         accountService.activateNewEmail(token);
@@ -262,45 +263,45 @@ public class AccountController {
     }*/
 
     @PostMapping("halfPricePromotion")
-    @ApiOperation(value = "十月半价活动")
+    @Operation(summary = "十月半价活动")
     public Response<Boolean> halfPricePromotion() {
         accountService.halfPricePromotion();
         return Response.success(true);
     }
 
     @PostMapping("temporaryUpgrade")
-    @ApiOperation(value = "临时升级")
+    @Operation(summary = "临时升级")
     public Response<Boolean> temporaryUpgrade() {
         accountService.temporaryUpgrade();
         return Response.success(true);
     }
 
     @PostMapping("enterpriseLogin")
-    @ApiOperation(value = "企业登录")
+    @Operation(summary = "企业登录")
     public Response<AccountPreLoginVO> enterpriseLogin(@Valid @RequestBody AccountLoginDTO accountDTO) {
         return Response.success(accountService.enterpriseLogin(accountDTO));
     }
 
     @PostMapping("schoolLogin")
-    @ApiOperation(value = "学校登录")
+    @Operation(summary = "学校登录")
     public Response<AccountPreLoginVO> schoolLogin(@Valid @RequestBody AccountLoginDTO accountDTO) {
         return Response.success(accountService.schoolLogin(accountDTO));
     }
 
     @PostMapping("organizationNameSearch")
-    @ApiOperation(value = "组织名模糊查询")
-    public Response<Set<String>> organizationNameSearch(@RequestParam("type") String type, @RequestParam("name") String name) {
+    @Operation(summary = "组织名模糊查询")
+    public Response<Set<String>> organizationNameSearch(@RequestParam("type") String type, @RequestParam(value = "name", required = false) String name) {
         return Response.success(accountService.organizationNameSearch(type, name));
     }
 
     @PostMapping("addOrUpdateSubAccount")
-    @ApiOperation(value = "子账号新增")
+    @Operation(summary = "子账号新增")
     public Response<Boolean> addSubAccount(@Valid @RequestBody AddSubAccountDTO addSubAccountDTO) {
         return Response.success(accountService.addSubAccount(addSubAccountDTO));
     }
 
     @PostMapping("deleteSubAccount")
-    @ApiOperation(value = "子账号删除")
+    @Operation(summary = "子账号删除")
     public Response<Boolean> deleteSubAccount(@Valid @RequestBody AddSubAccountDTO addSubAccountDTO) {
 //        return Response.success(accountService.deleteSubAccount(addSubAccountDTO));
         accountService.removeSubAccount(addSubAccountDTO, UserContext.getUserHolder().getId());
@@ -308,91 +309,91 @@ public class AccountController {
     }
 
     @PostMapping("subAccountList")
-    @ApiOperation(value = "子账号查询")
+    @Operation(summary = "子账号查询")
     public Response<PageBaseResponse<Account>> subAccountList(@Valid @RequestBody SubAccountPageDTO subAccountPageDTO) {
         return Response.success(accountService.subAccountList(subAccountPageDTO));
     }
 
     @GetMapping("accountDetail")
-    @ApiOperation(value = "账号详情")
+    @Operation(summary = "账号详情")
     public Response<Account> accountDetail(@RequestParam("id") Long id) {
         return Response.success(accountService.accountDetail(id));
     }
 
     @PostMapping("getAccountDetail")
-    @ApiOperation(value = "获取账户信息")
+    @Operation(summary = "获取账户信息")
     public Response<AccountLoginVO> getAccountDetail() {
         return Response.success(accountService.getAccountDetail());
     }
 
     @GetMapping("/bindGoogle")
-    @ApiOperation(value = "绑定谷歌")
+    @Operation(summary = "绑定谷歌")
     public Response<AccountExtend> bindGoogle(@RequestParam("credential") String credential) {
         return Response.success(accountService.bindGoogle(credential));
     }
 
     @GetMapping("/bindWeChat")
-    @ApiOperation(value = "绑定微信")
+    @Operation(summary = "绑定微信")
     public Response<AccountExtend> bindWeChat(@RequestParam("code") String code) {
         return Response.success(accountService.bindWeChat(code));
     }
 
     @GetMapping("/bindEmail")
-    @ApiOperation(value = "绑定邮箱")
+    @Operation(summary = "绑定邮箱")
     public Response<BindEmailVO> bindEmail(@RequestParam("email") String email) {
         return Response.success(accountService.bindEmail(email));
     }
 
     @GetMapping("/unbindWeChat")
-    @ApiOperation(value = "解除绑定微信")
+    @Operation(summary = "解除绑定微信")
     public Response<Boolean> unbindWeChat() {
         return Response.success(accountService.unbindWeChat());
     }
 
     @GetMapping("/unbindGoogle")
-    @ApiOperation(value = "解除绑定谷歌")
+    @Operation(summary = "解除绑定谷歌")
     public Response<Boolean> unbindGoogle() {
         return Response.success(accountService.unbindGoogle());
     }
 
     @PostMapping("/updateUserInfo")
-    @ApiOperation(value = "更新用户国家、职业信息")
+    @Operation(summary = "更新用户国家、职业信息")
     public Response<Boolean> updateUserInfo(@Valid @RequestBody UpdateUserInfoDTO updateUserInfoDTO) {
         return Response.success(accountService.updateUserInfo(updateUserInfoDTO));
     }
 
     @GetMapping("/subAccountImportExcelDownload")
-    @ApiOperation(value = "模板下载")
+    @Operation(summary = "模板下载")
     public void subAccountImportExcelDownload(HttpServletResponse response) {
         accountService.subAccountImportExcelDownload(response);
     }
 
     @GetMapping("/exportAccountsToExcel")
-    @ApiOperation(value = "下载子账号信息")
+    @Operation(summary = "下载子账号信息")
     public void exportAccountsToExcel(HttpServletResponse response) {
         accountService.exportAccountsToExcel(response);
     }
 
     @PostMapping("/subAccountImport")
-    @ApiOperation(value = "模板导入")
+    @Operation(summary = "模板导入")
     public Response<Boolean> subAccountImport(@RequestParam("file") MultipartFile file) {
         return Response.success(accountService.subAccountImport(file));
     }
 
     /*@GetMapping("/send618Email")
-    @ApiOperation(value = "618邮件发送")
+    @Operation(summary = "618邮件发送")
     public Response<String> send618PromotionEmailTemp() {
         accountService.send618PromotionEmailTemp();
         return Response.success("success");
     }*/
 
     /*@GetMapping("/refreshCreditsMonthly")
-    @ApiOperation(value = "刷新子账号积分")
+    @Operation(summary = "刷新子账号积分")
     public void refreshCreditsMonthly() {
         accountService.refreshCreditsMonthly();
     }*/
     /*@GetMapping("/checkEduAdminExpireStatus")
-    @ApiOperation(value = "检查教育管理员账号到期情况")
+    @Operation(summary = "检查教育管理员账号到期情况")
     public void checkEduAdminExpireStatus() {
         accountService.checkEduAdminExpireStatus();
     }*/

src/main/java/com/ai/da/controller/AffiliateController.java

@@ -12,14 +12,15 @@ import com.ai.da.model.vo.ReferralPageQueryVO;
 import com.ai.da.service.AffiliateService;
 import com.ai.da.service.ReferralService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -27,7 +28,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/api/affiliate")
-@Api(tags = "Affiliate模块")
+@Tag(name = "Affiliate模块")
 public class AffiliateController {
 
     @Resource
@@ -36,31 +37,31 @@ public class AffiliateController {
     @Resource
     private ReferralService referralService;
 
-    @ApiOperation(value = "注册成为affiliate")
+    @Operation(summary = "注册成为affiliate")
     @GetMapping("/registration")
     public Response<Boolean> completeGuidance(@RequestParam(value = "promotionMethod", required = false) String promotionMethod) {
         return Response.success(affiliateService.registerAsAnAffiliate(promotionMethod));
     }
 
-    @ApiOperation(value = "获取affiliate列表")
+    @Operation(summary = "获取affiliate列表")
     @PostMapping("/list")
     public Response<PageBaseResponse<AffiliateVO>> getAffiliateList(@Validated @RequestBody AffiliateQueryDTO affiliateQueryDTO) {
         return Response.success(affiliateService.getAffiliateList(affiliateQueryDTO));
     }
 
-    @ApiOperation(value = "获取affiliate个人中心")
+    @Operation(summary = "获取affiliate个人中心")
     @GetMapping("/personalCenter")
     public Response<AffiliateVO> personalAffiliateCenter() {
         return Response.success(affiliateService.personalAffiliateCenter());
     }
 
-    @ApiOperation(value = "获取个人佣金图表数据")
+    @Operation(summary = "获取个人佣金图表数据")
     @GetMapping("/getPersonalMonthlyIncome")
     public Response<BigDecimal[]> getPersonalMonthlyIncome(@RequestParam("year") int year) {
         return Response.success(affiliateService.getPersonalMonthlyIncome(year));
     }
 
-    @ApiOperation(value = "审批affiliate申请")
+    @Operation(summary = "审批affiliate申请")
     @GetMapping("/approval")
     public Response<Boolean> applicationApproval(@RequestParam("id") Long id,
                                                  @RequestParam("isApproved") Boolean isApproved,
@@ -68,13 +69,13 @@ public class AffiliateController {
         return Response.success(affiliateService.applicationApproval(id, isApproved, commission));
     }
 
-    @ApiOperation(value = "编辑affiliate")
+    @Operation(summary = "编辑affiliate")
     @GetMapping("/editAffiliate")
     public Response<String> editAffiliate(@RequestParam("id") Long id,
-                                          @ApiParam(value = "佣金比例", example = "25")
+                                          @Parameter(description = "佣金比例", example = "25")
                                           @RequestParam(value = "commission", required = false) Float commission,
-                                          @ApiParam(value = "操作类型", example = "Active",
-                                                  allowableValues = "Active,Inactive,Delete")
+                                          @Parameter(description = "操作类型", example = "Active",
+                                                  schema = @Schema(allowableValues = {"Active", "Inactive", "Delete"}))
                                           @RequestParam(value = "operationType", required = false) String operationType) {
         affiliateService.editAffiliate(id, commission, operationType);
         return Response.success("success");
@@ -94,39 +95,39 @@ public class AffiliateController {
         return Response.success("success ");
     }*/
 
-    @ApiOperation(value = "affiliate链接浏览量增加")
+    @Operation(summary = "affiliate链接浏览量增加")
     @GetMapping("/viewsIncrease")
     public Response<Boolean> viewsGet(@RequestParam("id") Long id) {
         return Response.success(affiliateService.affiliateLinkViewsIncrease(id));
     }
 
-    @ApiOperation(value = "获取每个affiliate产生的收入")
+    @Operation(summary = "获取每个affiliate产生的收入")
     @PostMapping("/getEachAffiliateGeneratedRevenue")
     public Response<IPage<AffiliateInvitationDetailsVO>> getEachAffiliateGeneratedRevenue(@Validated @RequestBody AffiliateQueryDTO affiliateQueryDTO) {
         return Response.success(affiliateService.getEachAffiliateGeneratedRevenue(affiliateQueryDTO));
     }
 
-    @ApiOperation(value = "分页获取所有的referral")
+    @Operation(summary = "分页获取所有的referral")
     @PostMapping("/getReferrals")
     public Response<IPage<ReferralPageQueryVO>> getReferrals(@RequestBody ReferralPageQueryDTO referralPageQueryDTO) {
         return Response.success(referralService.queryByPage(referralPageQueryDTO));
     }
 
-    @ApiOperation(value = "编辑单个referral")
+    @Operation(summary = "编辑单个referral")
     @PostMapping("/editReferral")
     public Response<String> editReferral(@Validated @RequestBody EditReferralDTO editReferralDTO) {
         referralService.editReferral(editReferralDTO);
         return Response.success();
     }
 
-    @ApiOperation(value = "（批量）删除referral")
+    @Operation(summary = "（批量）删除referral")
     @PostMapping("/batchDeleteReferral")
     public Response<String> batchDeleteReferral(@RequestBody List<Long> idList) {
         referralService.deleteReferral(idList);
         return Response.success();
     }
 
-    @ApiOperation(value = "获取所有affiliate用户名")
+    @Operation(summary = "获取所有affiliate用户名")
     @GetMapping("/getAllAffiliateUsername")
     public Response<List<Map<String, Object>>> getAllAffiliateUsername() {
         return Response.success(affiliateService.getAllAffiliateUsername());

src/main/java/com/ai/da/controller/AliPayController.java

@@ -3,27 +3,27 @@ package com.ai.da.controller;
 import com.ai.da.common.response.Response;
 import com.ai.da.model.dto.ProductPurchaseDTO;
 import com.ai.da.service.AliPayService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 import java.util.Map;
 
 @CrossOrigin
 @RestController
 @RequestMapping("/api/ali-pay")
-@Api(tags = "网站支付宝支付")
+@Tag(name = "网站支付宝支付")
 @Slf4j
 public class AliPayController {
 
     @Resource
     private AliPayService aliPayService;
 
-    @ApiOperation("统一收单下单并支付页面接口的调用")
+    @Operation(summary = "统一收单下单并支付页面接口的调用")
     @PostMapping("/trade/page/pay")
     public Response<String> tradePagePay(@Valid @RequestBody ProductPurchaseDTO productPurchaseDTO, HttpServletRequest request){
         log.info("统一收单下单并支付页面接口的调用");
@@ -35,7 +35,7 @@ public class AliPayController {
         return Response.success(formStr);
     }
 
-    @ApiOperation("支付通知")
+    @Operation(summary = "支付通知")
     @PostMapping("/trade/notify")
     public String tradeNotify(@RequestParam Map<String, String> params){
         return aliPayService.tradeNotify(params);
@@ -46,7 +46,7 @@ public class AliPayController {
      * @param orderNo
      * @return
      */
-    @ApiOperation("用户取消订单")
+    @Operation(summary = "用户取消订单")
     @PostMapping("/trade/close/{orderNo}")
     public Response<String> cancel(@PathVariable String orderNo){
         log.info("取消订单");
@@ -59,7 +59,7 @@ public class AliPayController {
      * @param orderNo
      * @return
      */
-    @ApiOperation("查询订单：测试订单状态用")
+    @Operation(summary = "查询订单：测试订单状态用")
     @GetMapping("/trade/query/{orderNo}")
     public Response<String> queryOrder(@PathVariable String orderNo)  {
         log.info("查询订单");
@@ -74,7 +74,7 @@ public class AliPayController {
      * @param reason
      * @return
      */
-    @ApiOperation("申请退款")
+    @Operation(summary = "申请退款")
     @PostMapping("/trade/refund/{orderNo}/{reason}")
     public Response<String> refunds(@PathVariable String orderNo, @PathVariable String reason){
         log.info("申请退款");
@@ -88,7 +88,7 @@ public class AliPayController {
      * @return
      * @throws Exception
      */
-    @ApiOperation("查询退款：测试用")
+    @Operation(summary = "查询退款：测试用")
     @GetMapping("/trade/fastpay/refund/{orderNo}")
     public Response<String> queryRefund(@PathVariable String orderNo) {
         log.info("查询退款");
@@ -103,7 +103,7 @@ public class AliPayController {
      * @param type
      * @return
      */
-    @ApiOperation("获取账单url")
+    @Operation(summary = "获取账单url")
     @GetMapping("/bill/downloadurl/query/{billDate}/{type}")
     public Response<String> queryTradeBill(
             @PathVariable String billDate,

src/main/java/com/ai/da/controller/AlipayHKController.java

@@ -3,40 +3,40 @@ package com.ai.da.controller;
 import com.ai.da.common.response.Response;
 import com.ai.da.model.dto.ProductPurchaseDTO;
 import com.ai.da.service.AlipayHKService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 
 @CrossOrigin
 @RestController
 @RequestMapping("/api/alipay-hk")
-@Api(tags = "网站支付 香港支付宝")
+@Tag(name = "网站支付 香港支付宝")
 @Slf4j
 public class AlipayHKController {
 
     @Resource
     private AlipayHKService alipayHKService;
 
-    @ApiOperation(value = "创建订单")
+    @Operation(summary = "创建订单")
     @PostMapping(value = "/createOrder")
     public Response<String> createOrder(@Valid @RequestBody ProductPurchaseDTO productPurchaseDTO, HttpServletRequest request) {
         String order = alipayHKService.createOrder(productPurchaseDTO, request);
         return Response.success(order);
     }
 
-    @ApiOperation("支付通知")
+    @Operation(summary = "支付通知")
     @PostMapping("/trade/notify")
     public String callback(@RequestBody String paramString){
         log.info("alipay-hk callback parameter : {}", paramString);
         return alipayHKService.callback(paramString);
     }
 
-    @ApiOperation("订单查询")
+    @Operation(summary = "订单查询")
     @PostMapping("/trade/query/{orderRef}")
     public Response<String> queryOrder(@PathVariable String orderRef){
         String s = alipayHKService.queryDetail(orderRef);

src/main/java/com/ai/da/controller/ClassificationController.java

@@ -5,15 +5,14 @@ import com.ai.da.model.dto.ClassificationDTO;
 import com.ai.da.model.vo.ClassificationVO;
 import com.ai.da.service.ClassificationService;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 
 /**
@@ -26,7 +25,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @RequestMapping("/api/classification")
-@Api(value = "", tags = "分类")
+@Tag(name = "分类")
 public class ClassificationController {
 
     @Resource
@@ -37,7 +36,7 @@ public class ClassificationController {
      */
     @PostMapping("/saveOrUpdate")
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "新增修改", notes = "传入ClassificationDTO")
+    @Operation(summary = "新增修改", description = "传入ClassificationDTO")
     public Response<Boolean> saveOrUpdate(@Valid @RequestBody ClassificationDTO classificationDTO) {
         return Response.success(classificationService.saveOrUpdate(classificationDTO));
     }
@@ -47,28 +46,28 @@ public class ClassificationController {
      */
     @PostMapping("/delete")
     @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "删除", notes = "传入ClassificationDTO")
+    @Operation(summary = "删除", description = "传入ClassificationDTO")
     public Response<Boolean> delete(@Valid @RequestBody ClassificationDTO classificationDTO) {
         return Response.success(classificationService.delete(classificationDTO));
     }
 
     @PostMapping("/queryClassification")
     @ApiOperationSupport(order = 3)
-    @ApiModelProperty(value = "查询", notes = "传入ClassificationDTO")
+    @Operation(summary = "查询", description = "传入ClassificationDTO")
     public Response<List<ClassificationVO>> queryClassification(@Valid @RequestBody ClassificationDTO classificationDTO) {
         return Response.success(classificationService.queryClassification(classificationDTO));
     }
 
     @PostMapping("/relationLibrary")
     @ApiOperationSupport(order = 4)
-    @ApiModelProperty(value = "关联", notes = "传入ClassificationDTO")
+    @Operation(summary = "关联", description = "传入ClassificationDTO")
     public Response<Boolean> relationLibrary(@Valid @RequestBody ClassificationDTO classificationDTO) {
         return Response.success(classificationService.relationLibrary(classificationDTO));
     }
 
     @PostMapping("/getRelClassificationIdList")
     @ApiOperationSupport(order = 5)
-    @ApiModelProperty(value = "获取关联分类IDList", notes = "传入ClassificationDTO")
+    @Operation(summary = "获取关联分类IDList", description = "传入ClassificationDTO")
     public Response<List<Long>> getRelClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
         return Response.success(classificationService.getRelClassificationIdList(classificationDTO));
     }
@@ -80,7 +79,7 @@ public class ClassificationController {
      */
     @PostMapping("/getRelPublicClassificationIdList")
     @ApiOperationSupport(order = 5)
-    @ApiModelProperty(value = "获取关联公共分类IDList", notes = "传入ClassificationDTO")
+    @Operation(summary = "获取关联公共分类IDList", description = "传入ClassificationDTO")
     public Response<List<Long>> getRelPublicClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
         return Response.success(classificationService.getRelPublicClassificationIdList(classificationDTO));
     }
@@ -92,7 +91,7 @@ public class ClassificationController {
      */
     @PostMapping("/editRelPublicClassificationIdList")
     @ApiOperationSupport(order = 5)
-    @ApiModelProperty(value = "编辑关联公共分类IDList", notes = "传入ClassificationDTO")
+    @Operation(summary = "编辑关联公共分类IDList", description = "传入ClassificationDTO")
     public Response<Boolean> editRelPublicClassificationIdList(@Valid @RequestBody ClassificationDTO classificationDTO) {
         return Response.success(classificationService.editRelPublicClassificationIdList(classificationDTO));
     }

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -17,20 +17,20 @@ import com.ai.da.service.AccountService;
 import com.ai.da.service.ConvenientInquiryService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.netty.util.internal.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Nullable;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Api(tags = "便利查询")
+@Tag(name = "便利查询")
 @Slf4j
 @RestController
 @RequestMapping("/api/inquiry")
@@ -43,13 +43,13 @@ public class ConvenientInquiryController {
     private AccountService accountService;
 
 
-    @ApiOperation("获取当前所有试用用户")
+    @Operation(summary = "获取当前所有试用用户")
     @PostMapping("/getTrial")
     public Response<IPage<TrialOrder>> getTrial(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
         return Response.success(convenientInquiryService.getTrial(queryUserConditionsVO));
     }
 
-    @ApiOperation("获取指定时间区间内所有用户design的使用情况")
+    @Operation(summary = "获取指定时间区间内所有用户design的使用情况")
     @GetMapping("/getDesignStatistic")
     public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime,
                                                                      @RequestParam(required = false) List<Long> ids, @RequestParam(required = false) String email,
@@ -81,68 +81,68 @@ public class ConvenientInquiryController {
 
 
     //调查问卷
-    @ApiOperation("获取调查问卷统计详情")
+    @Operation(summary = "获取调查问卷统计详情")
     @GetMapping("/getQuestionnaireStatistic")
     public Response<QuestionnaireFeedbackVO> getQuestionnaire() {
         return Response.success(convenientInquiryService.getQuestionnaireInfo());
     }
 
-    @ApiOperation("获取所有调查问卷")
+    @Operation(summary = "获取所有调查问卷")
     @GetMapping("/getAllQuestionnaire")
     public Response<List<QuestionnaireVO>> getAllQuestionnaire() {
         return Response.success(convenientInquiryService.getAllQuestionnaire());
     }
 
-    @ApiOperation("获取近期新用户")
+    @Operation(summary = "获取近期新用户")
     @PostMapping("/recentNewUser")
     public Response<IPage<Account>> recentNewUser(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
         return Response.success(convenientInquiryService.recentNewUser(queryUserConditionsVO));
     }
 
-    @ApiOperation("获取近期新用户图表数据")
+    @Operation(summary = "获取近期新用户图表数据")
     @GetMapping("/recentNewUserChart")
-    public Response<Map<String, Object>> recentNewUserChart(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
-                                                            @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
-                                                            @ApiParam("userType") @RequestParam Integer userType) {
+    public Response<Map<String, Object>> recentNewUserChart(@Parameter(description = "startTime") @RequestParam @Nullable String startTime,
+                                                            @Parameter(description = "endTime") @RequestParam @Nullable String endTime,
+                                                            @Parameter(description = "userType") @RequestParam @Nullable Integer userType) {
         return Response.success(convenientInquiryService.recentNewUserChart(startTime, endTime, userType));
     }
 
-    @ApiOperation("获取近期活跃用户")
+    @Operation(summary = "获取近期活跃用户")
     @PostMapping("/recentActiveUser")
     public Response<IPage<Account>> recentActiveUser(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
         return Response.success(convenientInquiryService.recentActiveUser(queryUserConditionsVO));
     }
 
-    @ApiOperation("获取近期活跃用户图表数据")
+    @Operation(summary = "获取近期活跃用户图表数据")
     @GetMapping("/recentActiveUserChart")
-    public Response<Integer> recentActiveUserChart(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
-                                                   @ApiParam(value = "endTime") @RequestParam @Nullable String endTime) {
+    public Response<Integer> recentActiveUserChart(@Parameter(description = "startTime") @RequestParam @Nullable String startTime,
+                                                   @Parameter(description = "endTime") @RequestParam @Nullable String endTime) {
         return Response.success(convenientInquiryService.recentActiveUserChart(startTime, endTime));
     }
 
-    @ApiOperation("获取用户的各模块功能使用详情")
+    @Operation(summary = "获取用户的各模块功能使用详情")
     @GetMapping("/getActiveUserFunc")
-    public Response<Map<String, List<Object>>> getActiveUserFunc(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
-                                                                 @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
-                                                                 @ApiParam("userIdList") @RequestParam(required = false) @Nullable List<Long> userIdList) {
+    public Response<Map<String, List<Object>>> getActiveUserFunc(@Parameter(description = "startTime") @RequestParam @Nullable String startTime,
+                                                                 @Parameter(description = "endTime") @RequestParam @Nullable String endTime,
+                                                                 @Parameter(description = "userIdList") @RequestParam(required = false) @Nullable List<Long> userIdList) {
         return Response.success(convenientInquiryService.getActiveUserFunc(startTime, endTime, userIdList));
     }
 
-    @ApiOperation("试用用户到正式用户的转化率")
+    @Operation(summary = "试用用户到正式用户的转化率")
     @GetMapping("/conversionRate")
-    public Response<Map<String, Object>> conversionRate(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
-                                                        @ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
+    public Response<Map<String, Object>> conversionRate(@Parameter(description = "startTime") @RequestParam(required = false) @Nullable String startTime,
+                                                        @Parameter(description = "endTime") @RequestParam(required = false) @Nullable String endTime) {
         return Response.success(convenientInquiryService.conversionRate(startTime, endTime));
     }
 
-    @ApiOperation("试用用户国家/城市分布")
+    @Operation(summary = "试用用户国家/城市分布")
     @GetMapping("/trialUserCountry")
-    public Response<Map<String, List<Object>>> trialUserCountry(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
-                                                                @ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
+    public Response<Map<String, List<Object>>> trialUserCountry(@Parameter(description = "startTime") @RequestParam(required = false) @Nullable String startTime,
+                                                                @Parameter(description = "endTime") @RequestParam(required = false) @Nullable String endTime) {
         return Response.success(convenientInquiryService.trialUserCountry(startTime, endTime));
     }
 
-    @ApiOperation("添加用户")
+    @Operation(summary = "添加用户")
     @PostMapping("/addUser")
     public Response<Boolean> addUser(@Valid @RequestBody AccountAddDTO accountAddDTO) {
         Long userAccountId = UserContext.getUserHolder().getId();
@@ -155,12 +155,12 @@ public class ConvenientInquiryController {
         }
     }
 
-    @ApiOperation("修改用户信息")
+    @Operation(summary = "修改用户信息")
     @PostMapping("/modifyUser")
-    public Response<Boolean> modifyUser(@ApiParam(value = "用户id") @RequestParam @Nullable Long accountId,
-                                        @ApiParam(value = "有效期截止时间的毫秒级unix格式") @RequestParam @Nullable Long validEndTime,
-                                        @ApiParam(value = "用户类型 1/2/3/0 -> yearly/monthly/trial/visitor") @RequestParam @Nullable Integer systemUser,
-                                        @ApiParam("积分") @RequestParam @Nullable Long credits) {
+    public Response<Boolean> modifyUser(@Parameter(description = "用户id") @RequestParam @Nullable Long accountId,
+                                        @Parameter(description = "有效期截止时间的毫秒级unix格式") @RequestParam @Nullable Long validEndTime,
+                                        @Parameter(description = "用户类型 1/2/3/0 -> yearly/monthly/trial/visitor") @RequestParam @Nullable Integer systemUser,
+                                        @Parameter(description = "积分") @RequestParam @Nullable Long credits) {
         Long userAccountId = UserContext.getUserHolder().getId();
         if (userAccountId.equals(31L) || userAccountId.equals(87L) || userAccountId.equals(83L)
                 || userAccountId.equals(6L) || userAccountId.equals(4L) || userAccountId.equals(73L)
@@ -171,56 +171,58 @@ public class ConvenientInquiryController {
         }
     }
 
-    @ApiOperation("获取用户信息")
+    @Operation(summary = "获取用户信息")
     @PostMapping("/getUserInfo")
     public Response<IPage<Account>> getUserInfo(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
         return Response.success(convenientInquiryService.getUserInfo(queryUserConditionsVO));
     }
 
-    @ApiOperation("获取所有用户id")
+    @Operation(summary = "获取所有用户id")
     @GetMapping("/getAllUserId")
-    public Response<List<Map<String, Object>>> getAllUsrIdList() {
-        return Response.success(convenientInquiryService.getAllUserIdList());
+    public Response<IPage<Map<String, Object>>> getAllUserIdList(@Parameter(description = "page") @RequestParam Integer page,
+                                                                 @Parameter(description = "size") @RequestParam  Integer size,
+                                                                 @Parameter(description = "email 模糊查询") @RequestParam(required = false)  String email) {
+        return Response.success(convenientInquiryService.getAllUserIdList(page, size, email));
     }
 
-    @ApiOperation("获取所有交易信息")
+    @Operation(summary = "获取所有交易信息")
     @PostMapping("/queryTransaction")
     public Response<PageBaseResponse<PaymentInfoVO>>  queryTransactionRecords(@Valid @RequestBody QueryPaymentInfoDTO queryPaymentInfoDTO){
         return Response.success(convenientInquiryService.queryTransactionRecords(queryPaymentInfoDTO));
     }
 
-    @ApiOperation("获取所有国家、城市")
+    @Operation(summary = "获取所有国家、城市")
     @GetMapping("/getCities")
     public Response<Map<String, List<String>>> getCities(){
         return Response.success(convenientInquiryService.getCities());
     }
 
-    @ApiOperation("下载交易记录")
+    @Operation(summary = "下载交易记录")
     @PostMapping("/queryTransaction/download")
     public Response<String> exportTransactionRecords(@Valid @RequestBody QueryPaymentInfoDTO queryPaymentInfoDTO, HttpServletResponse response){
         return Response.success(convenientInquiryService.exportTransactionRecords(queryPaymentInfoDTO, response));
     }
 
-    @ApiOperation("获取生成功能使用频次")
+    @Operation(summary = "获取生成功能使用频次")
     @PostMapping("/getGenerateFrequency")
     public Response<PageBaseResponse<AccountCreditsUsageDTO>> getGenerateFrequency(@Valid @RequestBody AccountCreditsUsageQueryDTO queryDTO){
        return Response.success(convenientInquiryService.getGenerateFrequency(queryDTO));
     }
 
-    @ApiOperation("获取所有生成功能的名字")
+    @Operation(summary = "获取所有生成功能的名字")
     @GetMapping("/getAllGenerateFuncName")
     public Response<List<String>> getAllGenerateFuncName(){
         return Response.success(convenientInquiryService.getAllGenerateFuncName());
     }
 
-    @ApiOperation("添加组织机构")
+    @Operation(summary = "添加组织机构")
     @GetMapping("/addOrganization")
-    public Response<String> addOrganization(@ApiParam(value = "机构名") @RequestParam String name, @ApiParam(value = "Enterprise || Education") @RequestParam String type){
+    public Response<String> addOrganization(@Parameter(description = "机构名") @RequestParam String name, @Parameter(description = "Enterprise || Education") @RequestParam String type){
         convenientInquiryService.addOrganization(name, type);
         return Response.success();
     }
 
-    @ApiOperation("查询所有企业或教育机构")
+    @Operation(summary = "查询所有企业或教育机构")
     @PostMapping("/queryOrganization")
     public Response<IPage<Organization>> queryOrganization(@RequestBody QueryOrganizationPageDTO queryOrganizationPageDTO){
         return Response.success(convenientInquiryService.queryOrganization(queryOrganizationPageDTO));

src/main/java/com/ai/da/controller/CreditsController.java

@@ -6,32 +6,32 @@ import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.entity.CreditsDetail;
 import com.ai.da.model.dto.QueryIncomeOrExpenditureDTO;
 import com.ai.da.service.CreditsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 
 @CrossOrigin
 @RestController
 @RequestMapping("/api/credits")
-@Api(tags = "积分")
+@Tag(name = "积分")
 @Slf4j
 public class CreditsController {
 
     @Resource
     private CreditsService creditsService;
 
-    @ApiOperation("获取当前积分")
+    @Operation(summary = "获取当前积分")
     @GetMapping("/getCredits")
     public Response<String> getCredits() {
         String credits = creditsService.getCredits(UserContext.getUserHolder().getId());
         return Response.success(credits);
     }
 
-    @ApiOperation("获取积分详细")
+    @Operation(summary = "获取积分详细")
     @PostMapping("/getCreditsDetail")
     public Response<PageBaseResponse<CreditsDetail>> getCreditsDetail(@Valid @RequestBody QueryIncomeOrExpenditureDTO queryPageByTimeDTO) {
         PageBaseResponse<CreditsDetail> credits = creditsService.queryCreditsDetailsPage(queryPageByTimeDTO);

src/main/java/com/ai/da/controller/DesignController.java

@@ -9,20 +9,19 @@ import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.DesignService;
 import com.ai.da.service.UserLikeGroupService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.math.BigDecimal;
 import java.util.List;
 
 
-@Api(tags = "design模块")
+@Tag(name = "design模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/design")
@@ -32,98 +31,98 @@ public class DesignController {
     @Resource
     private UserLikeGroupService userLikeGroupService;
 
-    @ApiOperation(value = "设计 Conllection")
+    @Operation(summary = "设计 Conllection")
     @PostMapping("/designCollection")
     @CrossOrigin
     public Response<String> designCollection(@Valid @RequestBody DesignCollectionDTO designDTO) {
         return Response.success(designService.designCollection(designDTO));
     }
 
-    @ApiOperation(value = "design进度条")
+    @Operation(summary = "design进度条")
     @GetMapping("/designProcess")
     public Response<Integer> designProcess(@RequestParam("processId") String processId) {
         return Response.success(designService.designProcess(processId));
     }
 
-    @ApiOperation(value = "重新设计 Collection")
+    @Operation(summary = "重新设计 Collection")
     @PostMapping("/reDesignCollection")
     public Response<String> reDesignCollection(@Valid @RequestBody ReDesignCollectionDTO reDesignDTO) {
         return Response.success(designService.reDesignCollection(reDesignDTO));
     }
 
-    @ApiOperation(value = "designItem list,刷新用")
+    @Operation(summary = "designItem list,刷新用")
     @GetMapping("/designItemList")
-    public Response<DesignCollectionVO> designItemList(@ApiParam("designId") @RequestParam("designId") Long designId) {
+    public Response<DesignCollectionVO> designItemList(@Parameter(description = "designId") @RequestParam("designId") Long designId) {
         return Response.success(designService.designItemList(designId));
     }
 
-    @ApiOperation(value = "统计design进度")
+    @Operation(summary = "统计design进度")
     @PostMapping("/countDesignProcess")
     public Response<BigDecimal> countDesignProcess() {
         return Response.success(designService.countDesignProcess());
     }
 
-    @ApiOperation(value = "Design Like")
+    @Operation(summary = "Design Like")
     @PostMapping("/like")
     public Response<DesignLikeVO> like(@Valid @RequestBody DesignLikeDTO designLikeDTO) {
         return Response.success(designService.like(designLikeDTO));
     }
 
-    @ApiOperation(value = "Design Dislike")
+    @Operation(summary = "Design Dislike")
     @PostMapping("/dislike")
     public Response<Boolean> dislike(@Valid @RequestBody DisDesignLikeDTO disDesignLikeDTO) {
         return Response.success(designService.dislike(disDesignLikeDTO));
     }
 
-    @ApiOperation(value = "Design sort")
+    @Operation(summary = "Design sort")
     @PostMapping("/sort")
     public Response<Boolean> sort(@Valid @RequestBody CollectionSortDTO userLikeSortDTO) {
         return Response.success(designService.sort(userLikeSortDTO));
     }
 
-    @ApiOperation(value = "sketchBoard upload generate design前裁剪")
+    @Operation(summary = "sketchBoard upload generate design前裁剪")
     @PostMapping("/sketchBoardsBoundingBox")
     public Response<List<CollectionSketchVO>> sketchesBoundingBox(@Valid @RequestBody ReDesignCollectionDTO reDesignCollectionDTO) {
         return Response.success(designService.sketchesBoundingBox(reDesignCollectionDTO));
     }
 
-    @ApiOperation(value = "通过designItemId获取模特图")
+    @Operation(summary = "通过designItemId获取模特图")
     @PostMapping("/getModel")
     public Response<List<String>> getModel(@RequestBody List<Long> designItemIdList){
         return Response.success(designService.getModel(designItemIdList));
     }
 
-    @ApiOperation(value = "获取design结果")
+    @Operation(summary = "获取design结果")
     @GetMapping("/getDesignResult")
     public Response<DesignCollectionVO> getDesignResult(@RequestParam("requestId") String requestId, @RequestParam("objectSignList") List<String> objectSignList){
         return Response.success(designService.getDesignResult(requestId, objectSignList));
     }
 
-    @ApiOperation(value = "云生成")
+    @Operation(summary = "云生成")
     @PostMapping("/designCloud")
     public Response<String> designCloud(@Valid @RequestBody CloudTaskDTO cloudTaskDTO) {
         return Response.success(designService.designCloud(cloudTaskDTO));
     }
 
-    @ApiOperation(value = "云生成修改任务名")
+    @Operation(summary = "云生成修改任务名")
     @PostMapping("/cloudTaskNameUpdate")
     public Response<Boolean> cloudTaskNameUpdate(@Valid @RequestBody CloudTaskDTO cloudTaskDTO) {
         return Response.success(designService.cloudTaskNameUpdate(cloudTaskDTO));
     }
 
-    @ApiOperation(value = "云生成删除任务")
+    @Operation(summary = "云生成删除任务")
     @PostMapping("/cloudTaskDelete")
     public Response<Boolean> cloudTaskDelete(@Valid @RequestBody CloudTaskDTO cloudTaskDTO) {
         return Response.success(designService.cloudTaskDelete(cloudTaskDTO));
     }
 
-    @ApiOperation(value = "云生成page")
+    @Operation(summary = "云生成page")
     @PostMapping("/cloudPage")
     public Response<PageBaseResponse<CloudTaskVO>> cloudPage(@Valid @RequestBody CloudPageDTO cloudPageDTO) {
         return Response.success(PageBaseResponse.success(designService.cloudPage(cloudPageDTO)));
     }
 
-    @ApiOperation(value = "获取design云生成结果")
+    @Operation(summary = "获取design云生成结果")
     @PostMapping("/getDesignCloudResult")
     public Response<CloudTaskResultVO> getDesignCloudResult(@Valid @RequestBody DesignCloudResultQuery designCloudResultQuery) {
         return Response.success(designService.getDesignCloudResult(designCloudResultQuery));

src/main/java/com/ai/da/controller/DesignDetailController.java

@@ -5,18 +5,18 @@ import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.DesignItemService;
 import com.ai.da.service.DesignService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.io.IOException;
 
 
-@Api(tags = "design Detail模块")
+@Tag(name = "design Detail模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/design/detail")
@@ -26,7 +26,7 @@ public class DesignDetailController {
     @Resource
     private DesignItemService designItemService;
 
-    @ApiOperation(value = "生成高级design图片")
+    @Operation(summary = "生成高级design图片")
     @PostMapping("/generateHighDesign")
     public Response<String> generateHighDesign(@Valid @RequestBody GenerateHighDesignDTO generateHighDesignDTO) {
         Response response = new Response();
@@ -34,7 +34,7 @@ public class DesignDetailController {
         return response;
     }
 
-    @ApiOperation(value = "删除高级design图片")
+    @Operation(summary = "删除高级design图片")
     @PostMapping("/deleteHighDesign")
     public Response<Boolean> deleteHighDesign(@Valid @RequestBody GenerateHighDesignDTO generateHighDesignDTO) {
         Response response = new Response();
@@ -42,28 +42,28 @@ public class DesignDetailController {
         return response;
     }
 
-    @ApiOperation(value = "查询design详情")
+    @Operation(summary = "查询design详情")
     @GetMapping("/getDetail")
-    public Response<DesignItemDetailVO> getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId,
-                                                  @ApiParam("designPythonOutfitId") @RequestParam(value = "designPythonOutfitId", required = false) Long designPythonOutfitId) {
+    public Response<DesignItemDetailVO> getDetail(@Parameter(description = "designItemId") @RequestParam("designItemId") Long designItemId,
+                                                  @Parameter(description = "designPythonOutfitId") @RequestParam(value = "designPythonOutfitId", required = false) Long designPythonOutfitId) {
         return Response.success(designService.detail(designPythonOutfitId, designItemId));
     }
 
-    @ApiOperation(value = "切换系统的element")
+    @Operation(summary = "切换系统的element")
     @GetMapping("/getNextSysElement")
-    public Response<GetNextSysElementVO> getNextSysElement(@ApiParam("要切换的系统element 类型") @RequestParam("type") String type,
-                                                           @ApiParam("要切换的系统element id") @RequestParam("id") Long id,
-                                                           @ApiParam("操作类型 PREV 上一步  NEXT 下一步") @RequestParam("operateType") String operateType) {
+    public Response<GetNextSysElementVO> getNextSysElement(@Parameter(description = "要切换的系统element 类型") @RequestParam("type") String type,
+                                                           @Parameter(description = "要切换的系统element id") @RequestParam("id") Long id,
+                                                           @Parameter(description = "操作类型 PREV 上一步  NEXT 下一步") @RequestParam("operateType") String operateType) {
         return Response.success(designItemService.getNextSysElement(id, type, operateType));
     }
 
-    @ApiOperation(value = "单个design")
+    @Operation(summary = "单个design")
     @PostMapping("/designSingle")
     public Response<DesignSingleVO> designSingle(@Valid @RequestBody DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) {
         return Response.success(designItemService.designSingleIncludeLayers(designSingleIncludeLayersDTO));
     }
 
-    @ApiOperation(value = "print打点")
+    @Operation(summary = "print打点")
     @PostMapping("/printDot")
     public Response<String> printDot(@Valid @RequestBody DesignSingleDTO designSingleDTO) {
         Response<String> response = new Response();
@@ -72,20 +72,20 @@ public class DesignDetailController {
         return response;
     }
 
-    @ApiOperation(value = "编辑图层大小和位置  废弃")
+    @Operation(summary = "编辑图层大小和位置  废弃")
     @PostMapping("/editLayers")
     public Response<ComposeLayersVO> editPositionAndScale(@Valid @RequestBody EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException {
         return Response.success(designItemService.editLayersPositionAndScale(positionAndScaleVO));
     }
 
-    @ApiOperation(value = "mask数据兼容")
+    @Operation(summary = "mask数据兼容")
     @GetMapping("/convertWithoutGradient")
     public Response<String> convertHistoryMaskWithoutGradient(){
         designItemService.convertHistoryMaskWithoutGradient();
         return Response.success("success");
     }
 
-    @ApiOperation(value = "mask数据库路径更新")
+    @Operation(summary = "mask数据库路径更新")
     @GetMapping("/updateMaskUrl")
     public Response<String> updateMaskUrl(){
         designItemService.updateMaskUrl();

src/main/java/com/ai/da/controller/ElementController.java

@@ -8,23 +8,23 @@ import com.ai.da.model.vo.*;
 import com.ai.da.service.CollectionElementService;
 import com.ai.da.service.PanToneService;
 import com.ai.da.service.SysFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import javax.validation.constraints.Pattern;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Pattern;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 
-@Api(tags = "collection模块")
+@Tag(name = "collection模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/element")
@@ -37,7 +37,7 @@ public class ElementController {
     @Resource
     private SysFileService sysFileService;
 
-    @ApiOperation(value = "初始化系统文件")
+    @Operation(summary = "初始化系统文件")
     @PostMapping("/initDefaultSysFile")
     public Response<Boolean> initDefaultSysFile(@RequestParam("validate") String validateUse) {
         if (validateUse.equals("da_fl_mm_dad88888")) {
@@ -47,15 +47,15 @@ public class ElementController {
         return Response.success();
     }
 
-    @ApiOperation(value = "element文件上传")
+    @Operation(summary = "element文件上传")
     @PostMapping("/upload")
     public Response<CollectionElementVO> upload(@RequestParam("file") MultipartFile file,
-                                                @ApiParam("一级类型 Moodboard Printboard  Sketchboard MarketingSketch Colorboard")
+                                                @Parameter(description = "一级类型 Moodboard Printboard  Sketchboard MarketingSketch Colorboard")
                                                 @RequestParam(value = "level1Type") String level1Type,
                                                 @RequestParam(name = "gender", required = false) String gender,
                                                 @RequestParam(name = "level2Type", required = false) String level2Type,
                                                 @RequestParam(name = "projectId", required = false) Long projectId,
-                                                @ApiParam("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
+                                                @Parameter(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
                                                 @RequestParam(value = "timeZone") String timeZone) {
         if (null == file || StringUtils.isEmpty(file.getOriginalFilename())) {
             throw new BusinessException("file.cannot.be.empty");
@@ -64,7 +64,7 @@ public class ElementController {
                 new CollectionElementUploadDTO(file, projectId, level1Type, level2Type, gender, timeZone, MD5Utils.encryptFile(file))));
     }
 
-    @ApiOperation(value = "element文件删除")
+    @Operation(summary = "element文件删除")
     @PostMapping("/delete")
     public Response<Boolean> delete(@Valid @RequestBody CollectionDeleteFileDTO deleteFileDTO) {
         collectionElementService.delete(deleteFileDTO.getId());
@@ -73,45 +73,45 @@ public class ElementController {
 
     /** 该功能已删除  */
     @Deprecated
-    @ApiOperation(value = "生成印花")
+    @Operation(summary = "生成印花")
     @PostMapping("/generatePrint")
     public Response<GenerateCollectionItemVO> generatePrint(@Valid @RequestBody CollectionGeneratePrintDTO generatePrintDTO) {
         return Response.success(collectionElementService.generatePrint(generatePrintDTO));
     }
 
-    @ApiOperation(value = "保存印花")
+    @Operation(summary = "保存印花")
     @PostMapping("/savePrint")
     public Response<Boolean> savePrint(@Valid @RequestBody CollectionSavePrintDTO savePrintDTO) {
         return Response.success(collectionElementService.savePrint(savePrintDTO));
     }
 
-    @ApiOperation(value = "通过tcx值获取潘通信息")
+    @Operation(summary = "通过tcx值获取潘通信息")
     @GetMapping("/getRgbByTcx")
-    public Response<PantoneVO> getRgbByHsv(@ApiParam("tcx") @RequestParam("tcx") String tcx) {
+    public Response<PantoneVO> getRgbByHsv(@Parameter(description = "tcx") @RequestParam("tcx") String tcx) {
         return Response.success(panToneService.getByTCX(tcx));
     }
 
-    @ApiOperation(value = "通过hsv值获取潘通信息")
+    @Operation(summary = "通过hsv值获取潘通信息")
     @GetMapping("/getRgbByHsv")
     public Response<PantoneVO> getRgbByHsv(@RequestParam("h") Integer h,
                                            @RequestParam("s") Integer s, @RequestParam("v") Integer v) {
         return Response.success(panToneService.getByHSV(h, s, v));
     }
 
-    @ApiOperation(value = "通过hsv值数组批量获取潘通信息")
+    @Operation(summary = "通过hsv值数组批量获取潘通信息")
     @PostMapping("/getRgbByHsvBatch")
     public Response<List<PantoneVO>> getRgbByHsvBatch(@RequestBody @Valid List<GetRgbByHsvBatchDTO> rgbByHsvBatch) {
         return Response.success(panToneService.getRgbByHsvBatch(rgbByHsvBatch));
     }
 
-    @ApiOperation(value = "刷新历史数据")
+    @Operation(summary = "刷新历史数据")
     @PostMapping("/refreshHistoryData")
     public Response<Boolean> refreshHistoryData() {
         collectionElementService.refreshHistoryData();
         return Response.success();
     }
 
-    @ApiOperation(value = "图片分割")
+    @Operation(summary = "图片分割")
     @PostMapping("/imageSegmentation")
     public Response<List<CollectionElementVO>> selectedImageSeg(
             @RequestPart(value = "file", required = false) MultipartFile[] file,
@@ -133,7 +133,7 @@ public class ElementController {
         return Response.success(collectionElementService.selectedImageSeg(nonEmptyFiles, id, type, sourceType));
     }
 
-    @ApiOperation(value = "更新element level2type")
+    @Operation(summary = "更新element level2type")
     @GetMapping("/updateElementLevel2Type")
     public Response<String> updateLibraryLevel2Type(@RequestParam(value = "elementId") Long elementId,  @RequestParam(value = "level2Type") String level2Type) {
         collectionElementService.updateElementLevel2Type(elementId, level2Type);

src/main/java/com/ai/da/controller/EmailController.java

@@ -2,17 +2,17 @@ package com.ai.da.controller;
 
 import com.ai.da.service.EmailService;
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.thymeleaf.context.Context;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collections;
 
-@Api(tags = "邮件模块")
+@Tag(name = "邮件模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/email")

src/main/java/com/ai/da/controller/GenerateController.java

@@ -6,23 +6,23 @@ import com.ai.da.mapper.primary.entity.CollectionSort;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.GenerateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 
 /**
  * @author XP
  */
-@Api(tags = "Generate模块")
+@Tag(name = "Generate模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/generate")
@@ -44,20 +44,20 @@ public class GenerateController {
         generateService.generateThroughImageText(generateThroughImageTextDTO);
     }*/
 
-    @ApiOperation("喜欢生成的图片")
+    @Operation(summary = "喜欢生成的图片")
     @PostMapping("/like")
     public Response<GenerateLikeVO> like(@Valid @RequestBody GenerateLikeDTO generateLikeDTO) {
         return Response.success(generateService.generateLike(generateLikeDTO));
     }
 
-    @ApiOperation(value = "取消喜欢")
+    @Operation(summary = "取消喜欢")
     @GetMapping("/dislike")
-    public Response<Boolean> dislike(@ApiParam("generateDetailId") @RequestParam Long generateDetailId,
-                                     @ApiParam("timeZone") @RequestParam String timeZone) {
+    public Response<Boolean> dislike(@Parameter(description = "generateDetailId") @RequestParam Long generateDetailId,
+                                     @Parameter(description = "timeZone") @RequestParam String timeZone) {
         return Response.success(generateService.generateDislike(generateDetailId, timeZone));
     }
 
-    @ApiOperation(value = "发起生成请求，异步获取结果")
+    @Operation(summary = "发起生成请求，异步获取结果")
     @PostMapping("/prepare")
     public ResponseEntity<Response<PrepareForGenerateVO>> prepareForGenerate(@Valid @RequestBody GenerateThroughImageTextDTO generateThroughImageTextDTO) {
         PrepareForGenerateVO prepareForGenerateVO = generateService.prepareForGenerate(generateThroughImageTextDTO);
@@ -69,7 +69,7 @@ public class GenerateController {
         }
     }
 
-    @ApiOperation(value = "取消继续生成")
+    @Operation(summary = "取消继续生成")
     @GetMapping("/stopWaiting")
     public Response<String> stopWaiting(@RequestParam("userId") Long userId,
                                         @RequestParam("uniqueId") List<String> uniqueId,
@@ -86,14 +86,14 @@ public class GenerateController {
         return Response.success(generateResult);
     }*/
 
-    @ApiOperation(value = "获取生成结果")
+    @Operation(summary = "获取生成结果")
     @PostMapping("/result")
     public Response<List<GenerateResultVO>> getGenerateResults(@Valid @RequestBody List<String> taskIdList) {
         List<GenerateResultVO> generateResult = generateService.getGenerateResultList(taskIdList);
         return Response.success(generateResult);
     }
 
-    @ApiOperation(value = "imageToSketch")
+    @Operation(summary = "imageToSketch")
     @PostMapping("/imageToSketch")
     public Response<String> imageToSketch(@Valid @RequestBody ImageToSketchDTO imageToSketchDTO) {
         return Response.success(generateService.imageToSketchAsync(imageToSketchDTO, null, null));
@@ -101,59 +101,59 @@ public class GenerateController {
     }
 
     // modifySketch
-    @ApiOperation(value = "modifySketch")
+    @Operation(summary = "modifySketch")
     @PostMapping("/modifySketch")
     public Response<GenerateResultVO> modifySketch(@Valid @RequestBody GenerateModifyDTO generateModifyDTO) {
         return Response.success(generateService.modifySketch(generateModifyDTO));
     }
 
-    @ApiOperation(value = "请求进行姿势变换")
+    @Operation(summary = "请求进行姿势变换")
     @PostMapping("/poseTransform")
     public Response<ToProductImageResultVO> poseTransform(@Valid @RequestBody PoseTransformDTO poseTransformDTO) {
         return Response.success(generateService.poseTransform(poseTransformDTO));
     }
 
-    @ApiOperation(value = "获取姿势变换生成结果")
+    @Operation(summary = "获取姿势变换生成结果")
     @PostMapping("/poseTransformResult")
     public Response<List<PoseTransformationVO>> getPoseTransformationResults(@Valid @RequestBody List<String> taskIdList) {
         List<PoseTransformationVO> generateResult = generateService.getPoseTransformationResult(taskIdList, null, null);
         return Response.success(generateResult);
     }
 
-    @ApiOperation("喜欢或取消喜欢姿势变换生成的图片")
+    @Operation(summary = "喜欢或取消喜欢姿势变换生成的图片")
     @PostMapping("/likeOrDislike")
-    public Response<CollectionSort> likeOrDislike(@ApiParam("id") @RequestParam Long transformedId, @ApiParam("like || dislike") @RequestParam String likeOrDislike, @RequestParam("projectId") Long projectId, @RequestParam(value = "collectionSortParentId", required = false) Long collectionSortParentId) {
+    public Response<CollectionSort> likeOrDislike(@Parameter(description = "id") @RequestParam Long transformedId, @Parameter(description = "like || dislike") @RequestParam String likeOrDislike, @RequestParam("projectId") Long projectId, @RequestParam(value = "collectionSortParentId", required = false) Long collectionSortParentId) {
         return Response.success(generateService.disOrLikePose(transformedId, likeOrDislike, projectId, collectionSortParentId));
     }
 
-    @ApiOperation(value = "修改模特比例")
+    @Operation(summary = "修改模特比例")
     @PostMapping("/modifyProportion")
     public Response<String> modifyModelProportion(@Valid @RequestBody ModifyModelProportionDTO proportionDTO){
         String path = generateService.modifyModelProportion(proportionDTO);
         return Response.success(path);
     }
 
-    @ApiOperation(value = "拼贴图生成线稿")
+    @Operation(summary = "拼贴图生成线稿")
     @PostMapping("/genSketchRecon")
     public Response<GenerateResultVO> sketchReconstructionGenerate(@Valid @RequestBody SketchReconstructionDTO sketchReconstructionDTO){
         GenerateResultVO generateResultVO = generateService.sketchReconstructionGenerate(sketchReconstructionDTO);
         return Response.success(generateResultVO);
     }
 
-    @ApiOperation(value = "获取拼贴图最后一次生成结果")
+    @Operation(summary = "获取拼贴图最后一次生成结果")
     @GetMapping("/getReconLastResult")
     public Response<SketchReconstructionVO> getSketchReconstruction(@RequestParam("projectId") Long projectId){
         SketchReconstructionVO sketchReconstruction = generateService.getSketchReconstruction(projectId);
         return Response.success(sketchReconstruction);
     }
 
-    @ApiOperation(value = "获取pose transfer的所有pose")
+    @Operation(summary = "获取pose transfer的所有pose")
     @GetMapping("/getAllPose")
     public Response<List<Map<String, String>>> getAllPose(){
         return Response.success(generateService.getAllPose());
     }
 
-    @ApiOperation(value = "删除pose transfer的结果")
+    @Operation(summary = "删除pose transfer的结果")
     @GetMapping("/deleteResult")
     public Response<String> deleteToProductRelightResult(@RequestParam("projectId") @NotNull Long projectId,
                                                          @RequestParam("id") @NotNull Long id){
@@ -171,31 +171,31 @@ public class GenerateController {
         return Response.success(generateService.createAsyncTask(87L, prompt, ""));
     }
 
-    @ApiOperation(value = "万象 t2i 获取异步任务结果")
+    @Operation(summary = "万象 t2i 获取异步任务结果")
     @GetMapping("/waitAsyncTask")
     public Response<GenerateResultVO> waitAsyncTask(@RequestParam("taskId") String taskId){
         return Response.success(generateService.getAsyncTaskResult(taskId));
     }
 
-    @ApiOperation(value = "万象 图生动图")
+    @Operation(summary = "万象 图生动图")
     @GetMapping("/animateAnyone")
     public Response<String> animateAnyone(@Valid @RequestBody PoseTransformDTO poseTransformDTO){
         return Response.success(generateService.animateAnyone(poseTransformDTO, null));
     }
 
-    @ApiOperation(value = "万象 获取动图模板id")
+    @Operation(summary = "万象 获取动图模板id")
     @GetMapping("/getVideoTemplateId")
     public Response<String> getVideoTemplateId(@RequestParam("videoPath") String videoPath){
         return Response.success(generateService.getVideoTemplateId(videoPath));
     }
 
-    @ApiOperation(value = "万象 获取动图结果")
+    @Operation(summary = "万象 获取动图结果")
     @GetMapping("/getAnimateResult")
     public Response<PoseTransformationVO> getAnimateResult(@RequestParam("taskId") String taskId){
         return Response.success(generateService.getAnimateResult(taskId));
     }
 
-    @ApiOperation(value = "freepik toProductImage")
+    @Operation(summary = "freepik toProductImage")
     @GetMapping("/reimagineFreePik")
     public Response<String> reimagineFreePik(@RequestParam("path") String path,
                                              @RequestParam("prompt") String prompt,
@@ -203,13 +203,13 @@ public class GenerateController {
         return Response.success(generateService.reimagineFreePik(path, prompt, style));
     }
 
-    @ApiOperation(value = "获取图片描述")
+    @Operation(summary = "获取图片描述")
     @GetMapping("/getImageDescription")
     public Response<String> getImageDescription(@RequestParam("path") String path) {
         return Response.success(generateService.getImageDescription(path));
     }*/
 
-//    @ApiOperation(value = "试用flux")
+//    @Operation(summary = "试用flux")
 //    @GetMapping("/flux")
     public Response<String> flux(@RequestParam(value = "path", required = false) String path,
                                  @RequestParam("type") int type,
@@ -229,7 +229,7 @@ public class GenerateController {
         return Response.success(generateService.flux(typeEnum, prompt, path, false));
     }
 
-//    @ApiOperation(value = "获取flux结果")
+//    @Operation(summary = "获取flux结果")
 //    @GetMapping("/fluxResult")
     public Response<String> fluxResult(@RequestParam("taskId") String taskId){
         return Response.success(generateService.getFluxResult(taskId, "87/" + taskId + ".png"));

src/main/java/com/ai/da/controller/GlobalAwardController.java

@@ -0,0 +1,203 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.*;
+import com.ai.da.model.dto.ContestantDTO;
+import com.ai.da.model.vo.CheckOTPVO;
+import com.ai.da.model.vo.ContestantCountVO;
+import com.ai.da.service.GlobalAwardService;
+import com.ai.da.service.upload.UploadService;
+import com.ai.da.service.upload.UploadTask;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/global-award")
+@Api(tags = "全球奖项API", description = "全球奖项大赛管理和文件上传")
+public class GlobalAwardController {
+
+    @Resource
+    private GlobalAwardService globalAwardService;
+
+    @Resource
+    private UploadService uploadService;
+
+//    @PostMapping("/uploads/pdf")
+//    public Response<String> uploadPdf(@RequestParam("file") MultipartFile file,
+//                                      @RequestParam(value = "email", required = false) String email) throws Exception {
+//        return Response.success(globalAwardService.uploadPdf(file, email));
+//    }
+//
+//    @PostMapping("/uploads/video")
+//    public Response<String> uploadVideo(@RequestParam("file") MultipartFile file,
+//                                        @RequestParam(value = "email", required = false) String email) throws Exception {
+//        return Response.success(globalAwardService.uploadVideo(file, email));
+//    }
+
+    // ===== 新增分片上传接口 =====
+
+    // ===== PDF分片上传接口 =====
+
+    /** 初始化PDF上传任务 */
+    @PostMapping("/uploads/pdf/init")
+    @ApiOperation(value = "初始化PDF上传", notes = "创建新的PDF上传任务并返回上传参数")
+    public Response<UploadInitResponse> initPdfUpload(@ApiParam(value = "PDF上传初始化请求", required = true) @RequestBody UploadInitRequest request) {
+        UploadTask uploadTask = uploadService.initPdfUpload(request);
+        return Response.success(UploadInitResponse.builder()
+                .uploadId(uploadTask.getUploadId())
+                .chunkSize(uploadTask.getChunkSize())
+                .totalChunks(uploadTask.getTotalChunks())
+                .expiresAt(uploadTask.getExpiresAt())
+                .build());
+    }
+
+    /** 上传PDF分片 */
+    @PostMapping("/uploads/pdf/chunk")
+    @ApiOperation(value = "上传PDF分片", notes = "上传PDF文件的单个分片")
+    public Response<UploadChunkResponse> uploadPdfChunk(
+            @ApiParam(value = "PDF文件分片", required = true) @RequestParam("chunk") MultipartFile chunk,
+            @ApiParam(value = "上传任务ID", required = true) @RequestParam("uploadId") String uploadId,
+            @ApiParam(value = "分片索引(从0开始)", required = true) @RequestParam("chunkIndex") int chunkIndex,
+            @ApiParam(value = "分片总数", required = true) @RequestParam("totalChunks") int totalChunks) {
+
+        UploadChunkResponse uploadChunkResponse = uploadService.uploadPdfChunk(uploadId, chunk, chunkIndex, totalChunks);
+        return Response.success(uploadChunkResponse);
+    }
+
+    /** 完成PDF上传 */
+    @PostMapping("/uploads/pdf/complete")
+    @ApiOperation(value = "完成PDF上传", notes = "完成PDF上传并合并所有分片")
+    public Response<UploadCompleteResponse> completePdfUpload(@ApiParam(value = "PDF上传完成请求", required = true) @RequestBody UploadCompleteRequest request) {
+        UploadCompleteResponse uploadCompleteResponse = uploadService.completePdfUpload(
+                request.getUploadId(),
+                request.getFileName(),
+                request.getTotalSize(),
+                request.getEmail(),
+                request.getSecureToken());
+        return Response.success(uploadCompleteResponse);
+    }
+
+    /** 查询PDF上传状态 */
+    @GetMapping("/uploads/pdf/status/{uploadId}")
+    @ApiOperation(value = "查询PDF上传状态", notes = "获取PDF上传任务的当前状态")
+    public Response<UploadStatusResponse> getPdfUploadStatus(@ApiParam(value = "上传任务ID", required = true) @PathVariable String uploadId) {
+        UploadStatusResponse pdfUploadStatus = uploadService.getPdfUploadStatus(uploadId);
+        return Response.success(pdfUploadStatus);
+    }
+
+    // ===== 视频分片上传接口 =====
+
+    /** 初始化视频上传任务 */
+    @PostMapping("/uploads/video/init")
+    @ApiOperation(value = "初始化视频上传", notes = "创建新的视频上传任务并返回上传参数")
+    public Response<UploadInitResponse> initVideoUpload(@ApiParam(value = "视频上传初始化请求", required = true) @RequestBody UploadInitRequest request) {
+        UploadTask uploadTask = uploadService.initVideoUpload(request);
+        return Response.success(UploadInitResponse.builder()
+                .uploadId(uploadTask.getUploadId())
+                .chunkSize(uploadTask.getChunkSize())
+                .totalChunks(uploadTask.getTotalChunks())
+                .expiresAt(uploadTask.getExpiresAt())
+                .build());
+    }
+
+    /** 上传视频分片 */
+    @PostMapping("/uploads/video/chunk")
+    @ApiOperation(value = "上传视频分片", notes = "上传视频文件的单个分片")
+    public Response<UploadChunkResponse> uploadVideoChunk(
+            @ApiParam(value = "视频文件分片", required = true) @RequestParam("chunk") MultipartFile chunk,
+            @ApiParam(value = "上传任务ID", required = true) @RequestParam("uploadId") String uploadId,
+            @ApiParam(value = "分片索引(从0开始)", required = true) @RequestParam("chunkIndex") int chunkIndex,
+            @ApiParam(value = "分片总数", required = true) @RequestParam("totalChunks") int totalChunks) {
+
+        UploadChunkResponse uploadChunkResponse = uploadService.uploadVideoChunk(uploadId, chunk, chunkIndex, totalChunks);
+        return Response.success(uploadChunkResponse);
+    }
+
+    /** 完成视频上传 */
+    @PostMapping("/uploads/video/complete")
+    @ApiOperation(value = "完成视频上传", notes = "完成视频上传并合并所有分片")
+    public Response<UploadCompleteResponse> completeVideoUpload(@ApiParam(value = "视频上传完成请求", required = true) @RequestBody UploadCompleteRequest request) {
+        UploadCompleteResponse uploadCompleteResponse = uploadService.completeVideoUpload(
+                request.getUploadId(),
+                request.getFileName(),
+                request.getTotalSize(),
+                request.getEmail(),
+                request.getSecureToken());
+        return Response.success(uploadCompleteResponse);
+    }
+
+    /** 查询视频上传状态 */
+    @GetMapping("/uploads/video/status/{uploadId}")
+    @ApiOperation(value = "查询视频上传状态", notes = "获取视频上传任务的当前状态")
+    public Response<UploadStatusResponse> getVideoUploadStatus(@ApiParam(value = "上传任务ID", required = true) @PathVariable String uploadId) {
+        UploadStatusResponse videoUploadStatus = uploadService.getVideoUploadStatus(uploadId);
+        return Response.success(videoUploadStatus);
+    }
+
+    @PostMapping("/contestants/save")
+    @ApiOperation(value = "保存参赛者信息", notes = "保存或更新参赛者信息及已上传的文件")
+    public Response<Map<String,Object>> submit(@ApiParam(value = "参赛者信息", required = true) @RequestBody ContestantDTO request) {
+        return Response.success(globalAwardService.saveContestant(request));
+    }
+
+    @GetMapping("/contestants/{id}")
+    @ApiOperation(value = "根据id查询参赛者", notes = "根据id获取参赛者信息")
+    public Response<ContestantDTO> getContestantByID(@ApiParam(value = "参赛者id", required = true) @PathVariable("id") String id) {
+        ContestantDTO dto = globalAwardService.getContestantByID(id);
+        return Response.success(dto);
+    }
+
+    @GetMapping("/checkEmail")
+    public Response<String> checkEmail(@RequestParam("email") String email) {
+        globalAwardService.checkEmail(email);
+        return Response.success();
+    }
+
+    @GetMapping("/checkCode")
+    public Response<CheckOTPVO> checkCode(@RequestParam("email") String email, @RequestParam("code") String code) {
+        return Response.success(globalAwardService.checkCode(email, code));
+    }
+
+    @GetMapping("/contestants/export")
+    @ApiOperation(value = "导出参赛者列表为Excel", notes = "导出所有参赛者信息为xlsx并触发下载")
+    public void exportContestants(HttpServletResponse response) throws Exception {
+        byte[] data = globalAwardService.exportContestants();
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setHeader("Content-Disposition", "attachment; filename=\"contestants.xlsx\"");
+        response.setContentLength(data.length);
+        response.getOutputStream().write(data);
+        response.getOutputStream().flush();
+    }
+
+    @PostMapping("/contestants/export/files")
+    @ApiOperation(value = "导出参赛者文件为ZIP", notes = "根据参赛者编号范围导出PDF、视频和信息文件为ZIP，直接响应给浏览器")
+    public void exportContestantFiles(@ApiParam(value = "参赛者文件导出请求", required = true) @RequestBody ContestantExportRequest request, HttpServletResponse response) throws Exception {
+        byte[] zipData = globalAwardService.exportContestantFilesAsZip(request.getMinContestantNumber(), request.getMaxContestantNumber());
+        if (zipData.length == 0) {
+            response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+            response.getWriter().write("No contestants found in the specified range.");
+            return;
+        }
+        response.setContentType("application/zip");
+        response.setHeader("Content-Disposition", "attachment; filename=\"contestants.zip\"");
+        response.setContentLength(zipData.length);
+        response.getOutputStream().write(zipData);
+        response.getOutputStream().flush();
+    }
+
+    @GetMapping("/contestants/count")
+    @ApiOperation(value = "查询参赛者总数", notes = "查询数据库中参赛者的总数量和最大参赛者编号")
+    public Response<ContestantCountVO> getContestantCount() {
+        return Response.success(globalAwardService.getContestantCount());
+    }
+
+}
+
+

src/main/java/com/ai/da/controller/LLMController.java

@@ -1,48 +1,23 @@
 package com.ai.da.controller;
 
-import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.primary.entity.Account;
-import com.ai.da.mapper.primary.entity.AccountExtend;
 import com.ai.da.mapper.primary.entity.ChatMessage;
-import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.*;
-import com.ai.da.model.vo.AccountLoginVO;
-import com.ai.da.model.vo.AccountPreLoginVO;
-import com.ai.da.model.vo.BindEmailVO;
-import com.ai.da.model.vo.PersonalHomepageVO;
-import com.ai.da.service.AccountService;
 import com.ai.da.service.LLMService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import jakarta.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
-@Api(tags = "llm模块")
+@Tag(name = "llm模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/llm")
@@ -51,7 +26,7 @@ public class LLMController {
     @Resource
     private LLMService llmService;
 
-    @ApiOperation(value = "对话")
+    @Operation(summary = "对话")
     @CrossOrigin
     @GetMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public SseEmitter streamPrompt(@RequestParam String prompt,
@@ -64,7 +39,7 @@ public class LLMController {
         return llmService.stream(prompt, projectId, fileUrl, imageUrlList, token, enableThinking, process);
     }
 
-    @ApiOperation(value = "对话")
+    @Operation(summary = "对话")
     @CrossOrigin
     @GetMapping(value = "/streamNew", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public SseEmitter streamNew(@RequestParam String prompt,
@@ -77,7 +52,7 @@ public class LLMController {
         return llmService.streamNew(prompt, projectId, fileUrl, imageUrlList, token, enableThinking, process);
     }
 
-    @ApiOperation(value = "对话创建项目")
+    @Operation(summary = "对话创建项目")
     @GetMapping(value = "/chatCreateProject")
     public Response<Long> chatCreateProject(@RequestParam String prompt, @RequestParam String process,
                                             @RequestParam(required = false) String fileUrl,
@@ -85,13 +60,13 @@ public class LLMController {
         return Response.success(llmService.chatCreateProject(prompt, process, fileUrl, imageUrlList));
     }
 
-    @ApiOperation(value = "上传文件")
+    @Operation(summary = "上传文件")
     @PostMapping(value = "/uploadFile")
     public Response<List<String>> uploadFile(@RequestParam("file") MultipartFile file) {
         return Response.success(llmService.uploadFile(file));
     }
 
-    @ApiOperation(value = "获取历史聊天记录")
+    @Operation(summary = "获取历史聊天记录")
     @PostMapping(value = "/getChatHistory")
     public Response<PageBaseResponse<ChatMessage>> getChatHistory(@RequestBody ChatHistoryDTO chatHistoryDTO) {
         return Response.success(llmService.getChatHistory(chatHistoryDTO));

src/main/java/com/ai/da/controller/LibraryController.java

@@ -14,9 +14,9 @@ import com.ai.da.model.vo.*;
 import com.ai.da.service.LibraryModelPointService;
 import com.ai.da.service.LibraryService;
 import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
@@ -24,14 +24,14 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.io.File;
 import java.text.ParseException;
 import java.util.*;
 
 
-@Api(tags = "library模块")
+@Tag(name = "library模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/library")
@@ -49,26 +49,26 @@ public class LibraryController {
     @Value("${minio.bucketName.sysImage}")
     private String sysImage;
 
-    @ApiOperation(value = "Library分页列表")
+    @Operation(summary = "Library分页列表")
     @PostMapping("/queryLibraryPage")
     public Response<PageBaseResponse<QueryLibraryPageVO>> queryLibraryPage(@Valid @RequestBody QueryLibraryPageDTO query) {
         return Response.success(libraryService.queryLibraryPage(CopyUtil.copyObject(query, QueryLibraryPageServiceDTO.class)));
     }
 
-    @ApiOperation(value = "Library分页列表(查询top和bottom)")
+    @Operation(summary = "Library分页列表(查询top和bottom)")
     @PostMapping("/queryLibraryTopAndBottomPage")
     public Response<PageBaseResponse<QueryLibraryPageVO>> queryLibraryTopAndBottomPage(@Valid @RequestBody QueryLibraryTopPageDTO query) {
         return Response.success(libraryService.queryLibraryPage(CopyUtil.copyObject(query, QueryLibraryPageServiceDTO.class)));
     }
 
-    @ApiOperation(value = "Library文件上传")
+    @Operation(summary = "Library文件上传")
     @PostMapping("/upload")
     public Response<LibraryUpdateVo> upload(@RequestParam("file") MultipartFile file,
-                                            @ApiParam("一级类型 Moodboard Printboard  Sketchboard MarketingSketch Models")
+                                            @Parameter(description = "一级类型 Moodboard Printboard  Sketchboard MarketingSketch Models")
                                             @RequestParam(value = "level1Type") String level1Type,
-                                            @ApiParam("二级类型 争对 Sketchboard; 有 Outwear Dress Blouse  Skirt Trousers")
+                                            @Parameter(description = "二级类型 争对 Sketchboard; 有 Outwear Dress Blouse  Skirt Trousers")
                                             @RequestParam(value = "level2Type", required = false) String level2Type,
-                                            @ApiParam("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
+                                            @Parameter(description = "本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
                                             @RequestParam(value = "timeZone") String timeZone,
                                             @RequestParam(value = "modelType") String modelType,
                                             @RequestParam(value = "sex") String sex,
@@ -102,20 +102,20 @@ public class LibraryController {
                 timeZone, md5, high, width, modelType, sex, ageGroup)));
     }
 
-    @ApiOperation(value = "保存或者编辑template打点")
+    @Operation(summary = "保存或者编辑template打点")
     @PostMapping("/saveOrEditTemplatePoint")
     public Response<LibraryModelPointVO> saveOrEditTemplatePoint(@Valid @RequestBody LibraryModelPointDTO libraryModelPoint) {
         return Response.success(libraryModelPointService.saveOrEditTemplatePoint(libraryModelPoint));
     }
 
-    @ApiOperation(value = "批量Library修改用户文件名")
+    @Operation(summary = "批量Library修改用户文件名")
     @PostMapping("/batchUpdateLibraryName")
     public Response<Boolean> batchUpdateLibraryName(@Valid @RequestBody LibraryUpdateDTO libraryUpdateDTO) {
         libraryService.updateLibraryName(libraryUpdateDTO);
         return Response.success(Boolean.TRUE);
     }
 
-    @ApiOperation(value = "批量删除library")
+    @Operation(summary = "批量删除library")
     @PostMapping("/batchDeleteLibrary")
     public Response<Boolean> batchDeleteLibrary(@Valid @RequestBody LibraryDeleteDTO deleteDTO) {
         libraryService.batchDeleteLibrary(deleteDTO);
@@ -123,10 +123,10 @@ public class LibraryController {
     }
 
 
-    @ApiOperation(value = "Models打点预览")
+    @Operation(summary = "Models打点预览")
     @PostMapping("/modelsDot")
-    public Response<String> modelsDot(@ApiParam("file") @RequestPart(value = "file", required = false) MultipartFile file,
-                                      @ApiParam("models对象") @RequestPart("models") ModelsDotDTO modelsDotDTO) {
+    public Response<String> modelsDot(@Parameter(description = "file") @RequestPart(value = "file", required = false) MultipartFile file,
+                                      @Parameter(description = "models对象") @RequestPart("models") ModelsDotDTO modelsDotDTO) {
         if (Objects.nonNull(file)) {
             if (StringUtils.isEmpty(file.getOriginalFilename())) {
                 throw new BusinessException("file.cannot.be.empty");
@@ -167,7 +167,7 @@ public class LibraryController {
         return response;
     }
 
-    @ApiOperation(value = "更新sketchboard level2type")
+    @Operation(summary = "更新sketchboard level2type")
     @PostMapping("/updateLibraryLevel2Type")
     public Response<Boolean> updateLibraryLevel2Type(@Validated @RequestBody LibraryLevel2TypeUpdateDTO libraryLevel2TypeUpdateDTO) {
         return Response.success(libraryService.updateLibraryLevel2Type(libraryLevel2TypeUpdateDTO));
@@ -196,21 +196,21 @@ public class LibraryController {
     }
 
     @PostMapping("moveLibraryData")
-    @ApiOperation(value = "用户library数据迁移")
+    @Operation(summary = "用户library数据迁移")
     public Response<Boolean> moveLibraryDate() throws ParseException {
         libraryService.moveLibraryDate();
         return Response.success(true);
     }
 
-    @ApiOperation(value = "将系统模特添加到个人library")
+    @Operation(summary = "将系统模特添加到个人library")
     @GetMapping("addSysModelToLib")
-    public Response<Map<String, String>> addSysModelToLib(@ApiParam("系统模特id") @RequestParam("sysModelId")long sysModelId){
+    public Response<Map<String, String>> addSysModelToLib(@Parameter(description = "系统模特id") @RequestParam("sysModelId")long sysModelId){
         return Response.success(libraryService.addSysModelToLib(sysModelId));
     }
 
-    @ApiOperation(value = "将个人library元素添加到公共库")
+    @Operation(summary = "将个人library元素添加到公共库")
     @GetMapping("addToPublicLibrary")
-    public Response<String> addToPublicLibrary(@ApiParam("元素的libraryId") @RequestParam("libraryId") Long libraryId){
+    public Response<String> addToPublicLibrary(@Parameter(description = "元素的libraryId") @RequestParam("libraryId") Long libraryId){
         boolean b = libraryService.saveToOrganizationLibrary(libraryId);
         if (b){
             return Response.success("success");
@@ -219,31 +219,31 @@ public class LibraryController {
         }
     }
 
-    @ApiOperation(value = "将个人library元素从公共库中删除")
+    @Operation(summary = "将个人library元素从公共库中删除")
     @GetMapping("deleteFromPublicLib")
-    public Response<String> deleteFromPublicLib(@ApiParam("元素的libraryId") @RequestParam("libraryId") Long libraryId){
+    public Response<String> deleteFromPublicLib(@Parameter(description = "元素的libraryId") @RequestParam("libraryId") Long libraryId){
         libraryService.deleteFromPublicLib(libraryId);
         return Response.success("success");
     }
 
-    @ApiOperation(value = "获取公共库")
+    @Operation(summary = "获取公共库")
     @GetMapping("getPublicLib")
-    public Response<PageBaseResponse<Library>> getPublicLib(@ApiParam("排序" ) @RequestParam(value = "order", defaultValue = "DESC", required = false) String order,
-                                                @ApiParam("page") @RequestParam(value = "page", defaultValue = "1", required = false) Long page,
-                                                @ApiParam("size") @RequestParam(value = "size", defaultValue = "20", required = false) Long size){
+    public Response<PageBaseResponse<Library>> getPublicLib(@Parameter(description = "排序" ) @RequestParam(value = "order", defaultValue = "DESC", required = false) String order,
+                                                @Parameter(description = "page") @RequestParam(value = "page", defaultValue = "1", required = false) Long page,
+                                                @Parameter(description = "size") @RequestParam(value = "size", defaultValue = "20", required = false) Long size){
 
         return Response.success(libraryService.getPublicLib(order, page, size));
     }
 
-    @ApiOperation(value = "管理员获取所有子账号lib元素")
+    @Operation(summary = "管理员获取所有子账号lib元素")
     @GetMapping("getAllSubAccLib")
-    public Response<PageBaseResponse<Library>> getAllSubAccLib(@ApiParam("排序") @RequestParam(value = "order", defaultValue = "DESC", required = false) String order,
-                                                   @ApiParam("page") @RequestParam(value = "page", defaultValue = "1", required = false) Long page,
-                                                   @ApiParam("size") @RequestParam(value = "size", defaultValue = "20", required = false) Long size){
+    public Response<PageBaseResponse<Library>> getAllSubAccLib(@Parameter(description = "排序") @RequestParam(value = "order", defaultValue = "DESC", required = false) String order,
+                                                   @Parameter(description = "page") @RequestParam(value = "page", defaultValue = "1", required = false) Long page,
+                                                   @Parameter(description = "size") @RequestParam(value = "size", defaultValue = "20", required = false) Long size){
         return Response.success(libraryService.getAllSubAccLib(order, page, size));
     }
 
-    @ApiOperation(value = "将系统sketch添加到library")
+    @Operation(summary = "将系统sketch添加到library")
     @GetMapping("addSysSketchToLibrary")
     public Response<String> addSysSketchToLibrary(Long clothId, String path) {
         return Response.success(libraryService.addSysSketchToLibrary(clothId, path));

src/main/java/com/ai/da/controller/MessageCenterController.java

@@ -6,17 +6,17 @@ import com.ai.da.model.dto.GetNotificationDTO;
 import com.ai.da.model.vo.NotificationVO;
 import com.ai.da.model.dto.PublishSysNotificationDTO;
 import com.ai.da.service.MessageCenterService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
-@Api(tags = "消息中心模块")
+@Tag(name = "消息中心模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/message")
@@ -26,35 +26,35 @@ public class MessageCenterController {
     private MessageCenterService messageCenterService;
 
     // 获取未读消息总数
-    @ApiOperation(value = "获取未读消息数")
+    @Operation(summary = "获取未读消息数")
     @GetMapping("/getUnreadCount")
     public Response<Map<String, Long>> getUnreadMessage(){
         return Response.success(messageCenterService.getAllTypeMessageUnreadCount());
     }
 
     // 获取历史消息
-    @ApiOperation(value = "获取历史消息")
+    @Operation(summary = "获取历史消息")
     @PostMapping("/getHistoryNotification")
     public Response<PageBaseResponse<NotificationVO>> getHistoryNotification(@Valid @RequestBody GetNotificationDTO getNotificationDTO) {
         return Response.success(messageCenterService.getHistoryNotification(getNotificationDTO));
     }
 
     // 已读消息
-    @ApiOperation(value = "设置消息状态为已读")
+    @Operation(summary = "设置消息状态为已读")
     @PostMapping("/setReadStatus")
     public Response<Boolean> setReadStatus(@RequestParam("notificationIdList") List<Long> notificationIdList, @RequestParam("type") String type) {
         return Response.success(messageCenterService.setReadStatus(notificationIdList, type));
     }
 
     // 发布系统消息
-    @ApiOperation(value = "发布系统消息")
+    @Operation(summary = "发布系统消息")
     @PostMapping("/publishSysMessage")
     public Response<String> publishSysMessage(@Valid @RequestBody PublishSysNotificationDTO message) {
         messageCenterService.publishSystemNotification(message);
         return Response.success("success");
     }
 
-    @ApiOperation(value = "一键已读")
+    @Operation(summary = "一键已读")
     @PostMapping("/oneClickRead")
     public Response<String> setReadAll(@RequestParam("type") String type) {
         messageCenterService.setReadAll(type);

src/main/java/com/ai/da/controller/OrderInfoController.java

@@ -7,15 +7,15 @@ import com.ai.da.model.dto.QueryPageByTimeDTO;
 import com.ai.da.model.vo.OrderListVO;
 import com.ai.da.service.OrderInfoService;
 import com.ai.da.service.PaymentInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 
 @CrossOrigin //开放前端的跨域访问
-@Api(tags = "商品订单管理")
+@Tag(name = "商品订单管理")
 @RestController
 @RequestMapping("/api/order-info")
 public class OrderInfoController {
@@ -26,7 +26,7 @@ public class OrderInfoController {
     @Resource
     private PaymentInfoService paymentInfoService;
 
-    @ApiOperation("订单列表")
+    @Operation(summary = "订单列表")
     @PostMapping("/list")
     public Response<PageBaseResponse<OrderListVO>> list(@Valid @RequestBody QueryPageByTimeDTO queryPageByTimeDTO){
         PageBaseResponse<OrderListVO> orderByAccountId = paymentInfoService.getPaymentInfo(queryPageByTimeDTO);
@@ -39,7 +39,7 @@ public class OrderInfoController {
      * @param orderNo
      * @return
      */
-    @ApiOperation("查询本地订单状态")
+    @Operation(summary = "查询本地订单状态")
     @GetMapping("/query-order-status/{orderNo}")
     public Response<String> queryOrderStatus(@PathVariable String orderNo){
         String orderStatus = orderInfoService.getOrderStatus(orderNo);

src/main/java/com/ai/da/controller/PayPalCheckoutController.java

@@ -7,34 +7,34 @@ import com.paypal.http.HttpResponse;
 import com.paypal.http.exceptions.SerializeException;
 import com.paypal.orders.Order;
 import com.paypal.payments.Refund;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.HashMap;
 
 @RestController
-@Api(tags = "PayPalCheckout接口")
+@Tag(name = "PayPalCheckout接口")
 @RequestMapping("/api/paypal")
 public class PayPalCheckoutController {
 
     @Resource
     private PayPalCheckoutService payPalCheckoutService;
 
-    @ApiOperation(value = "创建订单")
+    @Operation(summary = "创建订单")
     @PostMapping(value = "/trade")
     public Response<HashMap<String, String>> createOrder(@Valid @RequestBody ProductPurchaseDTO productPurchaseDTO, HttpServletRequest request) throws SerializeException {
         HashMap<String, String> approvalUrl = payPalCheckoutService.createOrder(productPurchaseDTO, request);
         return Response.success(approvalUrl);
     }
 
-    @ApiOperation(value = "ipn异步回调")
+    @Operation(summary = "ipn异步回调")
     @PostMapping(value = "/ipn/back")
     public Response<String> callback(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         Boolean result = payPalCheckoutService.doPost(request, response);
@@ -45,7 +45,7 @@ public class PayPalCheckoutController {
         }
     }
 
-    @ApiOperation(value = "查询指定订单")
+    @Operation(summary = "查询指定订单")
     @PostMapping(value = "/trade/query/{orderNo}")
     public Response<Order> queryOrder(@PathVariable String orderNo) throws SerializeException {
         Order s = payPalCheckoutService.queryOrder(orderNo);
@@ -53,7 +53,7 @@ public class PayPalCheckoutController {
     }
 
     /** 不提供退款接口 */
-    @ApiOperation("申请退款")
+    @Operation(summary = "申请退款")
     @PostMapping("/trade/refund/{orderNo}/{reason}")
     public Response<HttpResponse<Refund>> refund(@PathVariable String orderNo, @PathVariable String reason) throws IOException {
         Boolean response = payPalCheckoutService.refundOrder(orderNo,reason);
@@ -64,7 +64,7 @@ public class PayPalCheckoutController {
         }
     }
 
-    @ApiOperation("执行扣款")
+    @Operation(summary = "执行扣款")
     @PostMapping("/trade/capture/{orderNo}")
     public Response<com.paypal.orders.Order> captureOrder(@PathVariable String orderNo) throws IOException {
         Order response = payPalCheckoutService.captureOrder(orderNo);

src/main/java/com/ai/da/controller/PortfolioController.java

@@ -9,17 +9,17 @@ import com.ai.da.model.vo.CommentVO;
 import com.ai.da.model.vo.PortfolioVO;
 import com.ai.da.service.PortfolioService;
 import com.ai.da.service.UserFollowService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 
-@Api(tags = "Portfolio模块")
+@Tag(name = "Portfolio模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/portfolio")
@@ -31,133 +31,133 @@ public class PortfolioController {
     @Resource
     private UserFollowService userFollowService;
 
-    @ApiOperation(value = "发布作品集")
+    @Operation(summary = "发布作品集")
     @PostMapping("/publish")
     public Response<Long> publish(@RequestParam("file") MultipartFile canvas, @RequestParam("data") String data) {
         return Response.success(portfolioService.publish(canvas, data));
     }
 
-    @ApiOperation(value = "删除作品集")
+    @Operation(summary = "删除作品集")
     @GetMapping("/delete")
     public Response<Boolean> delete(@RequestParam("id") Long id) {
         return Response.success(portfolioService.delete(id));
     }
 
     @CrossOrigin
-    @ApiOperation(value = "作品集page")
+    @Operation(summary = "作品集page")
     @PostMapping("/page")
     public Response<PageBaseResponse<PortfolioVO>> page(@Valid @RequestBody QueryPortfolioPageDTO query) {
         return Response.success(portfolioService.page(query));
     }
 
     @CrossOrigin
-    @ApiOperation(value = "作品详情")
+    @Operation(summary = "作品详情")
     @PostMapping("/detail")
     public Response<PortfolioVO> detail(@Valid @RequestBody PortfolioDTO portfolioDTO) {
         return Response.success(portfolioService.detail(portfolioDTO));
     }
 
-    @ApiOperation(value = "选择作品")
+    @Operation(summary = "选择作品")
     @PostMapping("/choose")
     public Response<ProjectChooseVO> choose(@Valid @RequestBody PortfolioDTO portfolioDTO) {
         return Response.success(portfolioService.choose(portfolioDTO));
     }
 
-    @ApiOperation(value = "更新作品")
+    @Operation(summary = "更新作品")
     @PostMapping("/update")
     public Response<PortfolioVO> update(@Valid @RequestBody PortfolioDTO portfolioDTO) {
         return Response.success(portfolioService.update(portfolioDTO));
     }
 
-    @ApiOperation(value = "广场用户注册")
+    @Operation(summary = "广场用户注册")
     @PostMapping("/designWorksRegister")
     public Response<Boolean> designWorksRegister(@Valid @RequestBody DesignWorksRegisterDTO designWorksRegisterDTO) {
         return Response.success(portfolioService.designWorksRegister(designWorksRegisterDTO));
     }
 
-    @ApiOperation(value = "喜欢")
+    @Operation(summary = "喜欢")
     @GetMapping("/like")
     public Response<Boolean> like(@RequestParam("id") Long id) {
         return Response.success(portfolioService.like(id));
     }
 
-    @ApiOperation(value = "不喜欢")
+    @Operation(summary = "不喜欢")
     @GetMapping("/unlike")
     public Response<Boolean> unlike(@RequestParam("id") Long id) {
         return Response.success(portfolioService.unlike(id));
     }
 
-    @ApiOperation(value = "获取点赞数")
+    @Operation(summary = "获取点赞数")
     @GetMapping("/getLikeCount")
     public Response<Long> getLikeCount(@RequestParam("id") Long id) {
         return Response.success(portfolioService.getLikeCount(id));
     }
 
-    @ApiOperation(value = "评论")
+    @Operation(summary = "评论")
     @PostMapping("/comment")
     public Response<Boolean> comment(@Valid @RequestBody CommentDTO commentDTO) {
         return Response.success(portfolioService.comment(commentDTO));
     }
 
-    @ApiOperation(value = "评论列表")
+    @Operation(summary = "评论列表")
     @PostMapping("/commentPage")
     public Response<PageBaseResponse<CommentVO>> commentPage(@Valid @RequestBody CommentPageDTO commentPageDTO) {
         return Response.success(portfolioService.commentPage(commentPageDTO));
     }
 
-    @ApiOperation(value = "增加浏览量")
+    @Operation(summary = "增加浏览量")
     @GetMapping("/viewsIncrease")
     public Response<Boolean> viewsIncrease(@RequestParam("id") Long id) {
         return Response.success(portfolioService.viewsIncrease(id));
     }
 
-    @ApiOperation(value = "浏览量获取")
+    @Operation(summary = "浏览量获取")
     @GetMapping("/viewsGet")
     public Response<Long> viewsGet(@RequestParam("id") Long id) {
         return Response.success(portfolioService.viewsGet(id));
     }
 
-    @ApiOperation(value = "删除评论")
+    @Operation(summary = "删除评论")
     @PostMapping("/commentDelete")
     public Response<Boolean> commentDelete(@Valid @RequestBody CommentDTO commentDTO) {
         return Response.success(portfolioService.commentDelete(commentDTO));
     }
 
-    @ApiOperation(value = "关注")
+    @Operation(summary = "关注")
     @GetMapping("/follow")
     public Response<String> follow(@RequestParam("followeeId") Long followeeId) {
         portfolioService.follow(followeeId);
         return Response.success(BusinessException.getMessageFromResource("subscription.success"));
     }
 
-    @ApiOperation(value = "取消关注")
+    @Operation(summary = "取消关注")
     @GetMapping("/cancelFollow")
     public Response<String> cancelFollow(@RequestParam("followeeId") Long followeeId) {
         portfolioService.cancelFollow(followeeId);
         return Response.success(BusinessException.getMessageFromResource("unsubscribe.success"));
     }
 
-    @ApiOperation(value = "获取关注列表")
+    @Operation(summary = "获取关注列表")
     @PostMapping("/getFolloweeList")
     public Response<List<AccountFollowVO>> getFolloweeList(@Valid @RequestBody GetFollowListDTO getFollowListDTO) {
         return Response.success(userFollowService.getFolloweeList(getFollowListDTO));
     }
 
-    @ApiOperation(value = "获取粉丝列表")
+    @Operation(summary = "获取粉丝列表")
     @PostMapping("/getFollowerList")
     public Response<List<AccountFollowVO>> getFollowerList(@Valid @RequestBody GetFollowListDTO getFollowListDTO) {
         return Response.success(userFollowService.getFollowerList(getFollowListDTO));
     }
 
 
-/*    @ApiOperation(value = "按标签名查询作品")
+/*    @Operation(summary = "按标签名查询作品")
     @GetMapping("/queryPortfolioByTag")
     public Response<List<PortfolioVO>> queryPortfolioByTag(@RequestParam(value = "tagName", required = false) String tagName,
                                                            @RequestParam(value = "tagId", required = false) Long tagId) {
         return Response.success(portfolioService.queryPortfolioByTag(tagName, tagId));
     }*/
 
-    @ApiOperation(value = "将企业或教育版中的作品发布到公共gallery")
+    @Operation(summary = "将企业或教育版中的作品发布到公共gallery")
     @GetMapping("/toPublic")
     public Response<String> setPortfolioToPublic(@RequestParam("portfolioId") Long portfolioId) {
         portfolioService.setPortfolioToPublic(portfolioId);

src/main/java/com/ai/da/controller/ProductController.java

@@ -4,19 +4,19 @@ package com.ai.da.controller;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.entity.Product;
 import com.ai.da.service.ProductService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @CrossOrigin //开放前端的跨域访问
-@Api(tags = "商品管理")
+@Tag(name = "商品管理")
 @RestController
 @RequestMapping("/api/product")
 public class ProductController {
@@ -24,14 +24,14 @@ public class ProductController {
     @Resource
     private ProductService productService;
 
-    @ApiOperation("测试接口")
+    @Operation(summary = "测试接口")
     @GetMapping("/test")
     public Response<String> test(){
 
         return Response.success("now" + new Date());
     }
 
-    @ApiOperation("商品列表")
+    @Operation(summary = "商品列表")
     @GetMapping("/list")
     public Response<List<Product>> list(){
 

src/main/java/com/ai/da/controller/ProjectController.java

@@ -10,17 +10,17 @@ import com.ai.da.service.UserLikeGroupService;
 import com.ai.da.service.WorkspaceService;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.minio.errors.MinioException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 
-@Api(tags = "Project模块")
+@Tag(name = "Project模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/project")
@@ -37,14 +37,14 @@ public class ProjectController {
 
     @PostMapping("/saveOrUpdate")
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "新增或编辑", notes = "传入project")
+    @Operation(summary = "新增或编辑", description = "传入project")
     public Response<SaveOrUpdateProjectVO> saveOrUpdateProject(@Valid @RequestBody ProjectDTO projectDTO) {
         return Response.success(workspaceService.saveOrUpdateProject(projectDTO));
     }
 
     @PostMapping("/page")
     @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "分页查询", notes = "传入project")
+    @Operation(summary = "分页查询", description = "传入project")
     public Response<PageBaseResponse<ProjectVO>> page(@Valid @RequestBody ProjectQueryDTO projectQueryDTO) {
         return Response.success(PageBaseResponse.success(userLikeGroupService.getPage(projectQueryDTO)));
     }
@@ -58,21 +58,21 @@ public class ProjectController {
 //
     @PostMapping("/choose")
     @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "选择", notes = "传入project")
+    @Operation(summary = "选择", description = "传入project")
     public Response<ProjectChooseVO> choose(@Valid @RequestBody ProjectDTO projectDTO) {
         return Response.success(userLikeGroupService.choose(projectDTO));
     }
 
     @PostMapping("/getModuleContent")
     @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "获取模块内容", notes = "传入project")
+    @Operation(summary = "获取模块内容", description = "传入project")
     public Response<ModuleChooseVO> getModuleContent(@Valid @RequestBody ProjectDTO projectDTO) {
         return Response.success(userLikeGroupService.getModuleContent(projectDTO));
     }
 
     @PostMapping("/saveModuleContent")
     @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "存储模块内容", notes = "传入project")
+    @Operation(summary = "存储模块内容", description = "传入project")
     public Response<ModuleChooseVO> saveModuleContent(@Valid @RequestBody ModuleSaveDTO moduleSaveDTO) {
         return Response.success(userLikeGroupService.saveModuleContent(moduleSaveDTO));
     }
@@ -86,50 +86,49 @@ public class ProjectController {
 
     @PostMapping("/getMannequinDetail")
     @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "获取模特详情", notes = "传入mannequinId")
+    @Operation(summary = "获取模特详情", description = "传入mannequinId")
     public Response<QueryLibraryPageVO> getMannequinDetail(@Valid @RequestBody MannequinDTO mannequinDTO) {
         return Response.success(userLikeGroupService.getMannequinDetail(mannequinDTO));
     }
 
     @PostMapping("/threeDPage")
     @ApiOperationSupport(order = 8)
-    @ApiOperation(value = "获取3Dpage", notes = "传入ThreeDLayoutQueryDTO")
+    @Operation(summary = "获取3Dpage", description = "传入ThreeDLayoutQueryDTO")
     public Response<PageBaseResponse<ThreeDLayoutVO>> threeDPage(@Valid @RequestBody ThreeDLayoutQueryDTO threeDLayoutQueryDTO) {
         return Response.success(PageBaseResponse.success(userLikeGroupService.getThreeDLayoutPage(threeDLayoutQueryDTO)));
     }
 
     @PostMapping("/getLayoutDetail")
     @ApiOperationSupport(order = 9)
-    @ApiOperation(value = "获取3D详情", notes = "传入project")
+    @Operation(summary = "获取3D详情", description = "传入project")
     public Response<ThreeDVO> getLayoutDetail(@RequestParam(value = "threeDSimpleId") Long threeDSimpleId) {
         return Response.success(userLikeGroupService.getLayoutDetail(threeDSimpleId));
     }
 
     @PostMapping("/getThreeDSize")
-
     @ApiOperationSupport(order = 10)
-    @ApiOperation(value = "获取尺码", notes = "传入project")
+    @Operation(summary = "获取尺码", description = "传入project")
     public Response<ThreeDSizeVO> getThreeDSize(@RequestParam(value = "threeDSimpleId") Long threeDSimpleId) {
         return Response.success(userLikeGroupService.getThreeDSize(threeDSimpleId));
     }
 
     @GetMapping("/getThreeDGlb")
     @ApiOperationSupport(order = 11)
-    @ApiOperation(value = "获取GLB", notes = "传入project")
+    @Operation(summary = "获取GLB", description = "传入project")
     public void getThreeDGlb(@RequestParam(value = "threeDSimpleId") Long threeDSimpleId, HttpServletResponse response) throws MinioException, IOException {
         userLikeGroupService.getThreeDGlb(threeDSimpleId, response);
     }
 
     @GetMapping("/downloadZip")
     @ApiOperationSupport(order = 11)
-    @ApiOperation(value = "下载", notes = "传入project")
+    @Operation(summary = "下载", description = "传入project")
     public Response<String> downloadZip(@RequestParam(value = "threeDSimpleId") Long threeDSimpleId, @RequestParam(value = "sizeType") String sizeType, @RequestParam(value = "size") String size, HttpServletResponse response) throws MinioException, IOException {
         return Response.success(userLikeGroupService.downloadZip(threeDSimpleId, sizeType, size, response));
     }
 
     @PostMapping("/delete")
     @ApiOperationSupport(order = 12)
-    @ApiOperation(value = "删除", notes = "传入project")
+    @Operation(summary = "删除", description = "传入project")
     public Response<Boolean> delete(@RequestParam("projectId") Long projectId) {
         return Response.success(userLikeGroupService.delete(projectId));
     }

src/main/java/com/ai/da/controller/PythonController.java

@@ -16,14 +16,17 @@ import com.ai.da.service.ChatRobotService;
 import com.ai.da.service.LibraryService;
 import com.ai.da.service.SuperResolutionService;
 import com.ai.da.service.SysFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+import jakarta.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
@@ -31,7 +34,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 
-@Api(tags = "python对接模块")
+@Tag(name = "python对接模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/python")
@@ -49,17 +52,17 @@ public class PythonController {
     @Resource
     private SuperResolutionService superResolutionService;
 
-    @ApiOperation(value = "python服务保存图片到java服务")
+    @Operation(summary = "python服务保存图片到java服务")
     @PostMapping("/saveGeneratePicture")
     public Response<String> upload(@RequestParam("file") MultipartFile file,
-                                   @ApiParam("操作类型 generatePrint ->生成印花 " +
+                                   @Parameter(description = "操作类型 generatePrint ->生成印花 " +
                                            "designCollection ->设计collection generateAdvancedDesign ->生成高级design" +
                                            "generateSketch -> 生成草图")
                                    @RequestParam(value = "operateType") String operateType) {
         return Response.success(pythonService.upload(file, operateType));
     }
 
-//    @ApiOperation(value = "python服务保存多张图片到java服务")
+//    @Operation(summary = "python服务保存多张图片到java服务")
 //    @PostMapping("/saveMultiGeneratePicture")
 //    public Response<List<String>> uploadMultiple(@RequestParam("files") MultipartFile[] files,
 //                                                 @ApiParam("操作类型 generatePrint ->生成印花 " +
@@ -69,13 +72,13 @@ public class PythonController {
 //        return Response.success(pythonService.upload(files, operateType));
 //    }
 
-    @ApiOperation(value = "通过文件类型获取系统文件")
+    @Operation(summary = "通过文件类型获取系统文件")
     @GetMapping("/getSysFileByLevel2Type")
     public Response<List<SysFileVO>> getSysFileByLevel2Type(/*@RequestParam(value = "level2Type",required = false) String level2Type*/) {
         return Response.success(sysFileService.getByLevel2Type("All"));
     }
 
-    @ApiOperation(value = "通过用户id获取library")
+    @Operation(summary = "通过用户id获取library")
     @GetMapping("/getLibraryByUserId")
     public Response<Map<String, List<String>>> getLibraryByUserId(@RequestParam(value = "userId") Long userId) {
         List<PythonLibraryVo> response = CopyUtil.copyList(libraryService.selectByAccountIdAnd1TypeList(userId,
@@ -86,37 +89,47 @@ public class PythonController {
     }
 
     @CrossOrigin
-    @ApiOperation(value = "发送用户输入消息")
+    @Operation(summary = "发送用户输入消息")
     @PostMapping("/chatStream")
     public Response<ChatRobotVO> MessageToPythonChatStream(@RequestBody ChatSendDTO chatSendDTO) {
         log.info(chatSendDTO.toString());
         return Response.success(chatRobotService.sendMessageToChatRobot(chatSendDTO));
     }
 
-    @ApiOperation(value = "血条")
+    @Operation(summary = "血条")
     @GetMapping("/getBloodBars")
     public Response<BigDecimal> getBloodBars(@RequestParam(value = "userId") Long userId) {
         return Response.success(chatRobotService.getBloodBars(userId));
     }
 
     @CrossOrigin
-    @ApiOperation(value = "likeOrUnlike")
+    @Operation(summary = "likeOrUnlike")
     @PostMapping("/pictureLikeOrUnLike")
     public Response<Library> pictureLikeOrUnLike(@RequestBody ChatRobotLibraryDTO chatRobotLibraryDTO) {
         return Response.success(chatRobotService.pictureLikeOrUnLike(chatRobotLibraryDTO));
     }
 
     @CrossOrigin
-    @ApiOperation(value = "刷新会话缓存")
+    @Operation(summary = "刷新会话缓存")
     @PostMapping("/flush")
     public Response<String> ChatBufferFlush(@RequestBody ChatFlushDTO chatFlushDTO) {
         return Response.success(chatRobotService.chatBufferFlush(chatFlushDTO));
     }
 
-    @ApiOperation(value = "超分辨率")
+    @Operation(summary = "超分辨率")
     @PostMapping("/prepareForSR")
     public Response<List<String>> superResolution(@RequestBody List<SuperResolutionDTO> superResolutionDTO) {
         return Response.success(superResolutionService.prepareForSR(superResolutionDTO));
     }
 
+    @CrossOrigin
+    @Operation(summary = "Seg Anything 转发接口")
+    @PostMapping("/segAnything")
+    public Response<String> segAnything(@RequestBody Map<String, Object> payload) {
+        // 将前端传来的 Map 转为 fastjson JSONObject 并转发给 python 服务
+        JSONObject requestJson = (JSONObject) JSON.toJSON(payload);
+        String url = pythonService.segAnything(requestJson);
+        return Response.success(url);
+    }
+
 }

src/main/java/com/ai/da/controller/SavedCollectionController.java

@@ -17,9 +17,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Function;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -27,15 +28,15 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import javax.validation.constraints.Pattern;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Pattern;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
 
-@Api(tags = "History模块(saved Collection)")
+@Tag(name = "History模块(saved Collection)")
 @Slf4j
 @RestController
 @Validated
@@ -56,7 +57,7 @@ public class SavedCollectionController {
     @Resource
     private PortfolioService portfolioService;
 
-    @ApiOperation(value = "History用户分页分组列表")
+    @Operation(summary = "History用户分页分组列表")
     @PostMapping("/queryUserGroup")
     public Response<PageBaseResponse<UserLikeGroupVO>> queryUserGroup(@Valid @RequestBody QueryHistoryPageDTO query) {
         AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder();
@@ -147,21 +148,21 @@ public class SavedCollectionController {
         return Response.success(PageBaseResponse.success(convert));
     }
 
-    @ApiOperation(value = "History用户分组详情,目前弃用 ")
+    @Operation(summary = "History用户分组详情,目前弃用 ")
     @GetMapping("/getUserGroupDetail")
     public Response<List<UserLikeVO>> getUserGroupDetail(
-            @ApiParam("用户分组id") @RequestParam("userGroupId") Long userGroupId) {
+            @Parameter(description = "用户分组id") @RequestParam("userGroupId") Long userGroupId) {
         return Response.success(userLikeService.getGroupDetail(userGroupId));
     }
 
-    @ApiOperation(value = "History修改用户分组名")
+    @Operation(summary = "History修改用户分组名")
     @PostMapping("/updateUserGroupName")
     public Response<HistoryUpdateVO> updateUserGroupName(@Valid @RequestBody HistoryUpdateDTO historyUpdateDTO) {
         return Response.success(userLikeGroupService.updateUserGroupName(historyUpdateDTO.getUserGroupId()
                 , historyUpdateDTO.getUserGroupName(), historyUpdateDTO.getTimeZone()));
     }
 
-    @ApiOperation(value = "History删除用户分组")
+    @Operation(summary = "History删除用户分组")
     @PostMapping("/deleteUserGroup")
     public Response<Boolean> deleteUserGroup(@Valid @RequestBody HistoryDeleteDTO deleteDTO) {
         userLikeGroupService.deleteUserGroup(deleteDTO.getUserGroupId());
@@ -169,106 +170,106 @@ public class SavedCollectionController {
         return Response.success(Boolean.TRUE);
     }
 
-    @ApiOperation(value = "History choose")
+    @Operation(summary = "History choose")
     @GetMapping("/choose")
     public Response<UserLikeChooseVO> choose(
-            @ApiParam("用户分组id") @RequestParam("userGroupId") Long userGroupId) {
+            @Parameter(description = "用户分组id") @RequestParam("userGroupId") Long userGroupId) {
         return Response.success(userLikeGroupService.choose(userGroupId));
     }
 
-    @ApiOperation(value = "exportSave")
+    @Operation(summary = "exportSave")
     @PostMapping("/exportSave")
     public Response<Long> exportSave(@RequestParam("file") MultipartFile file, @RequestParam(value = "projectId", required = false) Long projectId,
                                         @RequestParam("module") String module, @RequestParam(value = "designItemDetailId", required = false) Long designItemDetailId) {
         return Response.success(userLikeGroupService.exportSave(file, projectId, module, designItemDetailId));
     }
 
-    @ApiOperation(value = "exportSearch")
+    @Operation(summary = "exportSearch")
     @PostMapping("/exportSearch")
     public Response<JSONObject> exportSearch(@Valid @RequestBody ExportSearchDTO exportSearchDTO) {
         return Response.success(userLikeGroupService.exportSearch(exportSearchDTO));
     }
 
-    @ApiOperation(value = "toProduct")
+    @Operation(summary = "toProduct")
     @PostMapping("/toProduct")
     public Response<List<ToProductImageResultVO>> toProduct(@Valid @RequestBody ToProductImageDTO toProductImageDTO) {
         return Response.success(userLikeGroupService.toProduct(toProductImageDTO));
     }
 
-    @ApiOperation(value = "toProductImageElementUpload")
+    @Operation(summary = "toProductImageElementUpload")
     @PostMapping("/toProductImageElementUpload")
     public Response<ToProductElementVO> toProductImageElementUpload(@RequestParam("file") MultipartFile file,
                                                                     @RequestParam(value = "projectId", required = false) Long projectId,
-                                                                    @ApiParam(value = "首尾帧", example = "first",
-                                                                            allowableValues = "first,last")
+                                                                    @Parameter(description = "首尾帧", example = "first",
+                                                                            schema = @Schema(allowableValues = {"first", "last"}))
                                                                     @RequestParam(value = "type", required = false) String type) {
         return Response.success(userLikeGroupService.toProductImageElementUpload(file, projectId, type));
     }
 
-    @ApiOperation(value = "toProductImageElementDelete")
+    @Operation(summary = "toProductImageElementDelete")
     @PostMapping("/toProductImageElementDelete")
     public Response<Boolean> toProductImageElementDelete(@RequestParam(value = "id") Long id) {
         return Response.success(userLikeGroupService.toProductImageElementDelete(id));
     }
 
-    @ApiOperation(value = "productImageLike")
+    @Operation(summary = "productImageLike")
     @PostMapping("/productImageLike")
     public Response<CollectionSort> productImageLike(@Valid @RequestBody ProductImageLikeDTO productImageLikeDTO) {
         CollectionSort collectionSort = userLikeGroupService.productImageLike(productImageLikeDTO);
         return Response.success(collectionSort);
     }
 
-    @ApiOperation(value = "collectionLikeUpdate")
+    @Operation(summary = "collectionLikeUpdate")
     @PostMapping("/collectionLikeUpdate")
     public Response<Boolean> collectionLikeUpdate(@Valid @RequestBody CollectionLikeUpdateDTO collectionLikeUpdateDTO) {
         return Response.success(userLikeGroupService.collectionLikeUpdate(collectionLikeUpdateDTO));
     }
 
-    @ApiOperation(value = "productImageUnLike")
+    @Operation(summary = "productImageUnLike")
     @PostMapping("/productImageUnLike")
     public Response<Boolean> productImageUnLike(@Valid @RequestBody ProductImageLikeDTO productImageLikeDTO) {
         return Response.success(userLikeGroupService.productImageUnLike(productImageLikeDTO));
     }
 
-    @ApiOperation(value = "获取生成结果")
+    @Operation(summary = "获取生成结果")
     @PostMapping("/toProductImageResult")
     public Response<List<MagicToolResultVO>> getToProductImageResult(@Valid @RequestBody List<String> taskIdList) {
         List<MagicToolResultVO> magicToolResultVOList = userLikeGroupService.getToProductImageResultList(taskIdList);
         return Response.success(magicToolResultVOList);
     }
 
-    @ApiOperation(value = "画布用户上传元素")
+    @Operation(summary = "画布用户上传元素")
     @PostMapping("/canvasElementUpload")
     public Response<CanvasElementUpload> canvasElementUpload(@RequestParam("file") MultipartFile file) {
         return Response.success(userLikeGroupService.canvasElementUpload(file));
     }
 
-    @ApiOperation("productImageLikeList")
+    @Operation(summary = "productImageLikeList")
     @PostMapping("/productImageLikeList")
     public Response<List<ToProductImageResultVO>> productImageLikeList(@Valid @RequestBody ToProductImageDTO toProductImageDTO) {
         return Response.success(userLikeGroupService.productImageLikeList(toProductImageDTO));
     }
 
-    @ApiOperation(value = "relight")
+    @Operation(summary = "relight")
     @PostMapping("/relight")
     public Response<List<ToProductImageResultVO>> relight(@Valid @RequestBody ToProductImageDTO toProductImageDTO) {
         return Response.success(userLikeGroupService.relight(toProductImageDTO));
     }
 
-    @ApiOperation(value = "转relight元素")
+    @Operation(summary = "转relight元素")
     @PostMapping("/convertRelightElement")
     public Response<ToProductElementVO> convertRelightElement(@RequestParam("id") Long id) {
         return Response.success(userLikeGroupService.convertRelightElement(id));
     }
 
-    @ApiOperation(value = "获取relight结果")
+    @Operation(summary = "获取relight结果")
     @PostMapping("/relightResult")
     public Response<List<MagicToolResultVO>> getRelightResult(@Valid @RequestBody List<String> taskIdList) {
         List<MagicToolResultVO> magicToolResultVOList = userLikeGroupService.getRelightResult(taskIdList);
         return Response.success(magicToolResultVOList);
     }
 
-    @ApiOperation(value = "删除toProduct Relight的结果")
+    @Operation(summary = "删除toProduct Relight的结果")
     @GetMapping("/deleteResult")
     public Response<String> deleteResult(@RequestParam("id") Long id,
                                                          @RequestParam("projectId") Long projectId,
@@ -281,61 +282,61 @@ public class SavedCollectionController {
         }
     }
 
-    @ApiOperation(value = "likeHistoryRelSketch")
+    @Operation(summary = "likeHistoryRelSketch")
     @PostMapping("/likeHistoryRelSketch")
     public Response<String> likeHistoryRelSketch() {
         return Response.success(userLikeGroupService.likeHistoryRelSketch());
     }
 
-    @ApiOperation(value = "download")
+    @Operation(summary = "download")
     @PostMapping("/download")
     public Response<String> download() {
         return Response.success(userLikeGroupService.download());
     }
 
-    @ApiOperation(value = "productImageInitialize")
+    @Operation(summary = "productImageInitialize")
     @PostMapping("/productImageInitialize")
     public Response<Boolean> productImageUpload(@Valid @RequestBody ProductImageInitializeDTO productImageInitializeDTO) {
         return Response.success(userLikeGroupService.productImageInitialize(productImageInitializeDTO));
     }
 
-    @ApiOperation(value = "getInitializeProgress")
+    @Operation(summary = "getInitializeProgress")
     @PostMapping("/getInitializeProgress")
     public Response<InitializeProgressVO> getInitializeProgress(@Valid @RequestBody ProductImageInitializeDTO productImageInitializeDTO) {
         return Response.success(userLikeGroupService.getInitializeProgress(productImageInitializeDTO));
     }
 
-    @ApiOperation(value = "brandDNASaveOrUpdate")
+    @Operation(summary = "brandDNASaveOrUpdate")
     @PostMapping("/brandDNASaveOrUpdate")
     public Response<Boolean> brandDNASaveOrUpdate(@Valid @RequestBody BrandDNADTO brandDNADTO) {
         return Response.success(userLikeGroupService.brandDNASaveOrUpdate(brandDNADTO));
     }
 
-    @ApiOperation(value = "brandDNADelete")
+    @Operation(summary = "brandDNADelete")
     @PostMapping("/brandDNADelete")
     public Response<Boolean> brandDNADelete(@Valid @RequestBody BrandDNADTO brandDNADTO) {
         return Response.success(userLikeGroupService.brandDNADelete(brandDNADTO));
     }
 
-    @ApiOperation(value = "brandDNAPage")
+    @Operation(summary = "brandDNAPage")
     @PostMapping("/brandDNAPage")
     public Response<PageBaseResponse<BrandDNAVO>> brandDNAPage(@Valid @RequestBody BrandDNAQueryDTO brandDNAQueryDTO) {
         return Response.success(userLikeGroupService.brandDNAPage(brandDNAQueryDTO));
     }
 
-    @ApiOperation(value = "brandLogoUpload")
+    @Operation(summary = "brandLogoUpload")
     @PostMapping("/brandLogoUpload")
     public Response<BrandLogoUploadVO> brandDNASaveOrUpdate(@RequestParam("file") MultipartFile file) {
         return Response.success(userLikeGroupService.brandLogoUpload(file));
     }
 
-    @ApiOperation(value = "brandDNAUpload")
+    @Operation(summary = "brandDNAUpload")
     @PostMapping("/brandDNAUpload")
     public Response<LibraryUpdateVo> brandDNAUpload(@RequestParam("file") MultipartFile file, @RequestParam("brandId") Long brandId) throws IOException {
         return Response.success(userLikeGroupService.brandDNAUpload(file, brandId));
     }
 
-    @ApiOperation(value = "brandDNAGenerate")
+    @Operation(summary = "brandDNAGenerate")
     @PostMapping("/brandDNAGenerate")
     public Response<BrandDNAGenerateVO> brandDNAGenerate(@RequestParam("prompt") String prompt) {
         return Response.success(userLikeGroupService.brandDNAGenerate(prompt));

src/main/java/com/ai/da/controller/StripeController.java

@@ -14,23 +14,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.paypal.http.HttpResponse;
 import com.paypal.payments.Refund;
 import com.stripe.exception.StripeException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
-import javax.annotation.Resource;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
-@Api(tags = "Stripe模块")
+@Tag(name = "Stripe模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/stripe")
@@ -42,7 +41,7 @@ public class StripeController {
     @Resource
     private RedisUtil redisUtil;
 
-    @ApiOperation("创建支付链接")
+    @Operation(summary = "创建支付链接")
     @PostMapping("/createOrder")
     public Response<String> pay(@Valid @RequestBody ProductPurchaseDTO productPurchaseDTO, HttpServletRequest request) {
         return Response.success(stripeService.pay(productPurchaseDTO, request));
@@ -51,7 +50,7 @@ public class StripeController {
     @Value("${stripe.webhook.fail.reminder}")
     private String webhookReminderFlag;
 
-    @ApiOperation("支付通知")
+    @Operation(summary = "支付通知")
     @PostMapping("/trade/notify")
     public void callback(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         try{
@@ -71,13 +70,13 @@ 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);
         }
     }
 
-    @ApiOperation("申请退款")
+    @Operation(summary = "申请退款")
     @GetMapping("/trade/refund/{orderNo}/{reason}")
     public Response<HttpResponse<Refund>> refund(@PathVariable String orderNo, @PathVariable String reason) throws IOException {
         String response = stripeService.refund(null,orderNo,reason);
@@ -88,7 +87,7 @@ public class StripeController {
         }
     }
 
-    @ApiOperation("获取订阅")
+    @Operation(summary = "获取订阅")
     @GetMapping("/getSubscription")
     public Response<List<String>> getSubscription(@RequestParam String name, @RequestParam String email) {
         try {
@@ -98,44 +97,44 @@ public class StripeController {
         }
     }
 
-    @ApiOperation("取消订阅")
+    @Operation(summary = "取消订阅")
     @GetMapping("/cancelSubscription")
     public Response<String> cancelSubscription(@RequestParam String subscriptionId, @RequestParam(required = false) String reason) {
         stripeService.cancelSubscription(subscriptionId, reason);
         return Response.success("success");
     }
 
-    @ApiOperation("创建推广码")
+    @Operation(summary = "创建推广码")
     @PostMapping("/createCoupon")
     public Response<String> createCoupon(@Valid @RequestBody CreateCouponDTO createCouponDTO){
         return Response.success(stripeService.createCoupon(createCouponDTO));
     }
 
-    @ApiOperation("检查推广码")
+    @Operation(summary = "检查推广码")
     @GetMapping("/checkCoupon")
     public Response<CheckCouponsVO> checkCoupon(@RequestParam String promotionCode, @RequestParam Long price){
         return Response.success(stripeService.checkProductCoupon(promotionCode, price));
     }
 
-    @ApiOperation("获取所有推广码")
+    @Operation(summary = "获取所有推广码")
     @PostMapping("/getAllCoupons")
     public Response<IPage<ProductCoupons>> getAllCoupons(@RequestBody QueryCouponsPageDTO queryCouponsPageDTO){
         return Response.success(stripeService.getAllCoupons(queryCouponsPageDTO));
     }
 
-    @ApiOperation("检索优惠券")
+    @Operation(summary = "检索优惠券")
     @GetMapping("/retrieveCoupon")
     public Response<String> retrieveCoupon(@RequestParam String couponId){
         return Response.success(stripeService.retrieveCoupon(couponId));
     }
 
-    @ApiOperation("检索推广码")
+    @Operation(summary = "检索推广码")
     @GetMapping("/retrievePromotionCode")
     public Response<String> retrievePromotionCode(@RequestParam String retrievePromotionCode){
         return Response.success(stripeService.retrievePromotionCode(retrievePromotionCode));
     }
 
-    @ApiOperation("更新推广码信息")
+    @Operation(summary = "更新推广码信息")
     @GetMapping("/updatePromCodeInfo")
     public Response<ProductCoupons> updateCouponsInfo(@RequestParam Long id, @RequestParam(required = false) String paidCommission,
                                                       @RequestParam(required = false) String cooperator,
@@ -144,7 +143,7 @@ public class StripeController {
         return Response.success(stripeService.updateCouponsInfo(id, paidCommission, cooperator, remark, startTime));
     }
 
-    @ApiOperation("删除推广码")
+    @Operation(summary = "删除推广码")
     @GetMapping("/deletePromCode")
     public Response<String> deleteCoupon(@RequestParam Long id){
         stripeService.deleteCoupon(id);
@@ -158,31 +157,31 @@ public class StripeController {
         return Response.success("success");
     }
 
-    @ApiOperation("创建订阅 临时")
+    @Operation(summary = "创建订阅 临时")
     @GetMapping("/createSubscriptionTemp")
     public Response<String> createSubscriptionTemp(@RequestParam String name, @RequestParam String email) {
         return Response.success(stripeService.createSubscriptionTemp(name, email));
     }
 
-    @ApiOperation("修改用户默认支付方式 临时")
+    @Operation(summary = "修改用户默认支付方式 临时")
     @GetMapping("/changeCustomerPayment")
     public Response<String> changeCustomerPayment(@RequestParam String name, @RequestParam String email) {
         return Response.success(stripeService.changeCustomerPayment(name, email));
     }
 
-    @ApiOperation("临时 发送续订失败邮件")
+    @Operation(summary = "临时 发送续订失败邮件")
     @GetMapping("/sendRenewalFailEmail")
     public Response<Boolean> sendRenewalFailEmail(@RequestParam String invoiceId, @RequestParam String subscriptionId, @RequestParam String orderNo) {
         return Response.success(stripeService.sendRenewalFailEmail(invoiceId, subscriptionId,orderNo));
     }
 
-    @ApiOperation("临时 查询指定用户绑定的付款方式")
+    @Operation(summary = "临时 查询指定用户绑定的付款方式")
     @GetMapping("/getCustomerPaymentMethod")
     public Response<List<Map<String,String>>> getCustomerPaymentMethod(@RequestParam String name, @RequestParam String email) {
         return Response.success(stripeService.getCustomerPaymentMethod(name, email));
     }
 
-    @ApiOperation("临时 解绑指定用户绑定的所有付款方式")
+    @Operation(summary = "临时 解绑指定用户绑定的所有付款方式")
     @GetMapping("/detachCustomerAllPaymentMethod")
     public Response<String> detachCustomerAllPaymentMethod(@RequestParam String name, @RequestParam String email) {
         return Response.success(stripeService.detachCustomerAllPaymentMethod(name, email));

src/main/java/com/ai/da/controller/SubscriptionPlanController.java

@@ -0,0 +1,112 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.common.task.SubscriptionReminderTask;
+import com.ai.da.mapper.primary.entity.SubscriptionPlan;
+import com.ai.da.model.dto.SubscriptionPlanDTO;
+import com.ai.da.model.dto.SubscriptionPlanPageQuery;
+import com.ai.da.model.dto.UpdateSubscriptionPlanDTO;
+import com.ai.da.model.vo.SubscriptionPlanVO;
+import com.ai.da.service.SubscriptionPlanService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Tag(name = "订阅计划模块")
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/subscription_plan")
+public class SubscriptionPlanController {
+
+    private final SubscriptionPlanService subscriptionPlanService;
+
+    private final SubscriptionReminderTask subscriptionReminderTask;
+
+    @Operation(summary = "创建订阅计划")
+    @PostMapping("/createPlan")
+    public Response<String> createPlan(@Valid @RequestBody SubscriptionPlanDTO subscriptionPlanDTO) {
+        subscriptionPlanService.createPlan(subscriptionPlanDTO);
+        return Response.success();
+    }
+
+    @Operation(summary = "更新订阅计划")
+    @PostMapping("/updatePlan")
+    public Response<String> updatePlan(@Valid @RequestBody UpdateSubscriptionPlanDTO updateDTO) {
+        subscriptionPlanService.updatePlan(updateDTO);
+        return Response.success();
+    }
+
+    @Operation(summary = "搜索订阅计划")
+    @PostMapping("/searchByOrganizationIdAndStatus")
+    public Response<List<SubscriptionPlan>> searchByOrganizationIdAndStatus(@Valid @RequestBody SubscriptionPlanPageQuery subscriptionPlanPageQuery) {
+        return Response.success(subscriptionPlanService.searchByOrganizationIdAndStatus(subscriptionPlanPageQuery));
+    }
+
+    @Operation(summary = "分页搜索订阅计划")
+    @PostMapping("/searchByPage")
+    public Response<IPage<SubscriptionPlanVO>> searchByPage(@Valid @RequestBody SubscriptionPlanPageQuery subscriptionPlanPageQuery) {
+        IPage<SubscriptionPlanVO> subscriptionPlanVOIPage = subscriptionPlanService.searchByPage(subscriptionPlanPageQuery);
+        return Response.success(subscriptionPlanVOIPage);
+    }
+
+    @Operation(summary = "删除订阅计划")
+    @GetMapping("/deletePlan")
+    public Response<String> deletePlan(@RequestParam Long id) {
+        subscriptionPlanService.deletePlan(id);
+        return Response.success();
+    }
+
+    @Operation(summary = "管理员切换订阅计划")
+    @GetMapping("/switchSubscriptionPlan")
+    public Response<String> switchSubscriptionPlan(@RequestParam Long targetSubscriptionPlanId, @RequestParam(required = false) Long adminAccId) {
+        subscriptionPlanService.switchSubscriptionPlan(targetSubscriptionPlanId, adminAccId);
+        return Response.success();
+    }
+
+    @Operation(summary = "子账号切换订阅计划")
+    @GetMapping("/switchSubAccSubscriptionPlan")
+    public Response<String> switchSubAccSubscriptionPlan(@RequestParam Long targetSubscriptionPlanId, @RequestParam Long subAccId) {
+        subscriptionPlanService.switchSubAccSubscriptionPlan(targetSubscriptionPlanId, subAccId);
+        return Response.success();
+    }
+
+//    @Hidden
+    @Operation(summary = "activeSubscriptionPlan")
+    @GetMapping("/activeSubscriptionPlan")
+    public Response<String> activeSubscriptionPlan() {
+        subscriptionPlanService.activeSubscriptionPlan(null);
+        return Response.success();
+    }
+
+//    @Hidden
+    @Operation(summary = "expireSubscription")
+    @GetMapping("/expireSubscription")
+    public Response<String> expireSubscription() {
+        subscriptionPlanService.expireSubscription();
+        return Response.success();
+    }
+
+    @Operation(summary = "subscriptionReminder")
+    @GetMapping("/subscriptionReminder")
+    public Response<String> subscriptionReminder() {
+        subscriptionReminderTask.subscriptionReminder();
+        return Response.success();
+    }
+
+    @Operation(summary = "trialReminder")
+    @GetMapping("/trialReminder")
+    public Response<String> trialReminder() {
+        subscriptionReminderTask.trialReminder();
+        return Response.success();
+    }
+
+
+}

src/main/java/com/ai/da/controller/TagsController.java

@@ -6,16 +6,16 @@ import com.ai.da.mapper.primary.entity.Product;
 import com.ai.da.mapper.primary.entity.Tags;
 import com.ai.da.service.ProductService;
 import com.ai.da.service.TagsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @CrossOrigin //开放前端的跨域访问
-@Api(tags = "标签管理")
+@Tag(name = "标签管理")
 @RestController
 @RequestMapping("/api/tags")
 public class TagsController {
@@ -23,7 +23,7 @@ public class TagsController {
     @Resource
     private TagsService tagsService;
 
-    @ApiOperation("获取标签")
+    @Operation(summary = "获取标签")
     @GetMapping("/getTags")
     public Response<List<Tags>> getTags(@RequestParam(value = "userInput", required = false) String userInput) {
         return Response.success(tagsService.getTags(userInput));

src/main/java/com/ai/da/controller/TaskListController.java

@@ -7,16 +7,16 @@ import com.ai.da.model.dto.SuperResolutionDTO;
 import com.ai.da.model.dto.TaskDTO;
 import com.ai.da.model.vo.TaskVO;
 import com.ai.da.service.TaskListService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 
-@Api(tags = "任务列表模块")
+@Tag(name = "任务列表模块")
 @Slf4j
 @RestController
 @RequestMapping("/api/tasks")
@@ -26,13 +26,13 @@ public class TaskListController {
     private TaskListService taskListService;
 
     @PostMapping("/getList")
-    @ApiOperation("获取未执行完的任务")
+    @Operation(summary = "获取未执行完的任务")
     public Response<List<TaskDTO<SuperResolutionDTO>>> getTaskList(@Valid @RequestBody List<String> taskIdList) {
         return Response.success(taskListService.getExecTask(taskIdList));
     }
 
     @PostMapping("/getAllTask")
-    @ApiOperation("获取所有任务")
+    @Operation(summary = "获取所有任务")
     public Response<PageBaseResponse<TaskVO>> getAllTask(@Valid @RequestBody QueryTaskHistoryDTO queryTaskHistoryDTO) {
         return Response.success(taskListService.getAllTask(queryTaskHistoryDTO));
     }

src/main/java/com/ai/da/controller/ThirdPartyController.java

@@ -1,167 +1,167 @@
-package com.ai.da.controller;
-
-import com.ai.da.common.constant.CommonConstant;
-import com.ai.da.common.response.Response;
-import com.ai.da.common.utils.MinioUtil;
-import com.ai.da.mapper.primary.entity.GoogleUser;
-import com.ai.da.model.dto.*;
-import com.ai.da.model.vo.AccountLoginVO;
-import com.ai.da.model.vo.DesignCollectionVO;
-import com.ai.da.service.AccountService;
-import com.ai.da.service.DesignService;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
-import java.security.cert.X509Certificate;
-
-
-@Api(tags = "Third Party Modules")
-@Slf4j
-@RestController
-@RequestMapping("/api/third/party")
-public class ThirdPartyController {
-
-    @Resource
-    private AccountService accountService;
-
-    @Resource
-    private DesignService designService;
-
-    @Resource
-    private MinioUtil minioUtil;
-
-    /*@ApiOperation(value = "Add user information")
-    @PostMapping("/addUser")
-    public Response<Boolean> addUser(@Valid @RequestBody AccountAddDTO accountAddDTO) {
-        return Response.success(accountService.addUser(accountAddDTO));
-    }*/
-
-    @ApiOperation(value = "Edit user information")
-    @PostMapping("/editUser")
-    public Response<Boolean> editUser(@RequestBody AccountEditDTO accountEditDTO) {
-        return Response.success(accountService.editUser(accountEditDTO));
-    }
-
-    @CrossOrigin
-    @ApiOperation(value = "Add user information")
-    @PostMapping("/addTrialUser")
-    public Response<Boolean> addTrialUser(@RequestBody AccountTrialDTO accountTrialDTO, HttpServletRequest request) {
-        return Response.success(accountService.addTrialUser(accountTrialDTO, request));
-    }
-
-    @CrossOrigin
-    @ApiOperation(value = "add No Login Required")
-    @PostMapping("/addNoLoginRequired")
-    public Response<Boolean> addNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO) {
-        return Response.success(accountService.addNoLoginRequired(noLoginRequiredDTO));
-    }
-
-    @CrossOrigin
-    @ApiOperation(value = "add No Login Required")
-    @PostMapping("/deleteNoLoginRequired")
-    public Response<Boolean> deleteNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO) {
-        return Response.success(accountService.deleteNoLoginRequired(noLoginRequiredDTO));
-    }
-
-    @CrossOrigin
-    @ApiOperation(value = "add No Login Required")
-    @PostMapping("/existNoLoginRequired")
-    public Response<Boolean> existNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
-        return Response.success(accountService.existNoLoginRequired(noLoginRequiredDTO, request));
-    }
-
-    @GetMapping("/your-secured-endpoint")
-//    @PreAuthorize("hasRole('ROLE_USER')")
-    public String securedEndpoint(HttpServletRequest request, @AuthenticationPrincipal PreAuthenticatedAuthenticationToken authenticationToken) {
-        // 从请求属性中获取证书
-        X509Certificate[] certificates = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
-        if (certificates != null && certificates.length > 0) {
-            X509Certificate clientCertificate = certificates[0];
-            // 可以从 clientCertificate 中获取证书信息，例如主题、颁发者等
-            String subject = clientCertificate.getSubjectX500Principal().getName();
-            String issuer = clientCertificate.getIssuerX500Principal().getName();
-            // 处理逻辑
-            return "Secured Endpoint. Client Subject: " + subject + ", Issuer: " + issuer;
-        } else {
-            // 证书不存在或获取失败
-            return "Failed to retrieve client certificate.";
-        }
-    }
-
-    @CrossOrigin
-    @ApiOperation(value = "add No Login Required")
-    @PostMapping("/addNoLoginRequiredNew")
-    public Response<String> addNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
-        return Response.success(accountService.addNoLoginRequiredNew(noLoginRequiredDTO, request));
-    }
-
-    @CrossOrigin
-    @ApiOperation(value = "add No Login Required")
-    @PostMapping("/deleteNoLoginRequiredNew")
-    public Response<Boolean> deleteNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
-        return Response.success(accountService.deleteNoLoginRequiredNew(noLoginRequiredDTO, request));
-    }
-
-    @Value("${redirect_url}")
-    private String REDIRECT_URL;
-    @CrossOrigin
-    @ApiOperation(value = "add No Login Required")
-    @PostMapping("/getRedirectUrl")
-    public Response<String> getRedirectUrl() {
-        return Response.success(REDIRECT_URL);
-    }
-
-    @CrossOrigin
-    @ApiOperation(value = "updateNoLoginRequiredNew")
-    @PostMapping("/updateNoLoginRequiredNew")
-    public Response<String> updateNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
-        return Response.success(accountService.updateNoLoginRequiredNew(noLoginRequiredDTO, request));
-    }
-
-    @CrossOrigin
-    @GetMapping("/auth/google_callback")
-    public Response<String> googleCallback(@RequestParam("code") String code, HttpSession session) {
-        return Response.success(accountService.googleCallback(code, session));
-    }
-    @CrossOrigin
-    @GetMapping("/parseGoogleCredential")
-    public Response<AccountLoginVO> parseGoogleCredential(@RequestParam("credential") String credential, @RequestParam("type") Integer type) {
-        return Response.success(accountService.parseGoogleCredential(credential, type));
-    }
-
-    @CrossOrigin
-    @GetMapping("/parseWeChatCode")
-    public Response<AccountLoginVO> parseWeChatCode(@RequestParam("code") String code, @RequestParam("type") Integer type) {
-        return Response.success(accountService.parseWeChatCode(code, type));
-    }
-
-    @ApiOperation(value = "接收Design结果")
-    @PostMapping("/receiveDesignResults")
-    @CrossOrigin
-    public Response<Boolean> receiveDesignResults(@Valid @RequestBody JSONObject responseObject) {
-        return Response.success(designService.receiveDesignResults(responseObject));
-    }
-
-    @ApiOperation(value = "接收Design入参")
-    @PostMapping("/receiveDesignParams")
-    @CrossOrigin
-    public Response<Boolean> receiveDesignParams(@Valid @RequestBody ReceiveDesignParam receiveDesignParam) {
-        return Response.success(designService.receiveDesignParams(receiveDesignParam));
-    }
-
-    @ApiOperation(value = "刷新minio预签名地址")
-    @GetMapping("/refreshMinioUrl")
-    public Response<String> refreshMinioUrl(@RequestParam("path") String path){
-        return Response.success(minioUtil.getPreSignedUrl(path, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-    }
-}
+package com.ai.da.controller;
+
+import com.ai.da.common.constant.CommonConstant;
+import com.ai.da.common.response.Response;
+import com.ai.da.common.utils.MinioUtil;
+import com.ai.da.mapper.primary.entity.GoogleUser;
+import com.ai.da.model.dto.*;
+import com.ai.da.model.vo.AccountLoginVO;
+import com.ai.da.model.vo.DesignCollectionVO;
+import com.ai.da.service.AccountService;
+import com.ai.da.service.DesignService;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.Valid;
+import java.security.cert.X509Certificate;
+
+
+@Tag(name = "Third Party Modules")
+@Slf4j
+@RestController
+@RequestMapping("/api/third/party")
+public class ThirdPartyController {
+
+    @Resource
+    private AccountService accountService;
+
+    @Resource
+    private DesignService designService;
+
+    @Resource
+    private MinioUtil minioUtil;
+
+    /*@ApiOperation(value = "Add user information")
+    @PostMapping("/addUser")
+    public Response<Boolean> addUser(@Valid @RequestBody AccountAddDTO accountAddDTO) {
+        return Response.success(accountService.addUser(accountAddDTO));
+    }*/
+
+    @Operation(summary = "Edit user information")
+    @PostMapping("/editUser")
+    public Response<Boolean> editUser(@RequestBody AccountEditDTO accountEditDTO) {
+        return Response.success(accountService.editUser(accountEditDTO));
+    }
+
+    @CrossOrigin
+    @Operation(summary = "Add user information")
+    @PostMapping("/addTrialUser")
+    public Response<Boolean> addTrialUser(@RequestBody AccountTrialDTO accountTrialDTO, HttpServletRequest request) {
+        return Response.success(accountService.addTrialUser(accountTrialDTO, request));
+    }
+
+    @CrossOrigin
+    @Operation(summary = "add No Login Required")
+    @PostMapping("/addNoLoginRequired")
+    public Response<Boolean> addNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO) {
+        return Response.success(accountService.addNoLoginRequired(noLoginRequiredDTO));
+    }
+
+    @CrossOrigin
+    @Operation(summary = "add No Login Required")
+    @PostMapping("/deleteNoLoginRequired")
+    public Response<Boolean> deleteNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO) {
+        return Response.success(accountService.deleteNoLoginRequired(noLoginRequiredDTO));
+    }
+
+    @CrossOrigin
+    @Operation(summary = "add No Login Required")
+    @PostMapping("/existNoLoginRequired")
+    public Response<Boolean> existNoLoginRequired(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.existNoLoginRequired(noLoginRequiredDTO, request));
+    }
+
+    @GetMapping("/your-secured-endpoint")
+//    @PreAuthorize("hasRole('ROLE_USER')")
+    public String securedEndpoint(HttpServletRequest request, @AuthenticationPrincipal PreAuthenticatedAuthenticationToken authenticationToken) {
+        // 从请求属性中获取证书
+        X509Certificate[] certificates = (X509Certificate[]) request.getAttribute("jakarta.servlet.request.X509Certificate");
+        if (certificates != null && certificates.length > 0) {
+            X509Certificate clientCertificate = certificates[0];
+            // 可以从 clientCertificate 中获取证书信息，例如主题、颁发者等
+            String subject = clientCertificate.getSubjectX500Principal().getName();
+            String issuer = clientCertificate.getIssuerX500Principal().getName();
+            // 处理逻辑
+            return "Secured Endpoint. Client Subject: " + subject + ", Issuer: " + issuer;
+        } else {
+            // 证书不存在或获取失败
+            return "Failed to retrieve client certificate.";
+        }
+    }
+
+    @CrossOrigin
+    @Operation(summary = "add No Login Required")
+    @PostMapping("/addNoLoginRequiredNew")
+    public Response<String> addNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.addNoLoginRequiredNew(noLoginRequiredDTO, request));
+    }
+
+    @CrossOrigin
+    @Operation(summary = "add No Login Required")
+    @PostMapping("/deleteNoLoginRequiredNew")
+    public Response<Boolean> deleteNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.deleteNoLoginRequiredNew(noLoginRequiredDTO, request));
+    }
+
+    @Value("${redirect_url}")
+    private String REDIRECT_URL;
+    @CrossOrigin
+    @Operation(summary = "add No Login Required")
+    @PostMapping("/getRedirectUrl")
+    public Response<String> getRedirectUrl() {
+        return Response.success(REDIRECT_URL);
+    }
+
+    @CrossOrigin
+    @Operation(summary = "updateNoLoginRequiredNew")
+    @PostMapping("/updateNoLoginRequiredNew")
+    public Response<String> updateNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.updateNoLoginRequiredNew(noLoginRequiredDTO, request));
+    }
+
+    @CrossOrigin
+    @GetMapping("/auth/google_callback")
+    public Response<String> googleCallback(@RequestParam("code") String code, HttpSession session) {
+        return Response.success(accountService.googleCallback(code, session));
+    }
+    @CrossOrigin
+    @GetMapping("/parseGoogleCredential")
+    public Response<AccountLoginVO> parseGoogleCredential(@RequestParam("credential") String credential, @RequestParam("type") Integer type) {
+        return Response.success(accountService.parseGoogleCredential(credential, type));
+    }
+
+    @CrossOrigin
+    @GetMapping("/parseWeChatCode")
+    public Response<AccountLoginVO> parseWeChatCode(@RequestParam("code") String code, @RequestParam("type") Integer type) {
+        return Response.success(accountService.parseWeChatCode(code, type));
+    }
+
+    @Operation(summary = "接收Design结果")
+    @PostMapping("/receiveDesignResults")
+    @CrossOrigin
+    public Response<Boolean> receiveDesignResults(@Valid @RequestBody JSONObject responseObject) {
+        return Response.success(designService.receiveDesignResults(responseObject));
+    }
+
+    @Operation(summary = "接收Design入参")
+    @PostMapping("/receiveDesignParams")
+    @CrossOrigin
+    public Response<Boolean> receiveDesignParams(@Valid @RequestBody ReceiveDesignParam receiveDesignParam) {
+        return Response.success(designService.receiveDesignParams(receiveDesignParam));
+    }
+
+    @Operation(summary = "刷新minio预签名地址")
+    @GetMapping("/refreshMinioUrl")
+    public Response<String> refreshMinioUrl(@RequestParam("path") String path){
+        return Response.success(minioUtil.getPreSignedUrl(path, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+    }
+}

src/main/java/com/ai/da/controller/WorkspaceController.java

@@ -11,14 +11,14 @@ import com.ai.da.model.vo.ModelsVO;
 import com.ai.da.model.vo.StyleVO;
 import com.ai.da.model.vo.WorkspaceVO;
 import com.ai.da.service.WorkspaceService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 
 import lombok.NoArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +36,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @RequestMapping("/api/workspace")
-@Api(value = "", tags = "工作空间")
+@Tag(name = "工作空间")
 public class WorkspaceController {
 
     @Resource
@@ -47,8 +47,8 @@ public class WorkspaceController {
      */
     @GetMapping("/detail")
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "详情", notes = "传入workspace")
-    public Response<WorkspaceVO> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+    @Operation(summary = "详情", description = "传入workspace")
+    public Response<WorkspaceVO> detail(@Parameter(description = "主键集合", required = true) @RequestParam Long id) {
         WorkspaceVO detail = workspaceService.getByIdNew(id);
         return Response.success(detail);
     }
@@ -58,7 +58,7 @@ public class WorkspaceController {
      */
     @PostMapping("/list")
     @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "分页", notes = "传入workspace")
+    @Operation(summary = "分页", description = "传入workspace")
     public Response<WorkspaceVO> list(@Valid @RequestBody WorkspaceDTO query) {
         WorkspaceVO response = workspaceService.getPage(query);
         return Response.success(response);
@@ -69,7 +69,7 @@ public class WorkspaceController {
      */
     @PostMapping("/saveOrUpdate")
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "新增或编辑", notes = "传入workspace")
+    @Operation(summary = "新增或编辑", description = "传入workspace")
     public Response saveOrUpdate(@Valid @RequestBody WorkspaceSaveDTO workspaceDTO) {
         return Response.success(workspaceService.saveOrUpdate(workspaceDTO));
     }
@@ -80,14 +80,14 @@ public class WorkspaceController {
      */
     @DeleteMapping("/remove")
     @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "删除", notes = "传入id")
+    @Operation(summary = "删除", description = "传入id")
     public Response<List<Long>> remove(@Valid @RequestBody List<Workspace> workspaceList) {
         return Response.success(workspaceService.delete(workspaceList));
     }
 
     @GetMapping("/enumValues")
     @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "获取枚举类值")
+    @Operation(summary = "获取枚举类值")
     public Response<List<BizJson>> enumValues(@RequestParam("enumName") String enumName) {
         List<BizJson> bizJsonList = workspaceService.getEnumValues(enumName);
         return Response.success(bizJsonList);
@@ -95,7 +95,7 @@ public class WorkspaceController {
 
     @GetMapping("/getMannequins")
     @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "获取模特")
+    @Operation(summary = "获取模特")
     public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex, @RequestParam("style") String style, @RequestParam("ageGroup") String ageGroup) {
         List<ModelsVO> modelsVO = workspaceService.getMannequins(sex, style, ageGroup);
         return Response.success(modelsVO);
@@ -104,7 +104,7 @@ public class WorkspaceController {
 
     @PostMapping("system_file_copy")
     @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "minio数据迁移")
+    @Operation(summary = "minio数据迁移")
     public Response<Boolean> systemFileCopy() {
         workspaceService.systemFileCopy();
         return Response.success(true);
@@ -112,7 +112,7 @@ public class WorkspaceController {
 
     @PostMapping("moveFile")
     @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "增加一级性别路径")
+    @Operation(summary = "增加一级性别路径")
     public Response<Boolean> moveFile() {
         workspaceService.moveFile();
         return Response.success(true);
@@ -120,7 +120,7 @@ public class WorkspaceController {
 
     @GetMapping("/maleDataInsert")
     @ApiOperationSupport(order = 8)
-    @ApiOperation(value = "男装数据入库入minio")
+    @Operation(summary = "男装数据入库入minio")
     public Response<Boolean> maleDataInsert() throws FileNotFoundException {
 //        workspaceService.maleDataInsert();
         return Response.success(true);
@@ -128,14 +128,14 @@ public class WorkspaceController {
 
     @PostMapping("styleList")
     @ApiOperationSupport(order = 9)
-    @ApiOperation(value = "获取style列表")
+    @Operation(summary = "获取style列表")
     public Response<List<StyleVO>> styleList() {
         return Response.success(workspaceService.styleList());
     }
 
     @PostMapping("/saveOrUpdateProject")
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "新增或编辑", notes = "传入project")
+    @Operation(summary = "新增或编辑", description = "传入project")
     public Response saveOrUpdateProject(@Valid @RequestBody ProjectDTO projectDTO) {
         return Response.success(workspaceService.saveOrUpdateProject(projectDTO));
     }

src/main/java/com/ai/da/feign/gateway/GatewayFeignClient.java

@@ -0,0 +1,21 @@
+package com.ai.da.feign.gateway;
+
+import com.ai.da.common.response.Response;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 调用 Gateway 黑名单接口，将指定用户的 token 加入黑名单。
+ * 替代原来的 SellerFeignClient.clearTokenCache。
+ */
+@FeignClient(name = "aida-gateway", path = "/internal")
+public interface GatewayFeignClient {
+
+    /**
+     * 将用户 token 加入黑名单。
+     * 后续 Gateway 会拒绝携带该用户 token 的请求。
+     */
+    @PostMapping("/logout")
+    Response<Void> logout(@RequestParam("userId") Long userId);
+}

src/main/java/com/ai/da/feign/seller/SellerFeignClient.java

@@ -0,0 +1,20 @@
+package com.ai.da.feign.seller;
+
+import com.ai.da.common.response.Response;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 调用 aida-seller 设计师相关接口的 Feign 客户端
+ */
+@FeignClient(name = "aida-seller", path = "/api/designer")
+public interface SellerFeignClient {
+
+    @GetMapping("/check")
+    Response<Boolean> checkDesignerQualification(@RequestParam("userId") Long userId);
+
+    @PostMapping("/cache/clear")
+    Response<Void> clearTokenCache(@RequestParam("userId") Long userId);
+}

src/main/java/com/ai/da/mapper/primary/ContestantMapper.java

@@ -0,0 +1,12 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.mapper.primary.entity.Contestant;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ContestantMapper extends BaseMapper<Contestant> {
+
+}
+
+

src/main/java/com/ai/da/mapper/primary/DesignMapper.java

@@ -19,7 +19,7 @@ public interface DesignMapper extends CommonMapper<Design> {
     Long insertDesign(Design design);
 
     List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime, List<Long> ids, String email,
-                                                    String role, String organizationName);
+                                                    String role, String organizationName, boolean filterBySecond);
 
     List<Design> selectDeleteList();
 }

src/main/java/com/ai/da/mapper/primary/NotificationMapper.java

@@ -4,6 +4,7 @@ import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.Notification;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -20,5 +21,5 @@ public interface NotificationMapper extends CommonMapper<Notification> {
 
     void setPersonalNotificationAllRead(String type, Long receiverId, LocalDateTime time);
 
-    List<Long> getUnreadSysNotification(Long accountId);
+    List<Long> getUnreadSysNotification(Long accountId, Date createTime);
 }

src/main/java/com/ai/da/mapper/primary/SubscriptionPlanMapper.java

@@ -0,0 +1,29 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.mapper.primary.entity.SubscriptionPlan;
+import com.ai.da.model.vo.SubscriptionPlanVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+public interface SubscriptionPlanMapper extends BaseMapper<SubscriptionPlan> {
+
+    /**
+     * 关联查询订阅计划信息（包含管理员邮箱）- 分页
+     */
+    @Select("""
+            SELECT sp.*, 
+                   a.user_email AS adminAccEmail, 
+                   a.user_name AS adminAccName,
+                   o.name AS organizationName
+            FROM t_subscription_plan sp
+            LEFT JOIN t_account a ON sp.admin_acc_id = a.id
+            LEFT JOIN t_organization o on sp.organization_id = o.id
+            ${ew.customSqlSegment}
+            """)
+    Page<SubscriptionPlanVO> selectWithEmailPage(Page<SubscriptionPlanVO> page,
+                                                 @Param(Constants.WRAPPER) Wrapper<?> wrapper);
+}

src/main/java/com/ai/da/mapper/primary/UserPreferenceMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.UserPreference;
+
+public interface UserPreferenceMapper extends CommonMapper<UserPreference> {
+}

src/main/java/com/ai/da/mapper/primary/WorkspaceRelStyleMapper.java

@@ -3,6 +3,8 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.WorkspaceRelStyle;
 
+import java.util.List;
+
 /**
  * Mapper 接口
  *
@@ -11,5 +13,11 @@ import com.ai.da.mapper.primary.entity.WorkspaceRelStyle;
  */
 public interface WorkspaceRelStyleMapper extends CommonMapper<WorkspaceRelStyle> {
 
+    /**
+     * 根据projectId查询workspaceRelStyles
+     * @param projectId 项目ID
+     * @return workspaceRelStyles列表
+     */
+    List<WorkspaceRelStyle> selectByProjectId(Long projectId);
 
 }