Merge remote-tracking branch 'origin/dev/3.1_release_merge_MS' into dev/3.1_release_merge_MS

pom.xml

@@ -263,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>

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}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer1(Message msg, Channel channel) {
+    public void generateConsumer1(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 1");
+        generate(msg, channel, "consumer 1");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer2(Message msg, Channel channel) {
+    public void generateConsumer2(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 2");
+        generate(msg, channel, "consumer 2");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer3(Message msg, Channel channel) {
+    public void generateConsumer3(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 3");
+        generate(msg, channel, "consumer 3");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer4(Message msg, Channel channel) {
+    public void generateConsumer4(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 4");
+        generate(msg, channel, "consumer 4");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer5(Message msg, Channel channel) {
+    public void generateConsumer5(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 5");
+        generate(msg, channel, "consumer 5");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer6(Message msg, Channel channel) {
+    public void generateConsumer6(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 6");
+        generate(msg, channel, "consumer 6");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer7(Message msg, Channel channel) {
+    public void generateConsumer7(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 7");
+        generate(msg, channel, "consumer 7");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer8(Message msg, Channel channel) {
+    public void generateConsumer8(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 8");
+        generate(msg, channel, "consumer 8");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void generateConsumer9(Message msg, Channel channel) {
+    public void generateConsumer9(Message msg, Channel channel) {
-//        generate(msg, channel, "consumer 9");
+        generate(msg, channel, "consumer 9");
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void getGenerateResult(Message msg, Channel channel) {
+    public void getGenerateResult(Message msg, Channel channel) {
-//        processGenerateResult(msg, channel);
+        processGenerateResult(msg, channel);
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void getToProductImageResult(Message msg, Channel channel) {
+    public void getToProductImageResult(Message msg, Channel channel) {
-//        processToProductImageResult(msg, channel);
+        processToProductImageResult(msg, channel);
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void getRelightResult(Message msg, Channel channel) {
+    public void getRelightResult(Message msg, Channel channel) {
-//        processRelightResult(msg, channel);
+        processRelightResult(msg, channel);
-//    }
+    }
-//
+
-//    @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}")
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}")
-//    @RabbitHandler
+    @RabbitHandler
-//    public void getPoseTransformationResult(Message msg, Channel channel) {
+    public void getPoseTransformationResult(Message msg, Channel channel) {
-//        processPoseTransformResult(msg, channel);
+        processPoseTransformResult(msg, channel);
-//    }
+    }
 //    @RabbitListener(queues = "#{rabbitMQProperties.queues.designBatch}")
 //    @RabbitHandler
 //    public void getDesignBatchResult(Message msg, Channel channel) {

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

@@ -44,9 +44,11 @@ public class ControllerLoggingAspect {
 
             // 获取当前用户ID
             Long userId = null;
+            try {
                 AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder();
-            if (authPrincipalVo != null) {
                 userId = authPrincipalVo.getId();
+            } catch (RuntimeException e) {
+                // 匿名接口，无认证上下文，忽略
             }
 
             // 获取请求参数
@@ -121,9 +123,11 @@ public class ControllerLoggingAspect {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 
         Long userId = null;
+        try {
             AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder();
-        if (authPrincipalVo != null) {
             userId = authPrincipalVo.getId();
+        } catch (RuntimeException e) {
+            // 匿名接口，无认证上下文，忽略
         }
 
         // 获取请求参数

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

@@ -4,11 +4,13 @@ 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
@@ -36,6 +38,14 @@ public class ExceptionCatch {
         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) {

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

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

src/main/java/com/ai/da/common/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 MOODBOARD_ADVANCED = "doubao-seedream-4-5-251128";
-    public static final String PRINTBOARD_HIGH_T2I = "doubao-seedream-3-0-t2i-250415";
+    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";

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

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

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

@@ -52,6 +52,18 @@ public class MinioUtil {
         return minioClient;
     }
 
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     * Redis缓存key前缀，用于Minio签名URL缓存
+     */
+    private static final String REDIS_MINIO_URL_PREFIX = "minio:url:";
+
+    /**
+     * 签名URL缓存过期时间（秒），默认1天
+     */
+    private static final long URL_CACHE_EXPIRE_SECONDS = 24 * 60 * 60;
     /**
      * description: 判断bucket是否存在，不存在则创建
      *
@@ -392,6 +404,11 @@ public class MinioUtil {
      * @return 文件的临时URL，如果出现异常则返回null
      */
     public String getPreSignedUrl(String bucketName, String fileName, int expiry) {
+        String cacheKey = REDIS_MINIO_URL_PREFIX + bucketName + "/" + fileName;
+        Object cachedUrl = redisUtil.getFromString(cacheKey);
+        if (cachedUrl != null) {
+            return cachedUrl.toString();
+        }
         try {
 
             String lowerName = fileName.toLowerCase();
@@ -419,8 +436,9 @@ public class MinioUtil {
 
                 builder.extraQueryParams(queryParams);
             }
-
+            String presignedObjectUrl = minioClient.getPresignedObjectUrl(builder.build());
-            return minioClient.getPresignedObjectUrl(builder.build());
+            redisUtil.addToString(cacheKey, presignedObjectUrl, URL_CACHE_EXPIRE_SECONDS);
+            return presignedObjectUrl;
         } catch (MinioException | InvalidKeyException
                  | IOException | NoSuchAlgorithmException | IllegalArgumentException e) {
             e.printStackTrace();

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

@@ -1076,4 +1076,45 @@ public class SendEmailUtil {
 
     }
 
+    private final static Long SELLER_APPROVED = 184414L;
+    private final static Long SELLER_REJECTED = 184415L;
+    public static void sellerApproval(String receiver, boolean isApproved) {
+        try {
+            // 实例化一个认证对象
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            SendEmailRequest req = new SendEmailRequest();
+            req.setFromEmailAddress(CODE_CREATE_SEND_ADDRESS);
+            req.setDestination(new String[]{receiver});
+
+            // 根据邮件类型设置不同的主题和模板
+            String subject;
+            Template template = new Template();
+            if (isApproved) {
+                subject = "AiDA卖家权限已开通 AiDA Seller Access Enabled";
+                template.setTemplateID(SELLER_APPROVED);
+            }else {
+                subject = "AiDA卖家权限审批不通过 Seller Access Not Approved";
+                template.setTemplateID(SELLER_REJECTED);
+            }
+
+            req.setSubject(subject);
+            req.setTemplate(template);
+
+            // 发送邮件
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("邮件发送成功，收件人地址：{}", receiver);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info(receiver);
+            log.error("邮件发送失败###{},收件人地址：{}", e.toString(), receiver);
+
+        }
+
+    }
+
 }

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

@@ -6,6 +6,7 @@ import com.ai.da.model.dto.GetNotificationDTO;
 import com.ai.da.model.vo.NotificationVO;
 import com.ai.da.model.dto.PublishSysNotificationDTO;
 import com.ai.da.service.MessageCenterService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -60,4 +61,12 @@ public class MessageCenterController {
         messageCenterService.setReadAll(type);
         return Response.success("success");
     }
+
+    @Hidden
+    @Operation(summary = "卖家审批结果站内信通知")
+    @PostMapping("/sellerApprovalNotice")
+    public Response<String> sellerApprovalNotice(@RequestParam("userId") Long userId, @RequestParam("isApproved") boolean isApproved) {
+        messageCenterService.sellerApprovalNotice(userId,  isApproved);
+        return Response.success("success");
+    }
 }

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

@@ -18,4 +18,10 @@ public interface GatewayFeignClient {
      */
     @PostMapping("/logout")
     Response<Void> logout(@RequestParam("userId") Long userId);
+
+    /**
+     * 清除用户黑名单，允许该用户重新登录（登录时会自动调用）。
+     */
+    @PostMapping("/clear-blacklist")
+    Response<Void> clearBlacklist(@RequestParam("userId") Long userId);
 }

src/main/java/com/ai/da/service/MessageCenterService.java

@@ -29,4 +29,6 @@ public interface MessageCenterService extends IService<Notification> {
     void publishSystemNotification(PublishSysNotificationDTO message);
 
     void videoFinishedMsg(Long userId, String projectName, boolean isSuccess);
+
+    void sellerApprovalNotice(Long userId, boolean isApproved);
 }

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

@@ -358,12 +358,20 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         principal.setUsername(account.getUserName());
         principal.setLanguage(account.getLanguage());
         principal.setCountry(account.getCountry());
+        //区分买家端登录
+        principal.setSource("AIDA");
         String token2 = tokenGenerateUtils.createToken(principal);
         // 本地 JVM 缓存（适配旧逻辑）
         LocalCacheUtils.setTokenCache(String.valueOf(account.getId()), token2);
         // 同步写入 Redis，重启后仍然可用
         long jwtExpiration = tokenGenerateUtils.getJwtExpiration();
         redisUtil.setLoginToken(account.getId(), token2, jwtExpiration);
+        // 清除黑名单，允许用户重新登录（仅当黑名单功能开启时）
+        try {
+            gatewayFeignClient.clearBlacklist(account.getId());
+        } catch (Exception e) {
+            log.warn("登录时清除黑名单失败，userId={}, error={}", account.getId(), e.getMessage());
+        }
         return token2;
     }
 

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

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

@@ -7,6 +7,7 @@ import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.utils.CopyUtil;
 import com.ai.da.common.utils.MinioUtil;
 import com.ai.da.common.utils.RedisUtil;
+import com.ai.da.common.utils.SendEmailUtil;
 import com.ai.da.common.websocket.NotificationConnection;
 import com.ai.da.mapper.primary.*;
 import com.ai.da.mapper.primary.entity.*;
@@ -441,4 +442,50 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
         pushMessage("system", userId);
     }
 
+    private final static String APPROVED_MESSAGE = "尊敬的用户，您的卖家权限已开通。" +
+            "现在可通过\"成为卖家\"的同一入口进入卖家中心。\n在卖家中心中，您可以：" +
+            "\n·从设计项目中批量选择服装设计，并创建上架内容 " +
+            "\n·将设计及高级工具媒体转为可售卖的数字商品 " +
+            "\n·编辑、保存、发布并管理商品状态" +
+            "\n\nDear User, your seller access has been enabled. " +
+            "You can now enter the Seller Dashboard from the same entry point used to become a seller.\nIn the Seller Dashboard, you can:" +
+            "\n·Batch select apparel designs from a design project and create listings" +
+            "\n·Turn designs and Advanced Tools media into sellable digital items " +
+            "\n·Edit, save, publish, and manage item status";
+
+    private final static String REJECTED_MESSAGE = "尊敬的用户，您的卖家权限申请审批未通过。 请检查您提交的信息，并确保您的卖家资料符合平台要求。您可以更新相关信息后重新提交申请。\n\n" +
+            "Dear User, your seller access request was not approved. Please review the information you submitted and make sure your seller profile meets the platform requirements. You may update the relevant information and resubmit your application.";
+
+    public void sellerApprovalNotice(Long userId, boolean isApproved) {
+        if (userId != null && userId != 0) {
+            PublishSysNotificationDTO sysNotificationDTO = new PublishSysNotificationDTO();
+            Notification notification = new Notification();
+            notification.setType("system");
+            notification.setReceiverId(userId);
+            if (isApproved) {
+                sysNotificationDTO.setTitle("卖家权限审批通过 Seller Access Enabled");
+                sysNotificationDTO.setContent(APPROVED_MESSAGE);
+
+            } else {
+                sysNotificationDTO.setTitle("卖家权限审批不通过 Seller Access Not Approved");
+                sysNotificationDTO.setContent(REJECTED_MESSAGE);
+
+            }
+            notification.setContent(JSON.toJSONString(sysNotificationDTO));
+            notification.setIsRead(0);
+            notification.setCreateTime(LocalDateTime.now());
+            // 保存消息内容
+            save(notification);
+            // 推送系统消息
+            pushMessage("system", userId);
+
+            Account account = accountService.getById(userId);
+            if (account != null) {
+                // 发送邮件
+                SendEmailUtil.sellerApproval(account.getUserEmail(), isApproved);
+            }
+        }
+
+    }
+
 }

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

@@ -169,7 +169,7 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
     }
 
     /**
-     * 处理结束时间（只能延长）
+     * 处理结束时间，不允许订阅结束时间早于当前时间和订阅开始时间
      */
     private void handlePeriodEnd(UpdateSubscriptionPlanDTO dto, SubscriptionPlan plan) {
         Long newEnd = dto.getCurrentPeriodEnd();
@@ -177,9 +177,20 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
             return;
         }
 
-        if (newEnd < plan.getCurrentPeriodEnd()) {
+        long currentTimeSec = System.currentTimeMillis() / 1000;
+        long startTime = plan.getCurrentPeriodStart();
+
+        // 检查是否早于开始时间（不能等于，否则周期长度为0）
+        if (newEnd <= startTime) {
             throw new BusinessException(
-                    "the.subscription.end.date.can.be.extended.only.not.reduced"
+                    "end.time.cannot.be.earlier.than.or.equal.to.start.time"
+            );
+        }
+
+        // 检查是否早于当前时间（不能等于，否则立即过期）
+        if (newEnd <= currentTimeSec) {
+            throw new BusinessException(
+                    "end.time.cannot.be.earlier.than.or.equal.to.the.current.time"
             );
         }
 

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

@@ -92,14 +92,15 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
         
         for (CollectionSort userLikeSort : childSortList) {
             if (userLikeSort.getRelationType().equals(CollectionType.POSE_TRANSFORM.getValue())){
-                PoseTransformation poseTransformation = poseTransformationMapper.selectById(userLikeSort.getRelationId());
+                //2026.6.2 不显示视频到卖家端
-                if (poseTransformation != null) {
+//                PoseTransformation poseTransformation = poseTransformationMapper.selectById(userLikeSort.getRelationId());
-                    PoseTransformationVideoDTO videoDTO = new PoseTransformationVideoDTO();
+//                if (poseTransformation != null) {
-                    videoDTO.setFirstFrameUrl(minioUtil.processMinioResource(poseTransformation.getFirstFrameUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+//                    PoseTransformationVideoDTO videoDTO = new PoseTransformationVideoDTO();
-                    videoDTO.setGifUrl(minioUtil.processMinioResource(poseTransformation.getGifUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+//                    videoDTO.setFirstFrameUrl(minioUtil.processMinioResource(poseTransformation.getFirstFrameUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-                    videoDTO.setVideoUrl(minioUtil.processMinioResource(poseTransformation.getVideoUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+//                    videoDTO.setGifUrl(minioUtil.processMinioResource(poseTransformation.getGifUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-                    designUrlsDTO.getVideos().add(videoDTO);
+//                    videoDTO.setVideoUrl(minioUtil.processMinioResource(poseTransformation.getVideoUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-                }
+//                    designUrlsDTO.getVideos().add(videoDTO);
+//                }
             }else {
                 ToProductImageResult toProductImageResult = toProductImageResultMapper.selectById(userLikeSort.getRelationId());
                 if (toProductImageResult != null && !isGenerateTaskFailed(toProductImageResult.getStatus(), toProductImageResult.getCreateTime())) {

src/main/resources/application.yml

@@ -11,14 +11,6 @@ spring:
   application:
     name: aida-back
 
-  # ---------- 副数据源（back 私有，由 Nacos 统一管理） ----------
-
-  # ---------- Token 生成参数（由 TokenGenerateUtils 使用） ----------
-  security:
-    jwtSecret: JWTSECRET
-    jwtTokenHeader: Authorization
-    jwtTokenPrefix: Bearer-
-    jwtExpiration: 8640000000
 
 # ---------- MinIO Buckets ----------
 minio:
@@ -57,17 +49,17 @@ redis:
 # ---------- RabbitMQ 队列 ----------
 rabbitmq:
   queues:
-    generate: generate-queue
+    generate: generate-queue-dev
-    sr: SR-queue
+    sr: SR-queue-dev
-    srResult: SuperResolution
+    srResult: SuperResolution-dev
-    generateResult: GenerateImage
+    generateResult: GenerateImage-dev
-    toProductImageResult: ToProductImage
+    toProductImageResult: ToProductImage-dev
-    relightResult: Relight
+    relightResult: Relight-dev
-    poseTransform: PoseTransform
+    poseTransform: PoseTransform-dev
-    designBatch: DesignBatch
+    designBatch: DesignBatch-dev
-    relightBatch: BatchRelight
+    relightBatch: BatchRelight-dev
-    toProductImageBatch: BatchToProductImage
+    toProductImageBatch: BatchToProductImage-dev
-    poseTransformBatch: BatchPoseTransform
+    poseTransformBatch: BatchPoseTransform-dev
     emailRetry: emailRetry-business
   exchange:
     generate: generate-exchange

src/main/resources/messages_en.properties

@@ -211,6 +211,8 @@ please.specify.the.organizationId=Please specify the organizationId.
 switch.failed.sub-account.not.under.your.active.subscription=Switch failed. Sub-account not under your active subscription.
 Sub-accounts.cannot.be.admins=Sub-accounts in a subscription cannot be designated as admins.
 only.subscription.plans.with.a.PENDING.status.can.have.their.start.time.modified=Only subscription plans with a PENDING status can have their start time modified.
+end.time.cannot.be.earlier.than.or.equal.to.start.time=End time cannot be earlier than or equal to start time.
+end.time.cannot.be.earlier.than.or.equal.to.the.current.time=End time cannot be earlier than or equal to the current time.
 the.subscription.end.date.can.be.extended.only.not.reduced=The subscription end date can be extended only, not reduced.
 total.sub-account.quota.cannot.be.lower.than.existing.sub-accounts=Total sub-account quota cannot be lower than existing sub-accounts.
 the.credit.limit.set.cannot.be.lower.than.the.amount.of.credits.already.used=The credit limit set cannot be lower than the amount of credits already used.

src/main/resources/messages_zh.properties

@@ -207,6 +207,8 @@ please.specify.the.organizationId=请指定organizationId
 switch.failed.sub-account.not.under.your.active.subscription=切换失败，该子账号不属于您当前管理的订阅计划
 Sub-accounts.cannot.be.admins=在订阅中的子账号不能被指定为管理员
 only.subscription.plans.with.a.PENDING.status.can.have.their.start.time.modified=只有PENDING状态的订阅计划可以修改订阅开始时间
+end.time.cannot.be.earlier.than.or.equal.to.start.time=订阅结束时间不能早于或等于开始时间
+end.time.cannot.be.earlier.than.or.equal.to.the.current.time=订阅结束时间不能早于或等于当前时间
 the.subscription.end.date.can.be.extended.only.not.reduced=订阅的到期时间不能缩短，只能延长
 total.sub-account.quota.cannot.be.lower.than.existing.sub-accounts=设置的子账号总数量不能低于现存已添加的子账号数量
 the.credit.limit.set.cannot.be.lower.than.the.amount.of.credits.already.used=设置的积分上限不能低于已使用的积分量