zwhui 2 tahun lalu
induk
melakukan
67d9e6bec8

+ 3 - 1
netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -132,12 +132,14 @@ public class MidjourneyServiceImpl implements MidjourneyService {
             throw BusinessRuntimeException.getInstance("当前出图模式与关联任务出图模式不符");
         }
         if (StringUtils.isNotBlank(conversation.getButtons())){
-            Jsons.parseList(conversation.getButtons(), MessageButton.class).forEach(button -> {
+            List<MessageButton> messageButtons = Jsons.parseList(conversation.getButtons(), MessageButton.class);
+            messageButtons.forEach(button -> {
                 if (button.getCustomId().equals(customId)) {
                     log.info("action customId:{}", customId);
                     button.setStyle(3);
                 }
             });
+            conversation.setButtons(Jsons.toJson(messageButtons));
         }
         conversation.setBookmark(customId.contains("BOOKMARK"));
         conversationMapper.updateById(conversation);

+ 3 - 3
netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -312,14 +312,14 @@ public class MirrorController {
      * @param relationId 车票id
      */
     @GetMapping("/midjourneyMirror/{relationId}")
-    public void midjourneyMirror(@PathVariable Long relationId,HttpServletResponse response) throws IOException {
+    public String midjourneyMirror(@PathVariable Long relationId) {
         Long userId = StpUserUtil.getLoginIdAsLong();
         MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
-        response.sendRedirect( midjourneyHost + (envCommonService.isPreEnv() ? "/8082":"/8081") +"/api/applets/mirror/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken());
+        return midjourneyHost + (envCommonService.isPreEnv() ? "/8082":"/8081") +"/api/applets/mirror/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken();
     }
 
     @GetMapping("/midjourneyMirrorWithToken/{userToken}")
-    public void midjourneyMirrorWithToken(@PathVariable String userToken,HttpServletResponse response) throws IOException {
+    public void midjourneyMirrorWithToken(@PathVariable String userToken) throws IOException {
         Cookie cookie = new Cookie("userToken", userToken);
         cookie.setMaxAge(31536000);
         cookie.setPath("/");