Procházet zdrojové kódy

fix 小程序图像失败返回次数

zoujiajian před 1 rokem
rodič
revize
08e890dd1d

+ 1 - 3
netflix-service/src/main/java/com/cyksj/server/listener/AbstractStreamListener.java

@@ -112,8 +112,6 @@ public abstract class AbstractStreamListener extends EventSourceListener {
             if (Objects.nonNull(response)) {
                 responseText = response.body().string();
             }
-            String[] auth = eventSource.request().headers().toString().split(" ");
-            String key = auth[2];
             String forbiddenText = "Your access was terminated due to violation of our policies";
             if (StrUtil.contains(responseText, forbiddenText)) {
                 log.error("Chat session has been terminated due to policy violation");
@@ -123,7 +121,7 @@ public abstract class AbstractStreamListener extends EventSourceListener {
             if (StrUtil.contains(responseText, overloadedText)) {
                 log.error("检测到官方超载了,赶紧优化你的代码,做重试吧");
             }
-            this.onError(throwable, key.replaceAll("\\s*|\r|\n|\t",""));
+            this.onError(throwable, "出图报错");
         } catch (Exception e) {
             log.warn("onFailure error:{}", e);
             // do nothing

+ 9 - 7
netflix-service/src/main/java/com/cyksj/server/listener/ConsoleStreamListener.java

@@ -50,7 +50,7 @@ public class ConsoleStreamListener extends AbstractStreamListener {
 				return;
 			}
 
-			if (content.contains("失败")) {
+			if (content.contains("失败") || content.contains("Generation failed")) {
 				//将用户使用次数返回
 				miniPopularizeCommonService.recoverUserLimit(userId, recoverNum);
 				miniPopularizeCommonService.saveImgRecord(setImagRecord(imgRecordId, img, MiniPopularizeUserConversationChat.Status.fail, content));
@@ -65,7 +65,7 @@ public class ConsoleStreamListener extends AbstractStreamListener {
 		//将用户使用次数返回
 		miniPopularizeCommonService.recoverUserLimit(userId, recoverNum);
 		miniPopularizeCommonService.saveImgRecord(setImagRecord(imgRecordId, null, MiniPopularizeUserConversationChat.Status.fail, "出图失败"));
-		log.error("gpt对话异常,异常key:{}", response);
+		log.error("gpt对话异常,异常:{}", response);
 		Message message = Message.ofAssistant("图片生成异常");
 		SendMessageUtil.sendMessage(userId, message);
 		message = Message.ofAssistant("[DONE]");
@@ -74,11 +74,13 @@ public class ConsoleStreamListener extends AbstractStreamListener {
 	}
 
 	public MiniPopularizeUserConversationChat setImagRecord(Long imagRecordId, String img, MiniPopularizeUserConversationChat.Status status, String content) {
-		String url;
-		try {
-			url = ImageUploadUtil.upload(img, "mgpt");
-		} catch (IOException e) {
-			url = img;
+		String url = null;
+		if (StrUtil.isNotBlank(img)) {
+			try {
+				url = ImageUploadUtil.upload(img, "mgpt");
+			} catch (IOException e) {
+				url = img;
+			}
 		}
 		MiniPopularizeUserConversationChat build = MiniPopularizeUserConversationChat.builder()
 				.conversationId(conversationId)