flux test

豆包模型更换
登录鉴权按照Source判断id来自于何处
2026-05-14 16:36:55 +08:00 · 2026-05-13 20:52:28 +08:00 · 2026-05-13 09:40:30 +08:00 · 2026-05-11 16:40:44 +08:00 · 2026-05-06 16:58:46 +08:00 · 2026-05-06 14:37:42 +08:00
57 changed files with 5050 additions and 5373 deletions
--- a/.gitea/workflows/develop_3.1_MS_build_manual.yaml
+++ b/.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
--- a/.gitea/workflows/develop_build_manual.yaml
+++ b/.gitea/workflows/develop_build_manual.yaml
@@ -103,7 +103,13 @@ jobs:
                - ./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内容:"
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.6</version>
+        <version>3.2.5</version>
        <relativePath/> <!-- lookup parent from repository -->
    </parent>
    <groupId>com.aida</groupId>
@@ -15,7 +15,7 @@
    <description>ai da</description>
    <properties>
        <java.version>21</java.version>
-        <mybatis.plus.version>3.5.5</mybatis.plus.version>
+        <mybatis.plus.version>3.5.7</mybatis.plus.version>
        <hutool.version>5.8.23</hutool.version>
        <wx.java.version>4.2.7.B</wx.java.version>
        <fastjson.version>2.0.43</fastjson.version>
@@ -28,6 +28,11 @@
        <javacv.version>1.5.5</javacv.version>
        <system.windowsx64>windows-x86_64</system.windowsx64>
        <javacpp.platform.linux-x86_64>linux-x86_64</javacpp.platform.linux-x86_64>
+
+        <!-- Spring Cloud Alibaba 版本 -->
+        <spring-cloud-alibaba.version>2023.0.3.4</spring-cloud-alibaba.version>
+        <!-- Spring Cloud 版本 -->
+        <spring-cloud.version>2023.0.4</spring-cloud.version>
    </properties>
    <dependencyManagement>
        <dependencies>
@@ -38,6 +43,22 @@
                <type>pom</type>
                <scope>import</scope>
            </dependency>
+            <!-- Spring Cloud 依赖版本管理 -->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Spring Cloud Alibaba 依赖版本管理 -->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
        </dependencies>
    </dependencyManagement>
    <dependencies>
@@ -74,9 +95,14 @@
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
            <version>${mybatis.plus.version}</version>
        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>3.0.4</version>
+        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -237,6 +263,12 @@
            <version>2.15.1</version>
        </dependency>

+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.13.0</version>
+        </dependency>
+
        <dependency>
            <groupId>com.stripe</groupId>
            <artifactId>stripe-java</artifactId>
@@ -432,6 +464,33 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
+
+        <!-- ==================== Spring Cloud Alibaba 微服务相关 ==================== -->
+        <!-- 启用 bootstrap.yml 加载 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <!-- Nacos 服务注册与发现 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!-- Nacos 配置中心 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!-- OpenFeign 服务调用 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <!-- Spring Cloud LoadBalancer 负载均衡 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
    </dependencies>

    <build>
--- a/src/main/java/com/ai/da/AiDaApplication.java
+++ b/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 启动完成!");
+    }
+
+}
--- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
@@ -559,83 +559,83 @@ 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.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) {
--- a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
@@ -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");
+//    }

 }
--- a/src/main/java/com/ai/da/common/config/SecurityConfig.java
+++ b/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();
+    }
+}
--- a/src/main/java/com/ai/da/common/config/WebConfig.java
+++ b/src/main/java/com/ai/da/common/config/WebConfig.java
@@ -1,13 +1,16 @@
 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;
@@ -17,11 +20,20 @@ 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)
--- a/src/main/java/com/ai/da/common/config/exception/ExceptionCatch.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/ai/da/common/config/exception/TokenMissingOrExpiredException.java
+++ b/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;
-    }
-}
--- a/src/main/java/com/ai/da/common/config/exception/UnauthorizedException.java
+++ b/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");
+    }
+}
--- a/src/main/java/com/ai/da/common/constant/CommonConstant.java
+++ b/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天过期
--- a/src/main/java/com/ai/da/common/constant/ModelConstants.java
+++ b/src/main/java/com/ai/da/common/constant/ModelConstants.java
@@ -18,8 +18,8 @@ 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 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";
--- a/src/main/java/com/ai/da/common/constant/TokenConstant.java
+++ b/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";
-}
--- a/src/main/java/com/ai/da/common/context/UserContext.java
+++ b/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();
+    }
+}
--- a/src/main/java/com/ai/da/common/httpdata/token/TokenApis.java
+++ b/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;
-    }
-}
--- a/src/main/java/com/ai/da/common/httpdata/token/TokenQuery.java
+++ b/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;
-    }
-
-}
--- a/src/main/java/com/ai/da/common/interceptor/UserContextInterceptor.java
+++ b/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();
+    }
+}
--- a/src/main/java/com/ai/da/common/security/UserAuthAccessDeniedHandler.java
+++ b/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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.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);
-    }
-}
--- a/src/main/java/com/ai/da/common/security/UserAuthenticationEntryPointHandler.java
+++ b/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 jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.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);
-    }
-}
--- a/src/main/java/com/ai/da/common/security/UserAuthenticationManager.java
+++ b/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 jakarta.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);
-    }
-}
--- a/src/main/java/com/ai/da/common/security/UserAuthenticationProvider.java
+++ b/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);
-    }
-}
--- a/src/main/java/com/ai/da/common/security/UserLoginFailureHandler.java
+++ b/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 jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.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);
-    }
-}
--- a/src/main/java/com/ai/da/common/security/UserLoginSuccessHandler.java
+++ b/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 jakarta.annotation.Resource;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.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));
-    }
-}
--- a/src/main/java/com/ai/da/common/security/UserPermissionEvaluator.java
+++ b/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;
-    }
-}
--- a/src/main/java/com/ai/da/common/security/config/SecurityConfig.java
+++ b/src/main/java/com/ai/da/common/security/config/SecurityConfig.java
@@ -1,107 +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.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.Customizer;
-import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
-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.config.annotation.web.configurers.HeadersConfigurer;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-
-import jakarta.annotation.Resource;
-
-@Configuration
-@EnableWebSecurity
-@EnableMethodSecurity(prePostEnabled = true)
-@EnableConfigurationProperties(SecurityProperties.class)
-public class SecurityConfig {
-
-    @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;
-
-    @Bean
-    public AuthenticationManager authenticationManager() throws Exception {
-        return this.userAuthenticationManager;
-    }
-
-    @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws Exception {
-        httpSecurity
-                .cors(Customizer.withDefaults())
-                .authorizeHttpRequests(auth -> auth
-                        .requestMatchers(
-                                new AntPathRequestMatcher("/doc.html"),
-                                new AntPathRequestMatcher("/swagger-ui.html"),
-                                new AntPathRequestMatcher("/swagger-ui/**"),
-                                new AntPathRequestMatcher("/swagger-resources/**"),
-                                new AntPathRequestMatcher("/v2/api-docs"),
-                                new AntPathRequestMatcher("/v3/api-docs/**"),
-                                new AntPathRequestMatcher("/webjars/**")
-                        ).permitAll()
-                        .requestMatchers(securityProperties.getIgnorePaths()).permitAll()
-                        .anyRequest().authenticated()
-                )
-                .headers(headers -> headers
-                        .frameOptions(HeadersConfigurer.FrameOptionsConfig::disable)
-                        .cacheControl(cache -> cache.disable())
-                )
-                .exceptionHandling(exception -> exception
-                        .authenticationEntryPoint(userAuthenticationEntryPointHandler)
-                        .accessDeniedHandler(userAuthAccessDeniedHandler)
-                )
-                .formLogin(form -> form
-                        .loginProcessingUrl(securityProperties.getAuthApi())
-                        .successHandler(userLoginSuccessHandler)
-                        .failureHandler(userLoginFailureHandler)
-                )
-                .csrf(AbstractHttpConfigurer::disable)
-                .sessionManagement(session -> session
-                        .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                );
-        
-        //自定义过滤器在登录时认证用户名、密码
-        httpSecurity.addFilterAt(userAuthenticationProcessingFilter, UsernamePasswordAuthenticationFilter.class)
-                .addFilterBefore(authenticationFilter, BasicAuthenticationFilter.class);
-        
-        return httpSecurity.build();
-    }
-
-    @Bean
-    public DefaultWebSecurityExpressionHandler userSecurityExpressionHandler() {
-        DefaultWebSecurityExpressionHandler handler = new DefaultWebSecurityExpressionHandler();
-        handler.setPermissionEvaluator(userPermissionEvaluator);
-        return handler;
-    }
-}
--- a/src/main/java/com/ai/da/common/security/config/SecurityProperties.java
+++ b/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;
-}
--- a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
+++ b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
@@ -1,162 +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.RedisUtil;
-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 jakarta.annotation.Resource;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.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;
-    @Resource
-    private RedisUtil redisUtil;
-
-    private static final List<String> FILTER_URL =
-            Arrays.asList("/favicon.ico", "/doc.html", "/swagger-ui.html",
-                    "/swagger-resources", "/swagger-resources/", "/swagger-resources/configuration/ui", "/swagger-resources/configuration/security",
-                    "/webjars/", "/v2/api-docs", "/v3/api-docs", "/v3/api-docs/swagger-config",
-                    "/api/account/login", "/api/account/preLogin", "api/account/sendEmail","api/account/noLoginRequired",
-                    "/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",
-                    //GlobalAwardController
-                    "/api/global-award"
-            );
-
-    @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) {
-        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：先查本地缓存，再查 Redis，保证服务重启后仍然有效
-            String userIdStr = String.valueOf(principal.getId());
-            String cacheToken = LocalCacheUtils.getTokenCache(userIdStr);
-
-            if (StringUtils.isEmpty(cacheToken)) {
-                // 本地缓存为空时，尝试从 Redis 读取
-                cacheToken = redisUtil.getLoginToken(principal.getId());
-                if (StringUtils.isEmpty(cacheToken)) {
-//                    throw new RuntimeException("TOKEN已过期，请重新登录！");
-                    throw new TokenMissingOrExpiredException("TOKEN已过期，请重新登录！(cache & redis empty)");
-                }
-                // 将 Redis 中的 token 回填到本地缓存，减少后续 Redis 访问
-                LocalCacheUtils.setTokenCache(userIdStr, cacheToken);
-            }
-            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);
-        }
-    }
-}
--- a/src/main/java/com/ai/da/common/security/filter/UserAuthenticationProcessingFilter.java
+++ b/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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.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);
-    }
-}
--- a/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java
+++ b/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java
@@ -1,108 +0,0 @@
-package com.ai.da.common.security.jwt;
-
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-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.security.Keys;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import jakarta.annotation.Resource;
-import javax.crypto.SecretKey;
-import java.nio.charset.StandardCharsets;
-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) {
-        SecretKey key = buildSigningKey();
-        String token = Jwts.builder()
-                .id(String.valueOf(principal.getId()))
-                .subject(JSONObject.toJSONString(principal))
-                .issuedAt(new Date())
-                .issuer(ISSUER)
-                .claim(AUTHORITIES, JSON.toJSONString(new ArrayList<>()))//自定义属性  权限
-                .expiration(new Date(System.currentTimeMillis() + securityProperties.getJwtExpiration()))
-                .signWith(key)
-                .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(), "");
-        SecretKey key = buildSigningKey();
-        return Jwts.parser()
-                .verifyWith(key)
-                .build()
-                .parseSignedClaims(token)
-                .getPayload();
-    }
-
-    public String createToken(Long userId, String userEmail){
-        SecretKey key = buildSigningKey();
-        String token = Jwts.builder()
-                .id(String.valueOf(userId))
-                .subject(userEmail + "_" + userId)
-                .issuedAt(new Date())
-                .issuer(ISSUER)
-                .claim(CHANGE_MAILBOX, JSON.toJSONString(new ArrayList<>()))//自定义属性  权限
-                .expiration(new Date(System.currentTimeMillis() + CommonConstant.CHANGE_MAILBOX_LINK_VALIDITY))
-                .signWith(key)
-                .compact();
-        return token;
-    }
-
-    public String parseToEmailAndId(String token) {
-        return parser(token).getSubject();
-    }
-
-    /**
-     * JWT 要求 HMAC-SHA 的密钥至少 256 bit，这里统一扩展/哈希密钥长度避免 WeakKeyException。
-     */
-    private SecretKey buildSigningKey() {
-        byte[] raw = securityProperties.getJwtSecret().getBytes(StandardCharsets.UTF_8);
-        if (raw.length < 32) {
-            raw = DigestUtil.sha256(raw);
-        }
-        return Keys.hmacShaKeyFor(raw);
-    }
-}
--- a/src/main/java/com/ai/da/common/task/AccountTask.java
+++ b/src/main/java/com/ai/da/common/task/AccountTask.java
@@ -28,7 +28,7 @@ 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();
@@ -54,7 +54,7 @@ public class AccountTask {
    }*/

    // 每天检测正式用户到期情况，每天凌晨0点执行
