fix 更换内网地址

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

@@ -27,4 +27,6 @@ public class SubmitModalDTO {
     @NotNull(message = "任务ID不能为空")
     private Long taskId;
     private Integer mode;
+
+    private Long beforeTaskId;
 }

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

@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class MidJourneyAccountServiceImpl extends ServiceImpl<MidjourneyAccountMapper, MidjourneyAccount> implements MidjourneyAccountService {
 
-    private static final String HOST = "http://43.154.230.104:8080";
+    private static final String HOST = "http://172.19.0.17:8080";
 
     private final GroupsRelationMapper groupsRelationMapper;
 
@@ -358,9 +358,9 @@ public class MidJourneyAccountServiceImpl extends ServiceImpl<MidjourneyAccountM
     }
 
     public void resetAccount(Long id) {
-        HttpResponse versionResult = HttpRequest.post("http://43.154.230.104:8080/mj/account/" + id + "/change-version?version=default").execute();
+        HttpResponse versionResult = HttpRequest.post("http://172.19.0.17:8080/mj/account/" + id + "/change-version?version=default").header("mj-api-secret", "5a9a3e9b-5a5e-4b6b-9a5a-9a5a5a5a5a5a").execute();
         log.info("versionResult:{}", versionResult.body());
-        HttpResponse resetSettingResult = HttpRequest.post("http://43.154.230.104:8080/mj/account/" + id + "/action?customId=MJ::Settings::ResetSettings&botType=MID_JOURNEY").execute();
+        HttpResponse resetSettingResult = HttpRequest.post("http://172.19.0.17:8080/mj/account/" + id + "/action?customId=MJ::Settings::ResetSettings&botType=MID_JOURNEY").header("mj-api-secret", "5a9a3e9b-5a5e-4b6b-9a5a-9a5a5a5a5a5a").execute();
         log.info("resetSettingResult:{}", resetSettingResult.body());
     }
 }

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

@@ -70,7 +70,7 @@ import static com.yhlxj.web.wss.MidjourneyServerEndpoint.WSS_SESSION_MAP;
 @Slf4j
 @RequiredArgsConstructor
 public class MidjourneyServiceImpl implements MidjourneyService {
-    private static final String RELAX_HOST = "http://43.154.230.104:8080";
+    private static final String RELAX_HOST = "http://172.19.0.17:8080";
     private static final String FAST_HOST = "https://api.bltcy.ai";
     private static final String FAST_TOKEN = "Bearer sk-YTg6N3QH6PLTFLbM9291B1Ae12754bC4B26225F1B95f442c";
 
@@ -597,7 +597,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
     private SubmitResult submit2MjProxy(String url, String token, Integer mode, String action, Map<String, Object> param) throws Exception {
 
         url = url + getActionUrl(action);
-        param.put("notifyHook",midjourneyHost +(EnvCommonService.active.equals(envCommonService.getEnv()) ? "/8083":"/8082") + "/api/applets/midjourney/notifyHook");
+        param.put("notifyHook",EnvCommonService.active.equals(envCommonService.getEnv()) ? midjourneyHost+"/8083/api/applets/midjourney/notifyHook":midjourneyHost+":8082/applets/midjourney/notifyHook");
         HttpRequest request = HttpRequest.post(url).body(Jsons.toJson(param));
         request = mode == 1 ? request.header("Authorization", token) : request.header("mj-api-secret", token);
         String body = request.execute().body();

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

@@ -77,10 +77,6 @@ public class MidjourneyController {
 
     private final MidjourneyUserSettingsService midjourneyUserSettingsService;
 
-    private static final String PROMPT = "--v 6 ";
-    private static final String SETTINGS = "{\"version\":\"--v 6\",\"remix\":false,\"raw\":false,\"variation\":\"HIGH\",\"mode\":\"relax\",\"stylize\":\"MED\"}";
-
-
     public MidjourneyUser getUser(){
         String userToken = request.getHeader("user-token");
        return midjourneyService.getUser(userToken);
@@ -271,6 +267,10 @@ public class MidjourneyController {
         log.info("提交Modal任务，taskId:{},提示：{}",submitModalDTO.getTaskId(),submitModalDTO.getPrompt());
         Integer mode = submitModalDTO.getMode();
         MidjourneyUser user = getUser();
+        if (submitModalDTO.getBeforeTaskId() != null){
+            MidjourneyUserConversation conversation = conversationMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUserConversation.class).eq(MidjourneyUserConversation::getTaskId, submitModalDTO.getBeforeTaskId()).last("limit 1"));
+            mode = conversation.getMode();
+        }
         Long num = checkUserLimit(user,mode);
         if (num != null && num < 0){
             throw BusinessRuntimeException.getInstance("次数已用完");
@@ -320,7 +320,7 @@ public class MidjourneyController {
         MidjourneyUser user = getUser();
         MidjourneyUserConversation midjourneyUserConversation = conversationMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUserConversation.class).eq(MidjourneyUserConversation::getTaskId, actionDTO.getTaskId()).last("limit 1"));
         if (midjourneyUserConversation == null) {
-            throw BusinessRuntimeException.getInstance("关联任务不存在或已失效 taskId:{}", actionDTO.getTaskId().toString());
+            throw BusinessRuntimeException.getInstance("关联任务不存在或已失效 taskId:"+actionDTO.getTaskId());
         }
         Integer mode = midjourneyUserConversation.getMode();
         Long apiChannelId = midjourneyUserConversation.getApiChannelId();