Merge branch 'nf_midjourney_alpha'

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneyAccount.java

@@ -51,4 +51,9 @@ public class MidjourneyAccount extends BaseEntity{
      */
     private String remark;
 
+    /**
+     * 模式
+     */
+    private Integer mode;
+
 }

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneySession.java

@@ -63,11 +63,6 @@ public class MidjourneySession extends BaseEntity {
      */
     private String remark;
 
-    /**
-     * 排序
-     */
-    private Integer sort;
-
     /**
      * 快速时长
      */

netflix-dao/src/main/java/com/cyksj/model/views/FormFieldsDataView.java

@@ -15,7 +15,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "form_fields_data fa",
+@SearchBean(tables = "form_fields_data fa left join user u on fa.user_id = u.id",
 		where = "fa.deleted is true :time_sql:")
 public class FormFieldsDataView {
 	@DbField("fa.id")
@@ -33,6 +33,12 @@ public class FormFieldsDataView {
 	@DbField("fa.content")
 	private String content;
 
+	@DbField("fa.user_id")
+	private Long userId;
+
+	@DbField("u.nickname")
+	private String nickname;
+
 	@DbField("fa.created_time")
 	private Date createdTime;
 }

netflix-dao/src/main/java/com/cyksj/model/views/MidjouneyCarInfoView.java

@@ -36,11 +36,6 @@ public class MidjouneyCarInfoView {
     @DbField("mj.carID")
     private String carId;
 
-    /**
-     * 排序
-     */
-    private Integer sort;
-
     /**
      * 剩余快速时间
      */

netflix-dao/src/main/java/com/cyksj/model/views/MidjourneyUserConversationRecordHistoryView.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2024/4/10 11:37
  */
 @Data
-@SearchBean(tables = "(SELECT MAX(id) id from midjourney_user_conversation_record as r\n" +
+@SearchBean(tables = "(SELECT MAX(id) id from midjourney_user_conversation_record as r " +
         "GROUP BY r.car_id) t left join midjourney_user_conversation_record as r on t.id = r.id"
         ,orderBy = "r.created_time desc"
 )

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -146,7 +146,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 	private final ClaudeService claudeService;
 
 	@Override
-
 	public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account) {
 		User u = userMapper.selectById(userId);
 		if (u == null) throw BusinessRuntimeException.getGatewayApiCode(GatewayApiCode.CMS_TOKEN_VALID);
@@ -277,7 +276,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 						MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(ticket.getUserId(), ticket.getRelationId());
 						ticket.setMjUserFastNum(midjourneyUser.getMjFastNum());
 						ticket.setMjUserRelaxNum(midjourneyUser.getMjRelaxNum());
-						ticket.setIsCar(false);
+						ticket.setIsCar(true);
 					} else {
 						ticket.setIsCar(search.getIsCar());
 						ticket.setMjUserFastNum(search.getMjUserFastNum());

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MidjourneyController.java

@@ -155,7 +155,7 @@ public class MidjourneyController {
         if (midjourneyUser == null) {
             throw BusinessRuntimeException.getInstance("车票出现了异常.");
         }
-        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap()).field("userToken", midjourneyUser.getUserToken());
+        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap()).field(MidjourneyUserConversationRecordHistoryView::getUserToken, midjourneyUser.getUserToken());
         SearchResult<MidjourneyUserConversationRecordHistoryView> search = beanSearcher.search(MidjourneyUserConversationRecordHistoryView.class, builder.build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }

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

@@ -368,7 +368,7 @@ public class MirrorController {
     public Result<String> midjourneyMirror(@PathVariable Long relationId) {
         Long userId = StpUserUtil.getLoginIdAsLong();
         MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyHost + (EnvCommonService.active.equals(envCommonService.getEnv()) ? "/8081":"/8082") +"/api/applets/midjourney/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyHost + (EnvCommonService.active_prd.equals(envCommonService.getEnv()) ? "/8082":"/8083") +"/api/applets/midjourney/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken());
     }
 
     @GetMapping("/midjourneyMirrorWithToken/{userToken}")

netflix-web/src/main/resources/application-pre.yml

@@ -196,5 +196,5 @@ smsVerify:
   shoppingApikey: 72d4ff765b6c962f35c9a4125100680d
 
 midjourney:
-  url: https://nf.video
+  url: https://mj1.galaxydvd.com
   drawUrl: https://nf.video/drawTest/web/