fix

netflix-service/src/main/java/com/cyksj/service/mini/MiniPopularizeFrontService.java

@@ -1,6 +1,7 @@
 package com.cyksj.service.mini;
 
 import com.cyksj.model.entity.MiniPopularizeUser;
+import com.cyksj.model.entity.MiniPopularizeUserConversationChat;
 import com.cyksj.model.request.MiniAiPicturesReq;
 import com.cyksj.model.request.MiniPopularizeIncrTimesReq;
 import com.cyksj.model.response.MiniPopularizeResp;
@@ -18,7 +19,7 @@ public interface MiniPopularizeFrontService {
 
 	MiniPopularizeUser getUser(long userId);
 
-	String getImgResultById(long userId, Long imageId);
+	MiniPopularizeUserConversationChat getImgResultById(long userId, Long imageId);
 
 	void incrGptTimes(MiniPopularizeIncrTimesReq req) throws Exception;
 

netflix-service/src/main/java/com/cyksj/service/mini/impl/MiniPopularizeFrontServiceImpl.java

@@ -52,7 +52,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class MiniPopularizeFrontServiceImpl implements MiniPopularizeFrontService {
 	public static final String GPT_URL = "https://api.nf.video/v1/chat/completions";
 
-	public static final String GPT_DRAW_TOKEN = "sk-3x6qkSeXJJoYkaIkhlv7mm0DWGizFc7V7sapmtoMoYI0Nd5Z";
+	public static final String GPT_DRAW_TOKEN = "sk-Tsxxyfly6RCuyJ6hq6iNdPkSD1SzUxQX3mgO0ItF1AaLWacR";
 
 	public static final String SIGN_SECRET = "6mR7XvKbPeShVmYq3t5w9z$C&FH@McQ";
 
@@ -143,15 +143,12 @@ public class MiniPopularizeFrontServiceImpl implements MiniPopularizeFrontServic
 	}
 
 	@Override
-	public String getImgResultById(long userId, Long imageId) {
+	public MiniPopularizeUserConversationChat getImgResultById(long userId, Long imageId) {
 		MiniPopularizeUserConversationChat miniPopularizeUserConversationChat = conversationChatMapper.selectOne(Wrappers.lambdaQuery(MiniPopularizeUserConversationChat.class)
 				.eq(MiniPopularizeUserConversationChat::getUserId, userId)
 				.eq(MiniPopularizeUserConversationChat::getId, imageId)
 				.last("limit 1"));
-		if (miniPopularizeUserConversationChat != null) {
-			return miniPopularizeUserConversationChat.getImg();
-		}
-		return null;
+		return miniPopularizeUserConversationChat;
 	}
 
 	@Override

netflix-web/src/main/java/com/cyksj/web/controller/mini/PopularizeMiniController.java

@@ -97,10 +97,10 @@ public class PopularizeMiniController {
 	 * 图片生成结果
 	 */
 	@GetMapping("/get/result/{imageId}")
-	public Result<String> getImgResultById(@PathVariable Long imageId) {
+	public Result<MiniPopularizeUserConversationChat> getImgResultById(@PathVariable Long imageId) {
 		long userId = StpUserUtil.getLoginIdAsLong();
-		String img = miniPopularizeFrontService.getImgResultById(userId, imageId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult(img);
+		MiniPopularizeUserConversationChat chat = miniPopularizeFrontService.getImgResultById(userId, imageId);
+		return GatewayResponse.SUCCESS.newBuilder().toResult(chat);
 	}
 
 	/**