-    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")
    public void paidUserToVisitor() {
        // 1、查询当前已过期正式用户或试用用户
        List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
@@ -77,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("重置所有用户的用户名修改次数");
@@ -85,17 +85,17 @@ 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 * * ?")
+//    @Scheduled(cron = "0 5 0 * * ?")
    public void activeSubscriptionPlan() {
        subscriptionPlanService.activeSubscriptionPlan(null);
    }

-    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
    public void expireSubscription() {
        subscriptionPlanService.expireSubscription();
    }
--- a/src/main/java/com/ai/da/common/task/GenerateTask.java
+++ b/src/main/java/com/ai/da/common/task/GenerateTask.java
@@ -38,7 +38,7 @@ public class GenerateTask {
     * 故这里通过定时任务做补偿
     * flux五分钟查询一次，万相1小时查询一次
     */
-    @Scheduled(cron = "0 */4 * * * ?")
+//    @Scheduled(cron = "0 */4 * * * ?")
    public void fluxCompensationMechanism(){
        // 1、查所有 任务还没成功、还没失败，正在等待或者执行中的任务id有哪些
        // （由于获取结果的polling_url在redis中只存一天，大部分结果超过一天之后就无法再找到任务，小部分可以通过公共路径查到结果）
@@ -98,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()){
--- a/src/main/java/com/ai/da/common/task/PaymentTask.java
+++ b/src/main/java/com/ai/da/common/task/PaymentTask.java
@@ -104,7 +104,7 @@ public class PaymentTask {
    }

    // 定时同步（每分钟一次）
-    @Scheduled(fixedRate = 60000)
+//    @Scheduled(fixedRate = 60000)
    public void syncLinkViewCountToDB(){
        affiliateService.syncLinkViewCountToDB();
    }
@@ -120,7 +120,7 @@ public class PaymentTask {
        }
    }

-    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
    public void calcCouponsCommission(){
 //        log.info("优惠券佣金计算定时器");
        affiliateService.calcCouponsCommission();
--- a/src/main/java/com/ai/da/common/utils/MailUtil.java
+++ b/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 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 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);
+    }
+
+}
--- a/src/main/java/com/ai/da/common/utils/MinioUtil.java
+++ b/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,9 @@ public class MinioUtil {
    @Autowired
    private MinioClient minioClient;

+    @Value("${minio.endpoint}")
+    private String endpoint;
+
    /**
     * 获取MinIO客户端实例
     */
@@ -958,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或逻辑路径");
+        }
+    }
+
+
 }


