Merge remote-tracking branch 'origin/midjourney-detach' into midjourney-detach

# Conflicts:
#	midjourney/src/main/java/com/yhlxj/web/wss/MidjourneyServerEndpoint.java

midjourney/src/main/java/com/yhlxj/dao/model/dto/SubmitActionDTO.java

@@ -30,4 +30,5 @@ public class SubmitActionDTO {
      * NIJI_JOURNEY
      */
     private String botType = "MID_JOURNEY";
+    private Integer mode;
 }

midjourney/src/main/java/com/yhlxj/dao/model/dto/SubmitBlendDTO.java

@@ -30,4 +30,5 @@ public class SubmitBlendDTO {
 	 * NIJI_JOURNEY
 	 */
 	private String botType = "MID_JOURNEY";
+	private Integer mode;
 }

midjourney/src/main/java/com/yhlxj/dao/model/dto/SubmitDescribeDTO.java

@@ -24,4 +24,5 @@ public class SubmitDescribeDTO {
 	 * NIJI_JOURNEY
 	 */
 	private String botType = "MID_JOURNEY";
+	private Integer mode;
 }

midjourney/src/main/java/com/yhlxj/dao/model/dto/SubmitImagineDTO.java

@@ -30,5 +30,5 @@ public class SubmitImagineDTO {
      * NIJI_JOURNEY
      */
     private String botType = "MID_JOURNEY";
-
+    private Integer mode;
 }

midjourney/src/main/java/com/yhlxj/dao/model/dto/SubmitModalDTO.java

@@ -26,5 +26,5 @@ public class SubmitModalDTO {
      */
     @NotNull(message = "任务ID不能为空")
     private Long taskId;
-
+    private Integer mode;
 }

midjourney/src/main/java/com/yhlxj/dao/model/dto/SubmitSeedDTO.java

@@ -24,4 +24,5 @@ public class SubmitSeedDTO {
      * NIJI_JOURNEY
      */
     private String botType = "MID_JOURNEY";
+    private Integer mode;
 }

midjourney/src/main/java/com/yhlxj/dao/model/dto/SubmitShortenDTO.java

@@ -24,4 +24,5 @@ public class SubmitShortenDTO {
      * NIJI_JOURNEY
      */
     private String botType = "MID_JOURNEY";
+    private Integer mode;
 }

midjourney/src/main/java/com/yhlxj/service/midjourney/MidjourneyService.java

@@ -35,5 +35,5 @@ public interface MidjourneyService {
 
     void notifyHook(String conversation) throws Exception;
 
-    MidjourneyUser getUser(String userToken);
+    MidjourneyUser getUser(String userToken,Integer mode);
 }

midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -85,7 +85,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
     private final GroupsRelationMapper groupsRelationMapper;
 
     @Override
-    public MidjourneyUser getUser(String userToken) {
+    public MidjourneyUser getUser(String userToken,Integer mode) {
         MidjourneyUser midjourneyUser = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class)
                 .eq(MidjourneyUser::getUserToken, userToken).last("limit 1"));
         if (midjourneyUser == null){
@@ -101,7 +101,9 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         Long relationId = midjourneyUser.getRelationId();
         GroupsRelation relation = groupsRelationMapper.selectById(relationId);
         midjourneyUser.setAqType(relation.getAqType());
-
+        if (mode != null) {
+            midjourneyUser.setMode(mode);
+        }
         return midjourneyUser;
     }
 

midjourney/src/main/java/com/yhlxj/web/mirror/MidjourneyController.java

