wangyunpeng пре 3 месеци
родитељ
комит
08a3d21e73

+ 4 - 4
core/src/main/java/com/tzld/supply/api/SpiderApiService.java

@@ -147,7 +147,7 @@ public class SpiderApiService {
             // 2. 执行请求并解析响应(使用 try-with-resources 自动关闭响应流)
             try (Response response = client.newCall(request).execute()) {
                 if (!response.isSuccessful()) {
-                    return new ResultWrapper<>(-1, null); // HTTP 状态码非 2xx,触发重试
+                    return new ResultWrapper<>(response.code(), null); // HTTP 状态码非 2xx,触发重试
                 }
 
                 String responseBody = response.body().string();
@@ -190,7 +190,7 @@ public class SpiderApiService {
             // 2. 执行请求并解析响应
             try (Response response = client.newCall(request).execute()) {
                 if (!response.isSuccessful()) {
-                    return new ResultWrapper<>(-1, null); // HTTP状态码非2xx,返回失败状态码
+                    return new ResultWrapper<>(response.code(), null); // HTTP状态码非2xx,返回失败状态码
                 }
 
                 String responseBody = response.body().string();
@@ -241,7 +241,7 @@ public class SpiderApiService {
 
             try (Response response = client.newCall(request).execute()) {
                 if (!response.isSuccessful()) {
-                    return new ResultWrapper<>(-1, null);
+                    return new ResultWrapper<>(response.code(), null);
                 }
 
                 String responseBody = response.body().string();
@@ -300,7 +300,7 @@ public class SpiderApiService {
             // 2. 执行请求并解析响应(使用 try-with-resources 自动关闭响应流)
             try (Response response = client.newCall(request).execute()) {
                 if (!response.isSuccessful()) {
-                    return new ResultWrapper<>(-1, null); // HTTP 状态码非 2xx,返回失败状态码
+                    return new ResultWrapper<>(response.code(), null); // HTTP 状态码非 2xx,返回失败状态码
                 }
 
                 String responseBody = response.body().string();

+ 4 - 1
core/src/main/java/com/tzld/supply/api/fish/FishApiServiceImpl.java

@@ -194,21 +194,25 @@ public class FishApiServiceImpl implements FishApiService {
         // retry 3 times
         int retryTimes = 0;
         do {
+            retryTimes++;
             HttpResponseContent hrc = HttpClientUtils.postDataAddHeader(apiUrl, JSON.toJSONString(paramMap), headerMap,
                     10000, 1800000);
             if (Objects.isNull(hrc)) {
                 log.error("fishTTS hrc is null,bizId:{}", bizId);
                 enableRetry = true;
+                continue;
             }
             if (!hrc.isSuccessful()) {
                 log.error("fishTTS,bizId:{}, httpCode:{}, response:{}", bizId, hrc.getStatusCode(), hrc.getBodyContent());
                 if (hrc.getStatusCode() == 402 || hrc.getStatusCode() >= 500) {
                     enableRetry = true;
+                    continue;
                 }
             }
             byte[] contentBytes = hrc.getContentBytes();
             if (contentBytes.length < 10) {
                 enableRetry = true;
+                continue;
             }
             // 上传音频
             String ossKey = "audio/fish/tts/" + RandomUtil.getRandomUUIDStr() + ".mp3";
@@ -217,7 +221,6 @@ public class FishApiServiceImpl implements FishApiService {
             ttsUrl = CdnUtil.getOssHttpUrl(ossKey);
             // 保存记录
             saveTTSCache(speakerId, textMd5, text, bizId, ttsUrl);
-            retryTimes++;
         } while (enableRetry && retryTimes < 3);
         return ttsUrl;
     }

+ 2 - 1
server/src/test/java/ProduceTest.java

@@ -70,12 +70,13 @@ public class ProduceTest {
             example.createCriteria().andContentIdEqualTo(Long.valueOf(contentId));
             List<ProduceVideo> produceVideoList = produceVideoMapper.selectByExample(example);
             if (produceVideoList.isEmpty()) {
-                return;
+                continue;
             }
             ProduceVideo produceVideo = produceVideoList.get(0);
             videoGenerateJob.videoMaterialGenerateJob(produceVideo.getId());
             videoGenerateJob.videoGenerateJob(produceVideo.getId());
         }
+        System.out.println(contentIds.size());
     }
 
     @Test