--- a/src/main/java/com/ai/da/common/utils/SecurityContextUtils.java
+++ b/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;
-    }
-}
--- a/src/main/java/com/ai/da/common/utils/TokenGenerateUtils.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/ai/da/feign/gateway/GatewayFeignClient.java
+++ b/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);
+}
--- a/src/main/java/com/ai/da/feign/seller/SellerFeignClient.java
+++ b/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);
+}
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -77,7 +77,7 @@ public class PythonService {
    @Value("${access.python.generate_sr_port}")
    private String srServicePort;

-    @Value("${design.callback.url}")
+    @Value("${design.callback.url.aida}")
    private String callbackUrl;

    @Resource
--- a/src/main/java/com/ai/da/seller/DesignUrlsDTO.java
+++ b/src/main/java/com/ai/da/seller/DesignUrlsDTO.java
@@ -0,0 +1,37 @@
+package com.ai.da.seller;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.util.List;
+
+/**
+ * 设计URLs DTO
+ */
+@Data
+@Schema(description = "设计URLs数据传输对象")
+public class DesignUrlsDTO {
+    
+    /**
+     * 设计项ID
+     */
+    @Schema(description = "设计项ID", example = "1")
+    private Long designItemId;
+    
+    /**
+     * TO_PRODUCT_IMAGE类型的URL列表
+     */
+    @Schema(description = "TO_PRODUCT_IMAGE类型的URL列表")
+    private List<String> toProductImageUrls;
+    
+    /**
+     * DesignItemDetail的path列表
+     */
+    @Schema(description = "DesignItemDetail的path列表")
+    private List<String> clothes;
+
+    /**
+     * 姿势转换视频信息列表
+     */
+    @Schema(description = "姿势转换视频信息列表")
+    private List<PoseTransformationVideoDTO> videos;
+}
--- a/src/main/java/com/ai/da/seller/PoseTransformationVideoDTO.java
+++ b/src/main/java/com/ai/da/seller/PoseTransformationVideoDTO.java
@@ -0,0 +1,30 @@
+package com.ai.da.seller;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 姿势转换视频信息DTO
+ */
+@Data
+@Schema(description = "姿势转换视频信息数据传输对象")
+public class PoseTransformationVideoDTO {
+
+    /**
+     * GIF第一帧截图URL
+     */
+    @Schema(description = "GIF第一帧截图URL")
+    private String firstFrameUrl;
+
+    /**
+     * GIF视频URL
+     */
+    @Schema(description = "GIF视频URL")
+    private String gifUrl;
+
+    /**
+     * 视频URL
+     */
+    @Schema(description = "视频URL")
+    private String videoUrl;
+}
--- a/src/main/java/com/ai/da/seller/SellerController.java
+++ b/src/main/java/com/ai/da/seller/SellerController.java
@@ -0,0 +1,44 @@
+package com.ai.da.seller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.service.UserLikeGroupService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Seller Controller
+ */
+@RestController
+@RequestMapping("/api/seller")
+@RequiredArgsConstructor
+@Tag(name = "Seller", description = "Seller相关接口")
+public class SellerController {
+    
+    private final UserLikeGroupService userLikeGroupService;
+    
+    /**
+     * 根据designItemId列表获取设计相关的URL列表
+     * @param designItemIds designItemId列表
+     * @return 设计URLs DTO列表
+     */
+    @GetMapping("/sketchDetail")
+    @Operation(summary = "获取设计相关URL列表", description = "根据designItemId列表获取设计相关的URL列表，包括TO_PRODUCT_IMAGE类型的URL和DesignItemDetail的path列表")
+    public Response<List<DesignUrlsDTO>> getDesignUrlsByDesignItemIds(
+            @Parameter(description = "设计项ID列表", required = true, example = "1,2,3")
+            @RequestParam List<Long> designItemIds) {
+        List<DesignUrlsDTO> designUrlsDTOList = new ArrayList<>();
+        for (Long designItemId : designItemIds) {
+            DesignUrlsDTO designUrlsDTO = userLikeGroupService.getToProductImageUrlsByDesignItemId(designItemId);
+            designUrlsDTOList.add(designUrlsDTO);
+        }
+        return Response.success(designUrlsDTOList);
+    }
+}
--- a/src/main/java/com/ai/da/service/UserLikeGroupService.java
+++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java
@@ -1,124 +1,132 @@
-package com.ai.da.service;
-
-import com.ai.da.common.response.PageBaseResponse;
-import com.ai.da.mapper.primary.entity.*;
-import com.ai.da.model.dto.*;
-import com.ai.da.model.vo.*;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import io.minio.errors.MinioException;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 服务类
- *
- * @author yanglei
- * @since 2022-09-11
- */
-public interface UserLikeGroupService extends IService<UserLikeGroup> {
-
-    void deleteUserGroup(Long userGroupId);
-
-    HistoryUpdateVO updateUserGroupName(Long userGroupId, String userGroupName, String timeZone);
-
-    Long insertUserGroup(Long userId, Long collectionId, String timeZone, Long projectId);
-
-    /**
-     * choose
-     *
-     * @param userGroupId
-     * @return
-     */
-    UserLikeChooseVO choose(Long userGroupId);
-
-    ProjectChooseVO choose(ProjectDTO projectDTO);
-
-    UserLikeGroup getByProjectId(Long projectId);
-
-    void deleteTrialData(Long id);
-
-    void updateDate(Long id, String timeZone);
-
-    Long exportSave(MultipartFile file, Long projectId, String module, Long designItemDetailId);
-
-    List<ToProductImageResultVO> toProduct(ToProductImageDTO toProductImageDTO);
-
-    void toProduct(String taskId);
-
-    ToProductElementVO toProductImageElementUpload(MultipartFile file, Long projectId, String type);
-
-    CollectionSort productImageLike(ProductImageLikeDTO productImageLikeDTO);
-
-    List<MagicToolResultVO> getToProductImageResultList(List<String> taskIdList);
-
-    JSONObject exportSearch(ExportSearchDTO exportSearchDTO);
-
-    CanvasElementUpload canvasElementUpload(MultipartFile file);
-
-    List<ToProductImageResultVO> productImageLikeList(ToProductImageDTO toProductImageDTO);
-
-    Boolean productImageUnLike(ProductImageLikeDTO productImageLikeDTO);
-
-    void relight(String taskId);
-
-    List<ToProductImageResultVO> relight(ToProductImageDTO toProductImageDTO);
-
-    List<MagicToolResultVO> getRelightResult(List<String> taskIdList);
-
-    void deleteToProductRelightResult(Long id, Long projectId, String type);
-
-    String likeHistoryRelSketch();
-
-    String download();
-
-    Boolean productImageInitialize(ProductImageInitializeDTO productImageInitializeDTO);
-
-    InitializeProgressVO getInitializeProgress(ProductImageInitializeDTO productImageInitializeDTO);
-
-    IPage<ProjectVO> getPage(ProjectQueryDTO projectQueryDTO);
-
-    ModuleChooseVO getModuleContent(ProjectDTO projectDTO);
-
-    ModuleChooseVO saveModuleContent(ModuleSaveDTO moduleSaveDTO);
-
-    QueryLibraryPageVO getMannequinDetail(MannequinDTO mannequinDTO);
-
-    BrandLogoUploadVO brandLogoUpload(MultipartFile file);
-
-    Boolean brandDNASaveOrUpdate(BrandDNADTO brandDNADTO);
-
-    LibraryUpdateVo brandDNAUpload(MultipartFile file, Long brandId) throws IOException;
-
-    PageBaseResponse<BrandDNAVO> brandDNAPage(BrandDNAQueryDTO brandDNAQueryDTO);
-
-    BrandDNAGenerateVO brandDNAGenerate(String prompt);
-
-    IPage<ThreeDLayoutVO> getThreeDLayoutPage(ThreeDLayoutQueryDTO threeDLayoutQueryDTO);
-
-    ThreeDVO getLayoutDetail(Long threeDSimpleId);
-
-    ThreeDSizeVO getThreeDSize(Long threeDSimpleId);
-
-    void getThreeDGlb(Long threeDSimpleId, HttpServletResponse response) throws MinioException, IOException;
-
-    String downloadZip(Long threeDSimpleId, String sizeType, String size, HttpServletResponse response) throws MinioException, IOException;
-
-    Boolean delete(Long projectId);
-
-    Boolean brandDNADelete(BrandDNADTO brandDNADTO);
-
-    void toProductBatch(String taskId, String url, String progress) throws InterruptedException;
-
-    void relightBatch(String taskId, String url, String progress);
-
-    Boolean collectionLikeUpdate(CollectionLikeUpdateDTO collectionLikeUpdateDTO);
-
-    Boolean toProductImageElementDelete(Long id);
-
-    ToProductElementVO convertRelightElement(Long id);
-}
+package com.ai.da.service;
+
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.mapper.primary.entity.*;
+import com.ai.da.model.dto.*;
+import com.ai.da.model.vo.*;
+import com.ai.da.seller.DesignUrlsDTO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.minio.errors.MinioException;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 服务类
+ *
+ * @author yanglei
+ * @since 2022-09-11
+ */
+public interface UserLikeGroupService extends IService<UserLikeGroup> {
+
+    void deleteUserGroup(Long userGroupId);
+
+    HistoryUpdateVO updateUserGroupName(Long userGroupId, String userGroupName, String timeZone);
+
+    Long insertUserGroup(Long userId, Long collectionId, String timeZone, Long projectId);
+
+    /**
+     * choose
+     *
+     * @param userGroupId
+     * @return
+     */
+    UserLikeChooseVO choose(Long userGroupId);
+
+    ProjectChooseVO choose(ProjectDTO projectDTO);
+
+    UserLikeGroup getByProjectId(Long projectId);
+
+    void deleteTrialData(Long id);
+
+    void updateDate(Long id, String timeZone);
+
+    Long exportSave(MultipartFile file, Long projectId, String module, Long designItemDetailId);
+
+    List<ToProductImageResultVO> toProduct(ToProductImageDTO toProductImageDTO);
+
+    void toProduct(String taskId);
+
+    ToProductElementVO toProductImageElementUpload(MultipartFile file, Long projectId, String type);
+
+    CollectionSort productImageLike(ProductImageLikeDTO productImageLikeDTO);
+
+    List<MagicToolResultVO> getToProductImageResultList(List<String> taskIdList);
+
+    JSONObject exportSearch(ExportSearchDTO exportSearchDTO);
+
+    CanvasElementUpload canvasElementUpload(MultipartFile file);
+
+    List<ToProductImageResultVO> productImageLikeList(ToProductImageDTO toProductImageDTO);
+
+    Boolean productImageUnLike(ProductImageLikeDTO productImageLikeDTO);
+
+    void relight(String taskId);
+
+    List<ToProductImageResultVO> relight(ToProductImageDTO toProductImageDTO);
+
+    List<MagicToolResultVO> getRelightResult(List<String> taskIdList);
+
+    void deleteToProductRelightResult(Long id, Long projectId, String type);
+
+    String likeHistoryRelSketch();
+
+    String download();
+
+    Boolean productImageInitialize(ProductImageInitializeDTO productImageInitializeDTO);
+
+    InitializeProgressVO getInitializeProgress(ProductImageInitializeDTO productImageInitializeDTO);
+
+    IPage<ProjectVO> getPage(ProjectQueryDTO projectQueryDTO);
+
+    ModuleChooseVO getModuleContent(ProjectDTO projectDTO);
+
+    ModuleChooseVO saveModuleContent(ModuleSaveDTO moduleSaveDTO);
+
+    QueryLibraryPageVO getMannequinDetail(MannequinDTO mannequinDTO);
+
+    BrandLogoUploadVO brandLogoUpload(MultipartFile file);
+
+    Boolean brandDNASaveOrUpdate(BrandDNADTO brandDNADTO);
+
+    LibraryUpdateVo brandDNAUpload(MultipartFile file, Long brandId) throws IOException;
+
+    PageBaseResponse<BrandDNAVO> brandDNAPage(BrandDNAQueryDTO brandDNAQueryDTO);
+
+    BrandDNAGenerateVO brandDNAGenerate(String prompt);
+
+    IPage<ThreeDLayoutVO> getThreeDLayoutPage(ThreeDLayoutQueryDTO threeDLayoutQueryDTO);
+
+    ThreeDVO getLayoutDetail(Long threeDSimpleId);
+
+    ThreeDSizeVO getThreeDSize(Long threeDSimpleId);
+
+    void getThreeDGlb(Long threeDSimpleId, HttpServletResponse response) throws MinioException, IOException;
+
+    String downloadZip(Long threeDSimpleId, String sizeType, String size, HttpServletResponse response) throws MinioException, IOException;
+
+    Boolean delete(Long projectId);
+
+    Boolean brandDNADelete(BrandDNADTO brandDNADTO);
+
+    void toProductBatch(String taskId, String url, String progress) throws InterruptedException;
+
+    void relightBatch(String taskId, String url, String progress);
+
+    Boolean collectionLikeUpdate(CollectionLikeUpdateDTO collectionLikeUpdateDTO);
+
+    Boolean toProductImageElementDelete(Long id);
+
+    ToProductElementVO convertRelightElement(Long id);
+
+    /**
+     * 根据designItemId获取TO_PRODUCT_IMAGE类型的URL列表和DesignItemDetail的path列表
+     * @param designItemId designItemId
+     * @return 包含TO_PRODUCT_IMAGE类型的URL列表和DesignItemDetail的path列表的对象
+     */
+    DesignUrlsDTO getToProductImageUrlsByDesignItemId(Long designItemId);
+}
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -10,7 +10,9 @@ import com.ai.da.common.enums.LoginTypeEnum;
 import com.ai.da.common.enums.ProductEnum;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.ResultEnum;
-import com.ai.da.common.security.jwt.JWTTokenHelper;
+import com.ai.da.common.utils.TokenGenerateUtils;
+import com.ai.da.feign.gateway.GatewayFeignClient;
+import com.ai.da.feign.seller.SellerFeignClient;
 import com.ai.da.common.utils.*;
 import com.ai.da.mapper.primary.*;
 import com.ai.da.mapper.primary.entity.*;
@@ -94,7 +96,13 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
    private AccountExtendMapper accountExtendMapper;

    @Resource
-    private JWTTokenHelper jwtTokenHelper;
+    private TokenGenerateUtils tokenGenerateUtils;
+
+    @Resource
+    private SellerFeignClient sellerFeignClient;
+
+    @Resource
+    private GatewayFeignClient gatewayFeignClient;

    @Resource
    private AccountLoginLogService accountLoginLogService;
@@ -136,9 +144,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
    @Resource
    private RedisUtil redisUtil;

-    @Resource
-    private com.ai.da.common.security.config.SecurityProperties securityProperties;
-
    @Resource
    private UserFollowService userFollowService;

@@ -353,11 +358,13 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
        principal.setUsername(account.getUserName());
        principal.setLanguage(account.getLanguage());
        principal.setCountry(account.getCountry());
-        String token2 = jwtTokenHelper.createToken(principal);
+        //区分买家端登录
+        principal.setSource("AIDA");
+        String token2 = tokenGenerateUtils.createToken(principal);
        // 本地 JVM 缓存（适配旧逻辑）
        LocalCacheUtils.setTokenCache(String.valueOf(account.getId()), token2);
        // 同步写入 Redis，重启后仍然可用
-        long jwtExpiration = securityProperties.getJwtExpiration();
+        long jwtExpiration = tokenGenerateUtils.getJwtExpiration();
        redisUtil.setLoginToken(account.getId(), token2, jwtExpiration);
        return token2;
    }