@@ -67,9 +67,9 @@ public class MidjourneyController {
 
     private final MidjourneyPaintingPlazaMapper midjourneyPaintingPlazaMapper;
 
-    public MidjourneyUser getUser(){
+    public MidjourneyUser getUser(Integer mode){
         String userToken = request.getHeader("user-token");
-       return midjourneyService.getUser(userToken);
+       return midjourneyService.getUser(userToken,mode);
     }
 
     @GetMapping("/midjourneyMirrorWithToken/{userToken}")
@@ -169,7 +169,7 @@ public class MidjourneyController {
      */
     @GetMapping("/whoami")
     public Result<MidjourneyUser> queryUser(){
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(null);
         return GatewayResponse.SUCCESS.newBuilder().toResult(user);
     }
 
@@ -181,7 +181,7 @@ public class MidjourneyController {
     @NoSubmit
     public Result<MidjourneyUserConversation> submitImagine(@RequestBody SubmitImagineDTO submitImagineDTO) {
         log.info("提交Imagine任务，提示：{}",submitImagineDTO.getPrompt());
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(submitImagineDTO.getMode());
         Long num = checkUserLimit(user);
         if (num != null && num < 0){
             throw BusinessRuntimeException.getInstance("次数已用完");
@@ -204,7 +204,7 @@ public class MidjourneyController {
     @NoSubmit
     public Result<MidjourneyUserConversation> submitDescribe(@RequestBody SubmitDescribeDTO submitDescribeDTO) {
         log.info("提交Describe任务");
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(submitDescribeDTO.getMode());
         Long num = checkUserLimit(user);
         if (num != null && num < 0){
             throw BusinessRuntimeException.getInstance("次数已用完");
@@ -227,7 +227,7 @@ public class MidjourneyController {
     @NoSubmit
     public Result<MidjourneyUserConversation> submitBlend(@RequestBody SubmitBlendDTO submitBlendDTO) {
         log.info("提交Blend任务 dimensions:{}，base64数组长度：{}", submitBlendDTO.getDimensions(), submitBlendDTO.getBase64Array().size());
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(submitBlendDTO.getMode());
         Long num = checkUserLimit(user);
         if (num != null && num < 0){
             throw BusinessRuntimeException.getInstance("次数已用完");
@@ -250,7 +250,7 @@ public class MidjourneyController {
     @NoSubmit
     public Result<MidjourneyUserConversation> submitModal(@RequestBody SubmitModalDTO submitModalDTO) {
         log.info("提交Modal任务，taskId:{},提示：{}",submitModalDTO.getTaskId(),submitModalDTO.getPrompt());
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(submitModalDTO.getMode());
         Long num = checkUserLimit(user);
         if (num != null && num < 0){
             throw BusinessRuntimeException.getInstance("次数已用完");
@@ -273,7 +273,7 @@ public class MidjourneyController {
     @NoSubmit
     public Result<MidjourneyUserConversation> submitShorten(@RequestBody SubmitShortenDTO submitShortenDTO) {
         log.info("提交Shorten任务 提示词:{}",submitShortenDTO.getPrompt());
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(submitShortenDTO.getMode());
         Long num = checkUserLimit(user);
         if (num != null && num < 0){
             throw BusinessRuntimeException.getInstance("次数已用完");
@@ -296,7 +296,7 @@ public class MidjourneyController {
     @NoSubmit
     public Result<Object> action(@RequestBody SubmitActionDTO actionDTO) {
         log.info("任务id:{},执行动作：{}",actionDTO.getTaskId(),actionDTO.getCustomId());
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(actionDTO.getMode());
         Long num = 0L;
         if (!actionDTO.getCustomId().contains("BOOKMARK")) {
             num = checkUserLimit(user);
@@ -320,7 +320,7 @@ public class MidjourneyController {
     @NoSubmit
     public Result<Object> seed(@RequestBody SubmitSeedDTO seedDTO) {
         log.info("任务id:{},执行动作：{}",seedDTO.getTaskId(), "seed");
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(seedDTO.getMode());
 
         Long num = checkUserLimit(user);
         if (num != null && num < 0) {
@@ -342,7 +342,7 @@ public class MidjourneyController {
      */
     @GetMapping("/conversation/list")
     public Result<SearchResult<MidjourneyUserConversation>> conversationList(){
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(null);
         log.info("查询会话列表 userId:{}",user.getId());
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
         return GatewayResponse.SUCCESS.newBuilder().toResult(beanSearcher.search(MidjourneyUserConversation.class,
@@ -356,7 +356,7 @@ public class MidjourneyController {
      */
     @GetMapping("/conversation/listByIds")
     public Result<List<MidjourneyUserConversation>> conversationListByIds(Integer mode,@RequestParam(value = "ids" ) List<Long> ids) throws Exception {
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(mode);
         log.info("根据ids查询会话 userId:{}",user.getId());
         return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.listConversationByIds(mode,ids));
     }
@@ -367,7 +367,7 @@ public class MidjourneyController {
     @PostMapping("/conversation/{id}/cancel")
     @NoSubmit
     public Result<MidjourneyUserConversation> conversationCancel(@PathVariable("id") Long id){
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(null);
         log.info("取消任务 id:{}",id);
         return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.cancelConversation(user,id));
     }
@@ -429,7 +429,7 @@ public class MidjourneyController {
      */
     @GetMapping("/get/painting/record")
     public Result<SearchResult<MidjourneyUserPaintingDayRecordView>> getPaintingRecord(String prompt, Boolean bookmark) {
-        MidjourneyUser user = getUser();
+        MidjourneyUser user = getUser(null);
         String condition = String.format(" and mc.user_id = %s", user.getId());
         if (StrUtil.isNotBlank(prompt)) {
             condition += String.format(" and mc.prompt like '%%%s%%'", prompt);