Merge branch '20250408-wyp-contentPlatform' into test

api-module/src/main/java/com/tzld/piaoquan/api/GrowthServerApplication.java

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.api;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.ComponentScan;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -13,6 +14,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
         "com.tzld.piaoquan.api.*"
 })
 @EnableSwagger2
+@ServletComponentScan("com.tzld.piaoquan.api.filter")
 public class GrowthServerApplication {
     public static void main(String[] args) {
         SpringApplication.run(GrowthServerApplication.class, args);

api-module/src/main/java/com/tzld/piaoquan/api/aop/LogRequestAop.java

@@ -69,7 +69,7 @@ public class LogRequestAop {
     @Value("${aliyun.log.topic:}")
     private String topic;
 
-    private String LOG_TRACE_ID = "logTraceId";
+    public static String LOG_TRACE_ID = "logTraceId";
     private String REQUEST_START_TIME = "request_start_time";
 
     @Autowired

api-module/src/main/java/com/tzld/piaoquan/api/component/ManagerApiService.java

@@ -19,9 +19,6 @@ public class ManagerApiService {
     @Value("${video.api.host:https://videotest.yishihui.com}")
     private String videoApiHost;
 
-    @Value("${aigc.api.token:9ebfcb397e954c41986971f183eb1707}")
-    private String aigcApiToken;
-
     public List<String> getCoverImagePaths(Long videoId) {
         String url = videoApiHost + "/longvideoapi/video/getCoverImagePaths";
         try {

api-module/src/main/java/com/tzld/piaoquan/api/filter/CustomFilter.java

@@ -0,0 +1,41 @@
+package com.tzld.piaoquan.api.filter;
+
+import com.tzld.piaoquan.api.aop.LogRequestAop;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+import org.springframework.core.annotation.Order;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import java.io.IOException;
+import java.util.UUID;
+
+/**
+ * auth filter
+ *
+ * @author ehlxr
+ */
+@Order(value = 1)
+@WebFilter(filterName = "customFilter", urlPatterns = {"/*"})
+public class CustomFilter implements Filter {
+    private static final Logger log = LoggerFactory.getLogger(CustomFilter.class);
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+        log.info("customFilter init");
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+            throws IOException, ServletException {
+        MDC.put(LogRequestAop.LOG_TRACE_ID, UUID.randomUUID().toString().replaceAll("-", ""));
+        filterChain.doFilter(servletRequest, servletResponse);
+        MDC.remove(LogRequestAop.LOG_TRACE_ID);
+    }
+
+    @Override
+    public void destroy() {
+        log.info("customFilter destroy");
+    }
+}

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformCooperateAccountServiceImpl.java

@@ -3,6 +3,7 @@ package com.tzld.piaoquan.api.service.contentplatform.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.piaoquan.api.common.enums.ExceptionEnum;
 import com.tzld.piaoquan.api.common.exception.CommonException;
+import com.tzld.piaoquan.api.component.AigcApiService;
 import com.tzld.piaoquan.api.dao.mapper.contentplatform.ContentPlatformGzhAccountMapper;
 import com.tzld.piaoquan.api.dao.mapper.contentplatform.ext.ContentPlatformGzhAccountMapperExt;
 import com.tzld.piaoquan.api.model.config.LoginUserContext;
@@ -17,10 +18,8 @@ import com.tzld.piaoquan.api.model.vo.contentplatform.CooperateAccountItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.GenerateQrcodeVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.GzhAccountItem;
 import com.tzld.piaoquan.api.model.vo.contentplatform.GzhAuthResultVO;
-import com.tzld.piaoquan.api.component.AigcApiService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformCooperateAccountService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
-import com.tzld.piaoquan.growth.common.utils.RedisUtils;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,9 +43,6 @@ public class ContentPlatformCooperateAccountServiceImpl implements ContentPlatfo
     @Autowired
     private ContentPlatformPlanService planService;
 
-    @Autowired
-    private RedisUtils redisUtils;
-
     @Override
     public Page<CooperateAccountItemVO> gzhList(CooperateAccountListParam param) {
         ContentPlatformAccount loginAccount = LoginUserContext.getUser();