@@ -614,11 +621,23 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl

    @Override
    public Boolean logout(AccountLogoutDTO accountLogoutDTO) {
-        // jwt 本身失效比较难做，统一用缓存实现：删除缓存即失效
+        // 1. 删除本地缓存（保留，防止 Gateway 未启动时还能本地验证）
        String userIdStr = String.valueOf(accountLogoutDTO.getUserId());
        LocalCacheUtils.delTokenCache(userIdStr);
-        // 同时删除 Redis 中的 token，防止服务重启后仍然有效
+        // 2. 删除 Redis 中的 token（Gateway 黑名单会接力生效）
        redisUtil.deleteLoginToken(accountLogoutDTO.getUserId());
+        // 3. 调用 Gateway 黑名单接口，将 token 加入 Redis 黑名单
+        try {
+            gatewayFeignClient.logout(accountLogoutDTO.getUserId());
+        } catch (Exception e) {
+            log.warn("调用 Gateway 黑名单接口失败，userId={}, error={}", accountLogoutDTO.getUserId(), e.getMessage());
+        }
+        // 4. 同步调用 seller 清除本地缓存（兼容未接入 Gateway 的节点）
+        try {
+            sellerFeignClient.clearTokenCache(accountLogoutDTO.getUserId());
+        } catch (Exception e) {
+            log.warn("调用 seller 清理缓存失败，userId={}, error={}", accountLogoutDTO.getUserId(), e.getMessage());
+        }
        return Boolean.TRUE;
    }

@@ -2153,7 +2172,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
        redisUtil.addToString(key, newMailbox, CommonConstant.CHANGE_MAILBOX_LINK_VALIDITY / 1000);

        String username = userHolder.getUsername();
-        String token = jwtTokenHelper.createToken(accountId, newMailbox);
+        String token = tokenGenerateUtils.createMailboxToken(accountId, newMailbox);
        // 准备激活链接,链接应该要有有效期
        String link = "?" + token;
        // 向新邮箱发送邮件，邮件附带激活链接，点击链接进行验证
@@ -2163,7 +2182,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
    // 验证激活链接
    public void activateNewEmail(String token){
        // 获取链接地址信息，更新指定用户邮箱
-        String emailAndId = jwtTokenHelper.parseToEmailAndId(token);
+        String emailAndId = tokenGenerateUtils.parseMailboxToken(token);
        String newMailbox = emailAndId.substring(0, emailAndId.lastIndexOf("_"));
        String accountId = emailAndId.substring(emailAndId.lastIndexOf("_") + 1);

--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -1553,11 +1553,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
                if (imagePath != null) {
                    requestBuilder.image(finalImagePath1);
                }
-                if (useModel.equals(ModelConstants.PRINTBOARD_HIGH_I2I)) {
+                if (useModel.equals(ModelConstants.PRINTBOARD_HIGH_I2I)|| useModel.equals(ModelConstants.PRINTBOARD_HIGH_T2I)) {
                    GenerateImagesRequest.OptimizePromptOptions optimizePromptOptions = new GenerateImagesRequest.OptimizePromptOptions();
                    optimizePromptOptions.setMode("fast");
                    requestBuilder.optimizePromptOptions(optimizePromptOptions);
-                    //由于PRINTBOARD_HIGH_I2I与PRINTBOARD_ADVANCED_I2I使用模型一致，为了区别积分扣除，PRINTBOARD_HIGH_I2I加入了-fast，但传入模型时需要去掉-fast，用PRINTBOARD_ADVANCED_I2I的常量做替代
+                    //由于PRINTBOARD_HIGH_T2I,PRINTBOARD_HIGH_I2I与PRINTBOARD_ADVANCED_I2I使用模型一致，为了区别积分扣除，PRINTBOARD_HIGH_I2I加入了-fast或者-high，但传入模型时需要去掉-fast或者-high，用PRINTBOARD_ADVANCED_I2I的常量做替代
                    requestBuilder.model(ModelConstants.PRINTBOARD_ADVANCED_I2I);
                }

@@ -4225,8 +4225,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
        }

        // 发送POST请求到Flux API
+        long start = System.currentTimeMillis();
        String resp = sendRequestUtil.sendFluxPost(fluxRequestUrl, requestBody.toString());
        JSONObject respObj = JSONUtil.parseObj(resp);
+        long end = System.currentTimeMillis();
+        log.info("flux 耗时：{}ms", end - start);
        log.info("flux 发起生成请求返回结果： {}", respObj);

        // 从响应中提取任务ID
--- a/src/main/java/com/ai/da/service/impl/LLMServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/LLMServiceImpl.java
@@ -7,7 +7,7 @@ import com.ai.da.common.enums.CollectionLevel1TypeEnum;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.PageResponse;
 import com.ai.da.common.response.Response;
-import com.ai.da.common.security.jwt.JWTTokenHelper;
+import com.ai.da.common.utils.TokenGenerateUtils;
 import com.ai.da.common.utils.MinioUtil;
 import com.ai.da.mapper.primary.*;
 import com.ai.da.mapper.primary.entity.*;
@@ -70,7 +70,7 @@ public class LLMServiceImpl implements LLMService {
    @Resource
    private WorkspaceRelStyleMapper workspaceRelStyleMapper;
    @Resource
-    private JWTTokenHelper jwtTokenHelper;
+    private TokenGenerateUtils tokenGenerateUtils;
    @Resource
    private DesignService designService;
    private final ExecutorService executor = Executors.newCachedThreadPool();
@@ -89,9 +89,9 @@ public class LLMServiceImpl implements LLMService {

        executor.submit(() -> {
            try {
-                boolean validate = jwtTokenHelper.validateToken(token); //
+                boolean validate = tokenGenerateUtils.validateToken(token); //
                if (validate) {
-                    AuthPrincipalVo principal = jwtTokenHelper.parserToUser(token);
+                    AuthPrincipalVo principal = tokenGenerateUtils.parserToUser(token);
                    Long accountId = principal.getId();
 //                    String url = "http://18.167.251.121:10002/chat-stream";
                    String url = "http://10.1.1.240:1013/chat-stream";
@@ -237,10 +237,10 @@ public class LLMServiceImpl implements LLMService {

        executor.submit(() -> {
            try {
-                boolean validate = jwtTokenHelper.validateToken(token);
+                boolean validate = tokenGenerateUtils.validateToken(token);
 //                boolean validate = true;
                if (validate) {
-                    AuthPrincipalVo principal = jwtTokenHelper.parserToUser(token);
+                    AuthPrincipalVo principal = tokenGenerateUtils.parserToUser(token);
                    Long accountId = principal.getId();
 //                    String url = "http://18.167.251.121:10002/api/chat_stream";
                    String url = "http://18.167.251.121:2011/api/chat_stream";
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
--- a/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java
+++ b/src/main/java/com/ai/da/service/upload/impl/UploadServiceImpl.java
@@ -547,7 +547,7 @@ public class UploadServiceImpl implements UploadService {
    /**
     * 清理过期上传任务（每小时执行一次）
     */
-    @Scheduled(fixedDelay = 3600000) // 1小时
+//    @Scheduled(fixedDelay = 3600000) // 1小时
    public void cleanupExpiredUploads() {
        LocalDateTime now = LocalDateTime.now();
        uploadTasks.entrySet().removeIf(entry -> {
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,184 +0,0 @@
-server.port=5567
-
-spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida_back?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-#spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/test_aida_3.1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.primary.username=aida_con
-spring.datasource.primary.password=123456
-
-spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval_style?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.secondary.username=aida_con
-spring.datasource.secondary.password=123456
-
-#security
-spring.security.jwtSecret=JWTSECRET
-spring.security.jwtTokenHeader=Authorization
-spring.security.jwtTokenPrefix=Bearer-
-## 24Сʱ
-spring.security.jwtExpiration=8640000000
-#spring security权限设置 认证了token还要认证权限 不然报错Full authentication is required to access this resource
-spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\
-  /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,\
-  /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR,/api/alipay-hk/**,/api/portfolio/**,\
-  /api/stripe/**,/api/message/**,/api/tags/**,/notification/**,/api/affiliate/**,/api/project/**,/api/llm/**, /api/subscription_plan/**,/api/global-award/**
-spring.security.authApi=/auth/login
-
-
-rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
-
-#mybatis
-mybatis-plus.global-config.banner=false
-mybatis-plus.mapper-locations=classpath:mapper/*/*.xml
-mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
-mybatis-plus.global-config.db-config.logic-delete-value=1
-mybatis-plus.global-config.db-config.logic-not-delete-value=0
-
-spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-
-file.mac.path=~/file/
-file.linux.path=/workspace/home/aida/file/
-#linux服务器域名(预览和下载用)
-file.linuxDomain=https://www.aida.com.hk/download/
-file.windows.path=D:\\upload\\
-spring.servlet.multipart.max-file-size = 10MB
-spring.servlet.multipart.max-request-size= 10MB
-#访问python服务的ip(对应环境)
-access.python.ip=http://18.167.251.121
-access.python.port=9994
-access.python.generate_sr_port=9994
-access.python.address=http://18.167.251.121:9994
-
-minio.endpoint=https://www.minio-api.aida.com.hk
-minio.accessKey=admin
-minio.secretKey=Aidlab123123!
-minio.bucketName.clothing=aida-clothing
-minio.bucketName.mannequins=aida-mannequins
-minio.bucketName.results=aida-results
-minio.bucketName.sysImage=aida-sys-image
-minio.bucketName.users=aida-users
-minio.bucketName.collectionElement=aida-collection-element
-minio.bucketName.gradient=aida-gradient
-minio.bucketName.modifiedSketch=aida-modified-sketch
-minio.bucketName.slogan=aida-slogan
-minio.bucketName.partialDesign=aida-partial-design
-minio.bucketName.globalAward=global-award
-redirect_url=http://18.167.251.121:7788
-
-spring.rabbitmq.host=18.167.251.121
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=rabbit
-spring.rabbitmq.password=123456
-spring.rabbitmq.virtual-host=/
-
-spring.data.redis.host=172.31.11.32
-#spring.data.redis.host=18.167.251.121
-spring.data.redis.port=6379
-spring.data.redis.database=1
-spring.data.redis.password=Aidlab
-spring.data.redis.lettuce.pool.max-active=8
-spring.data.redis.lettuce.pool.max-idle=8
-spring.data.redis.lettuce.pool.min-idle=0
-spring.data.redis.lettuce.pool.max-wait=5
-
-redis.key.orderForGenerate=OrderForGenerate
-redis.key.generateCancelSet=GenerateCancelSet
-redis.key.generateExceptionMap=Generate:Exception
-redis.key.resultMap=ResultMap
-redis.key.orderForSR=OrderForSR
-redis.key.SRCancelSet=SRCancelSet
-redis.key.SRExceptionMap=SRExceptionMap
-redis.key.taskList=TaskList
-redis.key.credits.pre-deduction=Credits:PreDeduction
-redis.key.generateResult=Generate:Result
-redis.key.toProductImageResultKey=ToProductImage:Result
-redis.key.relightResultKey=Relight:Result
-redis.key.newPosted=LastViewNewPostedTime
-redis.key.maximumUserId=CodeCreate:MaximumUserId
-
-aws.s3.accessKeyId=AKIAVD3OJIMF6UJFLSHZ
-aws.s3.secretKey=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
-aws.s3.regionName=ap-east-1
-
-# RabbitMQ Exchange and Queue configurations
-rabbitmq.queues.generate=generate-queue-dev
-rabbitmq.queues.sr=SR-queue-dev
-rabbitmq.queues.srResult=SuperResolution-dev
-rabbitmq.queues.generateResult=GenerateImage-dev
-rabbitmq.queues.toProductImageResult=ToProductImage-dev
-rabbitmq.queues.relightResult=Relight-dev
-rabbitmq.queues.poseTransform=PoseTransform-dev
-rabbitmq.exchange.generate=generate-exchange
-rabbitmq.queues.designBatch=DesignBatch-dev
-rabbitmq.queues.relightBatch=BatchRelight-dev
-rabbitmq.queues.toProductImageBatch=BatchToProductImage-dev
-rabbitmq.queues.poseTransformBatch=BatchPoseTransform-dev
-rabbitmq.queues.emailRetry=emailRetry-business
-# 死信队列配置
-rabbitmq.dead-letter.exchange=dlx.email-retry
-rabbitmq.dead-letter.queue=dlx.email-retry.queue
-rabbitmq.dead-letter.routing-key=dlx.email-retry.key
-
-orderList.link=https://develop.aida.com.hk/home/homePage?order=
-
-# 0 不发送邮件通知 1 发送邮件通知
-stripe.webhook.fail.reminder=0
-# kim test
-#stripe.paymentMethodConfiguration=pmc_1LywTWH7nPZ8bkrN6FvdCUWG
-# developer test
-stripe.paymentMethodConfiguration=pmc_1QIKyq02n1TEydyNKVEYvhW7
-#thymelea模板配置
-#控制 Thymeleaf 是否启用模板缓存 生产环境用true,以提高性能
-spring.thymeleaf.cache=false
-
-#指定邮件服务器的地址。
-spring.mail.host=mail.aida.com.hk
-#指定邮件服务器的端口号。
-spring.mail.port=465
-#指定登录邮件服务器的用户名
-spring.mail.username=info@aida.com.hk
-#指定登录邮件服务器的密码 / 授权码
-spring.mail.password=AIdlab@2025
-spring.mail.default-encoding=UTF-8
-
-# SSL 配置
-#启用 SSL 加密
-spring.mail.properties.mail.smtp.ssl.enable=true
-#指定 SSL 连接的端口号。通常与 spring.mail.port 一致
-spring.mail.properties.mail.smtp.socketFactory.port=465
-
-ALIYUN_API_KEY=sk-dc3f88b7df844fc5a7d3616ebd8a589c
-DOUBAO_API_KEY=853b3c55-f1dd-406e-a356-64123637f635
-FREEPIK_API_KEY=FPSX94e5917d376a4facb87dabbaa0319c72
-
-ollama.url=http://localhost:11434/api/chat
-
-#google.client.id=29310152396-c44dcsoksjirhn7vbo29p8u8n0sg4qps.apps.googleusercontent.com
-google.client.id=157095842121-kdd1fdf8m8nudvj9sprstb2k2prnf9e4.apps.googleusercontent.com
-#google.client.secret=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
-google.client.secret=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
-google.redirect.uri=https://develop.api.aida.com.hk/api/third/party/auth/google_callback
-design.callback.url=https://develop.api.aida.com.hk/api/third/party/receiveDesignResults
-
-# ===== 分片上传配置 =====
-
-# 临时文件目录
-file.upload.temp.dir=temp/uploads
-
-# 分片大小配置
-# PDF分片大小：1MB
-file.upload.chunk.size.pdf=1048576
-# 视频分片大小：2MB
-file.upload.chunk.size.video=2097152
-
-# 文件大小限制
-# PDF最大文件大小：20MB
-file.upload.max.size.pdf=20971520
-# 视频最大文件大小：100MB
-file.upload.max.size.video=104857600
-
-# 上传任务过期时间（小时）
-file.upload.task.expiry.hours=24
-
-global.award.link=https://aida-global-design-awards.com.hk/contestants?id=
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -1,182 +0,0 @@
-server.port=5567
-
-#datasource
-spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.primary.username=root
-spring.datasource.primary.password=QWa998345
-
-spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval_style?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.secondary.username=aida_con
-spring.datasource.secondary.password=123456
-
-#security
-spring.security.jwtSecret=JWTSECRET
-spring.security.jwtTokenHeader=Authorization
-spring.security.jwtTokenPrefix=Bearer-
-## 24Сʱ
-#spring.security.jwtExpiration=8640000000
-spring.security.jwtExpiration=604800000
-#spring security权限设置 认证了token还要认证权限 不然报错Full authentication is required to access this resource
-spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\
-  /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,\
-  /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR,/api/alipay-hk/**,/api/portfolio/**,\
-  /api/stripe/**,/api/message/**,/api/tags/**,/notification/**,/api/affiliate/**,/api/project/**,/api/llm/**, /api/subscription_plan/**,/api/global-award/**
-spring.security.authApi=/auth/login
-
-
-rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
-
-#mybatis
-mybatis-plus.global-config.banner=false
-mybatis-plus.mapper-locations=classpath:mapper/*/*.xml
-mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
-mybatis-plus.global-config.db-config.logic-delete-value=1
-mybatis-plus.global-config.db-config.logic-not-delete-value=0
-
-spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-
-file.mac.path=~/file/
-file.linux.path=/workspace/home/aida/file/
-#linux服务器域名(预览和下载用)
-file.linuxDomain=https://www.aida.com.hk/download/
-file.windows.path=D:\\upload\\
-spring.servlet.multipart.max-file-size = 10MB
-spring.servlet.multipart.max-request-size= 10MB
-#访问python服务的ip(对应环境)
-access.python.ip=http://18.167.251.121
-access.python.port=9990
-access.python.generate_sr_port=9990
-access.python.address=http://18.167.251.121:9990
-
-minio.endpoint=https://www.minio-api.aida.com.hk
-minio.accessKey=admin
-minio.secretKey=Aidlab123123!
-minio.bucketName.clothing=aida-clothing
-minio.bucketName.mannequins=aida-mannequins
-minio.bucketName.results=aida-results
-minio.bucketName.sysImage=aida-sys-image
-minio.bucketName.users=aida-users
-minio.bucketName.collectionElement=aida-collection-element
-minio.bucketName.gradient=aida-gradient
-minio.bucketName.modifiedSketch=aida-modified-sketch
-minio.bucketName.slogan=aida-slogan
-minio.bucketName.partialDesign=aida-partial-design
-minio.bucketName.globalAward=global-award
-redirect_url=http://18.167.251.121:7788
-
-spring.rabbitmq.host=18.167.251.121
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=rabbit
-spring.rabbitmq.password=123456
-spring.rabbitmq.virtual-host=/
-
-spring.data.redis.host=172.31.11.32
-#spring.data.redis.host=18.167.251.121
-spring.data.redis.port=6379
-spring.data.redis.database=2
-spring.data.redis.password=Aidlab
-spring.data.redis.lettuce.pool.max-active=8
-spring.data.redis.lettuce.pool.max-idle=8
-spring.data.redis.lettuce.pool.min-idle=0
-spring.data.redis.lettuce.pool.max-wait=5
-
-redis.key.orderForGenerate=OrderForGenerate
-redis.key.generateCancelSet=GenerateCancelSet
-redis.key.generateExceptionMap=Generate:Exception
-redis.key.resultMap=ResultMap
-redis.key.orderForSR=OrderForSR
-redis.key.SRCancelSet=SRCancelSet
-redis.key.SRExceptionMap=SRExceptionMap
-redis.key.taskList=TaskList
-redis.key.credits.pre-deduction=Credits:PreDeduction
-redis.key.generateResult=Generate:Result
-redis.key.toProductImageResultKey=ToProductImage:Result
-redis.key.relightResultKey=Relight:Result
-redis.key.newPosted=LastViewNewPostedTime
-redis.key.maximumUserId=CodeCreate:MaximumUserId
-
-aws.s3.accessKeyId=AKIAVD3OJIMF6UJFLSHZ
-aws.s3.secretKey=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
-aws.s3.regionName=ap-east-1
-
-# RabbitMQ Exchange and Queue configurations
-rabbitmq.queues.generate=generate-queue-prod
-rabbitmq.queues.sr=SR-queue-prod
-rabbitmq.queues.srResult=SuperResolution-prod
-rabbitmq.queues.generateResult=GenerateImage-prod
-rabbitmq.queues.toProductImageResult=ToProductImage-prod
-rabbitmq.queues.relightResult=Relight-prod
-rabbitmq.queues.poseTransform=PoseTransform-prod
-rabbitmq.exchange.generate=generate-exchange
-rabbitmq.queues.designBatch=DesignBatch-dev
-rabbitmq.queues.relightBatch=BatchRelight-dev
-rabbitmq.queues.toProductImageBatch=BatchToProductImage-dev
-rabbitmq.queues.poseTransformBatch=BatchPoseTransform-dev
-rabbitmq.queues.emailRetry=emailRetry-business
-# 死信队列配置
-rabbitmq.dead-letter.exchange=dlx.email-retry
-rabbitmq.dead-letter.queue=dlx.email-retry.queue
-rabbitmq.dead-letter.routing-key=dlx.email-retry.key
-
-orderList.link=https://aida.com.hk/home/homePage?order=
-
-# 0 不发送邮件通知 1 发送邮件通知
-stripe.webhook.fail.reminder=1
-# kim live
-stripe.paymentMethodConfiguration=pmc_1Qu6yJH7nPZ8bkrNULYnFFPf
-# kim test
-#stripe.paymentMethodConfiguration=pmc_1LywTWH7nPZ8bkrN6FvdCUWG
-# developer test
-#stripe.paymentMethodConfiguration=pmc_1QIKyq02n1TEydyNKVEYvhW7
-#thymelea模板配置
-#控制 Thymeleaf 是否启用模板缓存 生产环境用true,以提高性能
-spring.thymeleaf.cache=false
-
-#指定邮件服务器的地址。
-spring.mail.host=mail.aida.com.hk
-#指定邮件服务器的端口号。
-spring.mail.port=465
-#指定登录邮件服务器的用户名
-spring.mail.username=info@aida.com.hk
-#指定登录邮件服务器的密码 / 授权码
-spring.mail.password=AIdlab@2025
-spring.mail.default-encoding=UTF-8
-
-# SSL 配置
-#启用 SSL 加密
-spring.mail.properties.mail.smtp.ssl.enable=true
-#指定 SSL 连接的端口号。通常与 spring.mail.port 一致
-spring.mail.properties.mail.smtp.socketFactory.port=465
-
-ALIYUN_API_KEY=sk-dc3f88b7df844fc5a7d3616ebd8a589c
-DOUBAO_API_KEY=853b3c55-f1dd-406e-a356-64123637f635
-FREEPIK_API_KEY=FPSX94e5917d376a4facb87dabbaa0319c72
-
-google.client.id=29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com
-google.client.secret=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
-google.redirect.uri=https://www.api.aida.com.hk/api/third/party/auth/google_callback
-design.callback.url=https://api.aida.com.hk/api/third/party/receiveDesignResults
-
-# ===== 分片上传配置 =====
-
-# 临时文件目录
-file.upload.temp.dir=temp/uploads
-
-# 分片大小配置
-# PDF分片大小：1MB
-file.upload.chunk.size.pdf=1048576
-# 视频分片大小：2MB
-file.upload.chunk.size.video=2097152
-
-# 文件大小限制
-# PDF最大文件大小：20MB
-file.upload.max.size.pdf=20971520
-# 视频最大文件大小：100MB
-file.upload.max.size.video=104857600
-
-# 上传任务过期时间（小时）
-file.upload.task.expiry.hours=24
-
-global.award.link=https://aida-global-design-awards.com.hk/contestants?id=
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -1,101 +0,0 @@
-server.port=5567
-
-#datasource
-spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.primary.username=root
-spring.datasource.primary.password=QWa998345
-
-spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval_new?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.secondary.username=aida_con
-spring.datasource.secondary.password=123456
-
-#security
-spring.security.jwtSecret=JWTSECRET
-spring.security.jwtTokenHeader=Authorization
-spring.security.jwtTokenPrefix=Bearer-
-## 24Сʱ
-spring.security.jwtExpiration=8640000000
-#spring security权限设置 认证了token还要认证权限 不然报错Full authentication is required to access this resource
-spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\
-  /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,\
-  /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR
-spring.security.authApi=/auth/login
-
-
-rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
-
-#mybatis
-mybatis-plus.global-config.banner=false
-mybatis-plus.mapper-locations=classpath:mapper/*/*.xml
-mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
-mybatis-plus.global-config.db-config.logic-delete-value=1
-mybatis-plus.global-config.db-config.logic-not-delete-value=0
-
-spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-
-file.mac.path=~/file/
-file.linux.path=/workspace/home/aida/file/
-#linux服务器域名(预览和下载用)
-file.linuxDomain=https://www.aida.com.hk/download/
-file.windows.path=D:\\upload\\
-spring.servlet.multipart.max-file-size = 10MB
-spring.servlet.multipart.max-request-size= 10MB
-#访问python服务的ip(对应环境)
-#access.python.ip=http://43.198.80.117
-access.python.ip=http://18.167.251.121
-#access.python.ip=http://18.167.251.121:9991/
-access.python.port=9992
-access.python.sr=http://18.167.251.121:9994
-
-minio.endpoint=https://www.minio.aida.com.hk:12024
-minio.accessKey=admin
-minio.secretKey=Aidlab123123!
-minio.bucketName.clothing=aida-clothing
-minio.bucketName.mannequins=aida-mannequins
-minio.bucketName.results=aida-results
-minio.bucketName.sysImage=aida-sys-image
-minio.bucketName.users=aida-users
-minio.bucketName.collectionElement=aida-collection-element
-redirect_url=http://18.167.251.121:7788
-
-spring.rabbitmq.host=18.167.251.121
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=rabbit
-spring.rabbitmq.password=123456
-spring.rabbitmq.virtual-host=/
-
-spring.redis.host=172.31.11.32
-#spring.redis.host=18.167.251.121
-spring.redis.port=6379
-spring.redis.database=1
-spring.redis.password=Aidlab
-spring.redis.lettuce.pool.max-active=8
-spring.redis.lettuce.pool.max-idle=8
-spring.redis.lettuce.pool.min-idle=0
-spring.redis.lettuce.pool.max-wait=5
-
-redis.key.orderForGenerate=OrderForGenerate
-redis.key.generateCancelSet=GenerateCancelSet
-redis.key.generateExceptionMap=Generate:Exception
-redis.key.resultMap=ResultMap
-redis.key.orderForSR=OrderForSR
-redis.key.SRCancelSet=SRCancelSet
-redis.key.SRExceptionMap=SRExceptionMap
-redis.key.taskList=TaskList
-redis.key.credits.pre-deduction=Credits:PreDeduction
-redis.key.generateResult=Generate:Result
-
-aws.s3.accessKeyId=AKIAVD3OJIMF6UJFLSHZ
-aws.s3.secretKey=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
-aws.s3.regionName=ap-east-1
-
-# RabbitMQ Exchange and Queue configurations
-rabbitmq.queues.generate=generate-queue-test
-rabbitmq.queues.sr=SR-queue-test
-rabbitmq.queues.srResult=SuperResolution-test
-rabbitmq.queues.generateResult=GenerateImage-test
-rabbitmq.queues.toProductImageResult=ToProductImage-test
-rabbitmq.queues.relightResult=Relight-test
-rabbitmq.exchange.generate=generate-exchange
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,8 +0,0 @@
-#<23><><EFBFBD><EFBFBD>application-test<73>ļ<EFBFBD>(<28><><EFBFBD>Ի<EFBFBD><D4BB><EFBFBD>)
-#spring.profiles.active=test
-
-#<23><><EFBFBD><EFBFBD>application-prod<6F>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
-#spring.profiles.active=prod
-
-#<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
-spring.profiles.active=dev
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -0,0 +1,114 @@
+# ============================================================
+# aida-back - 本地配置（不区分环境）
+# 公共配置（DB、Redis、RabbitMQ、MinIO、API Keys 等）由 Nacos 统一管理
+# 此文件仅包含 back 服务私有的业务配置
+# ============================================================
+
+server:
+  port: 10092
+
+spring:
+  application:
+    name: aida-back
+
+
+# ---------- MinIO Buckets ----------
+minio:
+  bucketName:
+    clothing: aida-clothing
+    mannequins: aida-mannequins
+    results: aida-results
+    sysImage: aida-sys-image
+    users: aida-users
+    collectionElement: aida-collection-element
+    gradient: aida-gradient
+    modifiedSketch: aida-modified-sketch
+    slogan: aida-slogan
+    partialDesign: aida-partial-design
+    globalAward: global-award
+
+# ---------- Redis Keys ----------
+redis:
+  key:
+    orderForGenerate: OrderForGenerate
+    generateCancelSet: GenerateCancelSet
+    generateExceptionMap: Generate:Exception
+    resultMap: ResultMap
+    orderForSR: OrderForSR
+    SRCancelSet: SRCancelSet
+    SRExceptionMap: SRExceptionMap
+    taskList: TaskList
+    credits:
+      pre-deduction: Credits:PreDeduction
+    generateResult: Generate:Result
+    toProductImageResultKey: ToProductImage:Result
+    relightResultKey: Relight:Result
+    newPosted: LastViewNewPostedTime
+    maximumUserId: CodeCreate:MaximumUserId
+
+# ---------- RabbitMQ 队列 ----------
+rabbitmq:
+  queues:
+    generate: generate-queue
+    sr: SR-queue
+    srResult: SuperResolution
+    generateResult: GenerateImage
+    toProductImageResult: ToProductImage
+    relightResult: Relight
+    poseTransform: PoseTransform
+    designBatch: DesignBatch
+    relightBatch: BatchRelight
+    toProductImageBatch: BatchToProductImage
+    poseTransformBatch: BatchPoseTransform
+    emailRetry: emailRetry-business
+  exchange:
+    generate: generate-exchange
+  dead-letter:
+    exchange: dlx.email-retry
+    queue: dlx.email-retry.queue
+    routing-key: dlx.email-retry.key
+
+# ---------- 第三方服务 ----------
+orderList:
+  link: https://develop.aida.com.hk/home/homePage?order=
+
+stripe:
+  webhook:
+    fail:
+      reminder: 0
+  paymentMethodConfiguration: pmc_1QIKyq02n1TEydyNKVEYvhW7
+
+google:
+  client:
+    id: 157095842121-kdd1fdf8m8nudvj9sprstb2k2prnf9e4.apps.googleusercontent.com
+    secret: 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
+  redirect:
+    uri: https://develop.api.aida.com.hk/api/third/party/auth/google_callback
+
+redirect:
+  url: http://18.167.251.121:7788
+
+global:
+  award:
+    link: https://aida-global-design-awards.com.hk/contestants?id=
+
+# ---------- 文件上传 ----------
+file:
+  upload:
+    temp:
+      dir: temp/uploads
+    chunk:
+      size:
+        pdf: 1048576
+        video: 2097152
+    max:
+      size:
+        pdf: 20971520
+        video: 104857600
+    task:
+      expiry:
+        hours: 24
+
+logging:
+  level:
+    com.aida: debug
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -0,0 +1,34 @@
+# ============================================================
+# aida-back - Bootstrap
+# 通过 NACOS_NAMESPACE 环境变量切换命名空间（dev / test / prod）
+# 示例：docker run -e NACOS_NAMESPACE=prod ...
+# ============================================================
+
+nacos:
+  namespace: dev
+  host: 18.167.251.121:28848
+  username: nacos
+  password: Aidlab123123!
+
+spring:
+  application:
+    name: aida-back
+  config:
+    import: optional:nacos:aida-public-${nacos.namespace}.yml
+  cloud:
+    nacos:
+      discovery:
+        server-addr: ${nacos.host}
+        namespace: ${nacos.namespace}
+        username: ${nacos.username}
+        password: ${nacos.password}
+#        ip: 18.167.251.121
+        port: 10092
+#        ip-type: ipv4
+#        prefer-ip-address: true
+      config:
+        server-addr: ${nacos.host}
+        namespace: ${nacos.namespace}
+        file-extension: yaml
+        username: ${nacos.username}
+        password: ${nacos.password}
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -111,6 +111,7 @@ waistbandRight.cannot.be.empty=waistbandRight cannot be empty.
 handLeft.cannot.be.empty=handLeft cannot be empty.
 handRight.cannot.be.empty=handRight cannot be empty.
 id.cannot.be.empty=id cannot be empty.
+url.cannot.be.empty=url cannot be empty.
 type.cannot.be.empty=type cannot be empty.
 color.cannot.be.empty=color cannot be empty.
 generateDetailId.cannot.be.empty=generateDetailId cannot be empty.
--- a/src/main/resources/messages_zh.properties
+++ b/src/main/resources/messages_zh.properties
@@ -110,6 +110,7 @@ waistbandRight.cannot.be.empty=waistbandRight不能为空。
 handLeft.cannot.be.empty=handLeft不能为空。
 handRight.cannot.be.empty=handRight不能为空。
 id.cannot.be.empty=id不能为空。
+url.cannot.be.empty=url不能为空。
 type.cannot.be.empty=type不能为空。
 color.cannot.be.empty=color不能为空。
 generateDetailId.cannot.be.empty=generateDetailId不能为空。
Author	SHA1	Message	Date
litianxiang	d700f94f9d	flux test	2026-05-14 16:36:55 +08:00
litianxiang	b277479e73	豆包模型更换	2026-05-13 20:52:28 +08:00
litianxiang	83cbd57dea	登录鉴权按照Source判断id来自于何处	2026-05-13 09:40:30 +08:00
litianxiang	4d3b22de82	买家端需要的获取商家主页和模糊搜索接口	2026-05-11 16:40:44 +08:00
litianxiang	6b5c2cfec0	日志订单表字段改名视频返回新增字段	2026-05-06 16:58:46 +08:00
litianxiang	b676de054a	新工作流	2026-05-06 14:37:42 +08:00
litianxiang	4c169ef67e	seller产品图处加入视频	2026-05-06 13:30:21 +08:00
litianxiang	f2bce066b6	seller产品图编辑	2026-05-06 10:46:14 +08:00
litianxiang	6af442eb15	服务端口号与宿主机统一，方便本地调试不需要修改bootstrap	2026-05-04 14:21:35 +08:00
litianxiang	768df55309	服务端口号与宿主机统一，方便本地调试不需要修改bootstrap	2026-05-04 14:19:37 +08:00
litianxiang	f351277b73	nacos注册配置	2026-05-04 10:27:20 +08:00
litianxiang	a799162ea4	工作流	2026-04-28 16:40:56 +08:00
litianxiang	c035eb9d7d	bootstrap配置	2026-04-28 14:38:00 +08:00
litianxiang	906a54b3c8	工作流配置	2026-04-28 13:58:46 +08:00
litianxiang	643799546b	工作流配置	2026-04-28 13:42:24 +08:00
litianxiang	f582464cd3	工作流配置	2026-04-28 13:37:47 +08:00
litianxiang	b864b393bc	1	2026-04-28 13:21:12 +08:00
litianxiang	c03a8762e7	商品bug	2026-04-28 09:39:26 +08:00
litianxiang	cb87ad1099	host配置	2026-04-27 16:43:18 +08:00
litianxiang	fb229764f8	host配置	2026-04-27 16:29:54 +08:00
litianxiang	8bec1f842d	工作流配置	2026-04-27 16:10:01 +08:00
litianxiang	b54bd04cff	端口号冲突	2026-04-27 15:00:28 +08:00
litianxiang	b4ccad6242	服务名修改	2026-04-27 14:30:29 +08:00
litianxiang	6068bf7d7d	微服务改造	2026-04-27 13:54:03 +08:00
litianxiang	d36baf747f	微服务改造	2026-04-27 11:47:15 +08:00
admin	7c8f1bee6a	添加 .gitea/workflows/develop_3.1_MS_build_manual.yaml	2026-04-24 13:40:03 +08:00
litianxiang	62bd145e2c	微服务改造	2026-04-23 10:52:49 +08:00
litianxiang	23716984cc	微服务改造	2026-04-22 15:54:42 +08:00
litianxiang	d0b8b8d674	微服务改造	2026-04-22 11:16:03 +08:00
litianxiang	92e7dbf258	微服务改造	2026-04-22 11:15:34 +08:00
litianxiang	32a228485b	token保持一致	2026-04-20 10:26:04 +08:00
litianxiang	560e47747a	微服务改造	2026-04-16 15:51:05 +08:00