Merge remote-tracking branch 'upstream/main'

更新上游代码
# Conflicts:
#	README.md
#	docs/docker-start.md
#	pom.xml
#	src/main/java/com/github/novicezk/midjourney/controller/SubmitController.java

Author: 刘志硕

README.md

@@ -1,7 +1,8 @@
-# midjourney-proxy
+<div align="center">
 
-代理 MidJourney 的discord频道，实现api形式调用AI绘图
+<h1 align="center">midjourney-proxy</h1>
 
+<<<<<<< HEAD
 [![GitHub release](https://img.shields.io/static/v1?label=release&message=v2.5.1&color=blue)](https://www.github.com/novicezk/midjourney-proxy)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
@@ -26,18 +27,46 @@
 ## 使用前提
 1. 注册并订阅 MidJourney，创建自己的频道，参考 https://docs.midjourney.com/docs/quick-start
 2. 获取用户Token、服务器ID、频道ID：[获取方式](./docs/discord-params.md)
+=======
+English | [中文](./README_CN.md)
 
-## 快速启动
-1. `Railway`: 基于Railway平台，不需要自己的服务器: [部署方式](./docs/railway-start.md)；若Railway不能使用，可使用Zeabur启动
-2. `Zeabur`: 基于Zeabur平台，不需要自己的服务器: [部署方式](./docs/zeabur-start.md)
-3. `Docker`: 在服务器或本地使用Docker启动: [部署方式](./docs/docker-start.md)
+Proxy the Discord channel for MidJourney to enable API-based calls for AI drawing
 
-## 本地开发
-- 依赖java17和maven
-- 更改配置项: 修改src/main/application.yml
-- 项目运行: 启动ProxyApplication的main函数
-- 更改代码后，构建镜像: Dockerfile取消VOLUME的注释，执行 `docker build . -t midjourney-proxy`
+[![GitHub release](https://img.shields.io/static/v1?label=release&message=v2.6.2&color=blue)](https://www.github.com/novicezk/midjourney-proxy)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+
+</div>
+
+## Main Functions
+
+- [x] Supports Imagine instructions and related actions
+- [x] Supports adding image base64 as a placeholder when using the Imagine command
+- [x] Supports Blend (image blending) and Describe (image to text) commands
+- [x] Supports real-time progress tracking of tasks
+- [x] Supports translation of Chinese prompts, requires configuration of Baidu Translate or GPT
+- [x] Prompt sensitive word pre-detection, supports override adjustment
+- [x] User-token connects to WSS (WebSocket Secure), allowing access to error messages and full functionality
+- [x] Supports multi-account configuration, with each account able to set up corresponding task queues
+>>>>>>> upstream/main
+
+**🚀 For more features, please refer to [midjourney-proxy-plus](https://github.com/litter-coder/midjourney-proxy-plus)**
+> - [x] Supports all the features of the open-source version
+> - [x] Supports Shorten (prompt analysis) command
+> - [x] Supports focus shifting: Pan ⬅️ ➡️ ⬆️ ⬇️
+> - [x] Supports image zooming: Zoom 🔍
+> - [x] Supports local redrawing: Vary (Region) 🖌
+> - [x] Supports nearly all associated button actions and the 🎛️ Remix mode
+> - [x] Supports retrieving the seed value of images
+> - [x] Account pool persistence, dynamic maintenance
+> - [x] Supports retrieving account /info and /settings information
+> - [x] Account settings configuration
+> - [x] Supports Niji bot robot
+> - [x] Supports InsightFace face replacement robot
+> - [x] Embedded management dashboard page
+
+## Prerequisites for use
 
+<<<<<<< HEAD
 ## 配置项
 - mj.accounts: 参考 [账号池配置](./docs/config.md#%E8%B4%A6%E5%8F%B7%E6%B1%A0%E9%85%8D%E7%BD%AE%E5%8F%82%E8%80%83)
 - mj.task-store.type: 任务存储方式，默认in_memory(内存\重启后丢失)，可选redis
@@ -54,8 +83,55 @@
 1. 作图频繁等行为，可能会触发midjourney账号警告，请谨慎使用
 2. 常见问题及解决办法见 [Wiki / FAQ](https://github.com/imkratos/midjourney-proxy/wiki/FAQ)
 3. 在 [Issues](https://github.com/imkratos/midjourney-proxy/issues) 中提出其他问题或建议
+=======
+1. Register and subscribe to MidJourney, create `your own server and channel`, refer
+   to https://docs.midjourney.com/docs/quick-start
+2. Obtain user Token, server ID, channel ID: [Method of acquisition](./docs/discord-params.md)
+
+## Quick Start
+
+1. `Railway`: Based on the Railway platform, no need for your own server: [Deployment method](./docs/railway-start.md) ;
+   If Railway is not available, you can start using Zeabur instead.
+2. `Zeabur`: Based on the Zeabur platform, no need for your own server: [Deployment method](./docs/zeabur-start.md)
+3. `Docker`: Start using Docker on a server or locally: [Deployment method](./docs/docker-start.md)
+
+## Local development
+
+- Depends on Java 17 and Maven
+- Change configuration items: Edit src/main/resources/application.yml
+- Project execution: Start the main function of ProxyApplication
+- After changing the code, build the image: Uncomment VOLUME in the Dockerfile, then
+  execute `docker build . -t midjourney-proxy`
+
+## Configuration items
+
+- mj.accounts: Refer
+  to [Account pool configuration](./docs/config.md#%E8%B4%A6%E5%8F%B7%E6%B1%A0%E9%85%8D%E7%BD%AE%E5%8F%82%E8%80%83)
+- mj.task-store.type: Task storage method, default is in_memory (in memory, lost after restart), Redis is an alternative
+  option.
+- mj.task-store.timeout: Task storage expiration time, tasks are deleted after expiration, default is 30 days.
+- mj.api-secret: API key, if left empty, authentication is not enabled; when calling the API, you need to add the
+  request header 'mj-api-secret'.
+- mj.translate-way: The method for translating Chinese prompts into English, options include null (default), Baidu, or
+  GPT.
+- For more configuration options, see [Configuration items](./docs/config.md)
 
+## Related documentation
 
+1. [API Interface Description](./docs/api.md)
+2. [Version Update Log](https://github.com/novicezk/midjourney-proxy/wiki/%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95)
+
+## Precautions
+
+1. Frequent image generation and similar behaviors may trigger warnings on your Midjourney account. Please use with
+   caution.
+2. For common issues and solutions, see [Wiki / FAQ](https://github.com/novicezk/midjourney-proxy/wiki/FAQ)
+3. Interested friends are also welcome to join the discussion group. If the group is full from scanning the code, you
+   can add the administrator’s WeChat to be invited into the group. Please remark: mj join group.
+>>>>>>> upstream/main
+
+
+<<<<<<< HEAD
 ## 应用项目
 依赖此项目且开源的，欢迎联系作者，加到此处展示
 - [wechat-midjourney](https://github.com/novicezk/wechat-midjourney) : 代理微信客户端，接入MidJourney，仅示例应用场景，不再更新
@@ -67,5 +143,29 @@
 如果觉得这个项目对你有所帮助，请帮忙点个star；也可以请作者喝杯茶～
 
   <img src="https://raw.githubusercontent.com/imkratos/midjourney-proxy/main/docs/wxcode.png" width="220" alt="微信二维码"/>
+=======
+## Application Project
+
+If you have a project that depends on this one and is open source, feel free to contact the author to be added here for
+display.
+
+- [wechat-midjourney](https://github.com/novicezk/wechat-midjourney) : A proxy WeChat client that connects to
+  MidJourney, intended only as an example application scenario, will no longer be updated.
+- [chatgpt-web-midjourney-proxy](https://github.com/Dooy/chatgpt-web-midjourney-proxy) : chatgpt web, midjourney,
+  gpts,tts, whisper A complete UI solution
+- [chatnio](https://github.com/Deeptrain-Community/chatnio) : The next-generation AI one-stop solution for B/C end, an aggregated model platform with exquisite UI and powerful functions
+- [new-api](https://github.com/Calcium-Ion/new-api) : An API interface management and distribution system compatible with the Midjourney Proxy
+- [stable-diffusion-mobileui](https://github.com/yuanyuekeji/stable-diffusion-mobileui) : SDUI, based on this interface
+  and SD (System Design), can be packaged with one click to generate H5 and mini-programs.
+- [MidJourney-Web](https://github.com/ConnectAI-E/MidJourney-Web) : 🍎 Supercharged Experience For MidJourney On Web UI
+
+## Open API
+
+Provides unofficial MJ/SD open API, add administrator WeChat for inquiries, please remark: api
+
+## Others
+
+If you find this project helpful, please consider giving it a star.
+>>>>>>> upstream/main
 
 [![Star History Chart](https://api.star-history.com/svg?repos=novicezk/midjourney-proxy&type=Date)](https://star-history.com/#novicezk/midjourney-proxy&Date)

README_CN.md

@@ -0,0 +1,88 @@
+<div align="center">
+
+<h1 align="center">midjourney-proxy</h1>
+
+[English](./README.md) | 中文
+
+代理 MidJourney 的discord频道，实现api形式调用AI绘图
+
+[![GitHub release](https://img.shields.io/static/v1?label=release&message=v2.6.2&color=blue)](https://www.github.com/novicezk/midjourney-proxy)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+
+</div>
+
+## 主要功能
+- [x] 支持 Imagine 指令和相关动作
+- [x] Imagine 时支持添加图片base64，作为垫图
+- [x] 支持 Blend(图片混合)、Describe(图生文) 指令
+- [x] 支持任务实时进度
+- [x] 支持中文prompt翻译，需配置百度翻译或gpt
+- [x] prompt 敏感词预检测，支持覆盖调整
+- [x] user-token 连接 wss，可以获取错误信息和完整功能
+- [x] 支持多账号配置，每个账号可设置对应的任务队列
+
+**🚀 更多功能请查看 [midjourney-proxy-plus](https://github.com/litter-coder/midjourney-proxy-plus)**
+> - [x] 支持开源版的所有功能
+> - [x] 支持 Shorten(prompt分析) 指令
+> - [x] 支持焦点移动: Pan ⬅️ ➡️ ⬆️ ⬇️
+> - [x] 支持图片变焦: Zoom 🔍
+> - [x] 支持局部重绘: Vary (Region) 🖌
+> - [x] 支持几乎所有的关联按钮动作和🎛️ Remix模式
+> - [x] 支持获取图片的seed值
+> - [x] 账号池持久化，动态维护
+> - [x] 支持获取账号/info、/settings信息
+> - [x] 账号settings设置
+> - [x] 支持niji bot机器人
+> - [x] 支持InsightFace人脸替换机器人
+> - [x] 内嵌管理后台页面
+
+## 使用前提
+1. 注册并订阅 MidJourney，创建`自己的服务器和频道`，参考 https://docs.midjourney.com/docs/quick-start
+2. 获取用户Token、服务器ID、频道ID：[获取方式](./docs/discord-params.md)
+
+## 快速启动
+1. `Railway`: 基于Railway平台，不需要自己的服务器: [部署方式](./docs/railway-start.md)；若Railway不能使用，可使用Zeabur启动
+2. `Zeabur`: 基于Zeabur平台，不需要自己的服务器: [部署方式](./docs/zeabur-start.md)
+3. `Docker`: 在服务器或本地使用Docker启动: [部署方式](./docs/docker-start.md)
+
+## 本地开发
+- 依赖java17和maven
+- 更改配置项: 修改src/main/application.yml
+- 项目运行: 启动ProxyApplication的main函数
+- 更改代码后，构建镜像: Dockerfile取消VOLUME的注释，执行 `docker build . -t midjourney-proxy`
+
+## 配置项
+- mj.accounts: 参考 [账号池配置](./docs/config.md#%E8%B4%A6%E5%8F%B7%E6%B1%A0%E9%85%8D%E7%BD%AE%E5%8F%82%E8%80%83)
+- mj.task-store.type: 任务存储方式，默认in_memory(内存\重启后丢失)，可选redis
+- mj.task-store.timeout: 任务存储过期时间，过期后删除，默认30天
+- mj.api-secret: 接口密钥，为空不启用鉴权；调用接口时需要加请求头 mj-api-secret
+- mj.translate-way: 中文prompt翻译成英文的方式，可选null(默认)、baidu、gpt
+- 更多配置查看 [配置项](./docs/config.md)
+
+## 相关文档
+1. [API接口说明](./docs/api.md)
+2. [版本更新记录](https://github.com/novicezk/midjourney-proxy/wiki/%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95)
+
+## 注意事项
+1. 作图频繁等行为，可能会触发midjourney账号警告，请谨慎使用
+2. 常见问题及解决办法见 [Wiki / FAQ](https://github.com/novicezk/midjourney-proxy/wiki/FAQ)
+3. 感兴趣的朋友也欢迎加入交流群讨论一下，扫码进群名额已满，加管理员微信邀请进群，备注: mj加群
+
+ <img src="https://raw.githubusercontent.com/novicezk/midjourney-proxy/main/docs/manager-qrcode.png" width="220" alt="微信二维码"/>
+
+## 应用项目
+依赖此项目且开源的，欢迎联系作者，加到此处展示
+- [wechat-midjourney](https://github.com/novicezk/wechat-midjourney) : 代理微信客户端，接入MidJourney，仅示例应用场景，不再更新
+- [chatgpt-web-midjourney-proxy](https://github.com/Dooy/chatgpt-web-midjourney-proxy) : chatgpt web, midjourney, gpts,tts, whisper 一套ui全搞定
+- [chatnio](https://github.com/Deeptrain-Community/chatnio) : 下一代 AI 一站式 B/C 端解决方案, 集成精美 UI 和强大功能的聚合模型平台
+- [new-api](https://github.com/Calcium-Ion/new-api) : 接入Midjourney Proxy的接口管理 & 分发系统
+- [stable-diffusion-mobileui](https://github.com/yuanyuekeji/stable-diffusion-mobileui) : SDUI，基于本接口和SD，可一键打包生成H5和小程序
+- [MidJourney-Web](https://github.com/ConnectAI-E/MidJourney-Web) : 🍎 Supercharged Experience For MidJourney On Web UI
+
+## 开放API
+提供非官方的MJ/SD开放API，添加管理员微信咨询，备注: api
+
+## 其它
+如果觉得这个项目对您有所帮助，请帮忙点个star
+
+[![Star History Chart](https://api.star-history.com/svg?repos=novicezk/midjourney-proxy&type=Date)](https://star-history.com/#novicezk/midjourney-proxy&Date)

docs/config.md

@@ -20,6 +20,7 @@
 | mj.ng-discord.server          | 否  | https://discord.com 反代地址                      |
 | mj.ng-discord.cdn             | 否  | https://cdn.discordapp.com 反代地址               |
 | mj.ng-discord.wss             | 否  | wss://gateway.discord.gg 反代地址                 |
+| mj.ng-discord.resume-wss      | 否 | wss://gateway-us-east1-b.discord.gg 反代地址                |
 | mj.ng-discord.upload-server   | 否  | https://discord-attachments-uploads-prd.storage.googleapis.com 反代地址                |
 | mj.translate-way              | 否  | 中文prompt翻译成英文的方式，可选null(默认)、baidu、gpt         |
 | mj.baidu-translate.appid      | 否  | 百度翻译的appid                                    |

docs/docker-start.md

@@ -6,7 +6,11 @@
 docker run -d --name midjourney-proxy \
  -p 8080:8080 \
  -v /xxx/xxx/config:/home/spring/config \
+<<<<<<< HEAD
   kratos1937/midjourney-proxy:v1.1.0
+=======
+ novicezk/midjourney-proxy:2.6.2
+>>>>>>> upstream/main
 ```
 3. 访问 `http://ip:port/mj` 查看API文档
 
@@ -17,5 +21,9 @@ docker run -d --name midjourney-proxy \
  -e mj.discord.guild-id=xxx \
  -e mj.discord.channel-id=xxx \
  -e mj.discord.user-token=xxx \
+<<<<<<< HEAD
   kratos1937/midjourney-proxy:v1.1.0
+=======
+ novicezk/midjourney-proxy:2.6.2
+>>>>>>> upstream/main
 ```

pom.xml

@@ -7,18 +7,18 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.14</version>
+        <version>2.6.15</version>
     </parent>
 
     <groupId>com.github.novicezk</groupId>
     <artifactId>midjourney-proxy</artifactId>
-    <version>2.5.4</version>
+    <version>2.6.2</version>
 
     <properties>
-        <hutool.version>5.8.18</hutool.version>
-        <org-json.version>20220924</org-json.version>
-        <jda.version>5.0.0-beta.9</jda.version>
-        <chatgpt-java.version>1.1.2-beta0</chatgpt-java.version>
+        <hutool.version>5.8.26</hutool.version>
+        <org-json.version>20240303</org-json.version>
+        <jda.version>5.0.0-beta.21</jda.version>
+        <chatgpt-java.version>1.1.5</chatgpt-java.version>
         <dataurl.version>2.0.0</dataurl.version>
         <knife4j.verison>4.1.0</knife4j.verison>
         <user-agent-utils.verison>1.21</user-agent-utils.verison>
@@ -37,6 +37,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>cn.hutool</groupId>

src/main/java/com/github/novicezk/midjourney/Constants.java

@@ -17,4 +17,6 @@ public final class Constants {
 
 	public static final String API_SECRET_HEADER_NAME = "mj-api-secret";
 	public static final String DEFAULT_DISCORD_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36";
+
+	public static final String MJ_MESSAGE_HANDLED = "mj_proxy_handled";
 }

src/main/java/com/github/novicezk/midjourney/ProxyProperties.java

@@ -187,6 +187,10 @@ public static class NgDiscordConfig {
 		 * wss://gateway.discord.gg 反代.
 		 */
 		private String wss;
+		/**
+		 * wss://gateway-us-east1-b.discord.gg 反代.
+		 */
+		private String resumeWss;
 		/**
 		 * https://discord-attachments-uploads-prd.storage.googleapis.com 反代.
 		 */

src/main/java/com/github/novicezk/midjourney/controller/SubmitController.java

@@ -18,6 +18,11 @@
 import com.github.novicezk.midjourney.support.Task;
 import com.github.novicezk.midjourney.support.TaskCondition;
 import com.github.novicezk.midjourney.util.*;
+import com.github.novicezk.midjourney.util.BannedPromptUtils;
+import com.github.novicezk.midjourney.util.ConvertUtils;
+import com.github.novicezk.midjourney.util.MimeTypeUtils;
+import com.github.novicezk.midjourney.util.SnowFlake;
+import com.github.novicezk.midjourney.util.TaskChangeParams;
 import eu.maxschuster.dataurl.DataUrl;
 import eu.maxschuster.dataurl.DataUrlSerializer;
 import eu.maxschuster.dataurl.IDataUrlSerializer;
@@ -111,15 +116,6 @@ public SubmitResultVO change(@RequestBody SubmitChangeDTO changeDTO) {
 		} else {
 			description += " " + changeDTO.getAction().name().charAt(0) + changeDTO.getIndex();
 		}
-		if (TaskAction.UPSCALE.equals(changeDTO.getAction())) {
-			TaskCondition condition = new TaskCondition().setDescription(description);
-			Task existTask = this.taskStoreService.findOne(condition);
-			if (existTask != null) {
-				return SubmitResultVO.of(ReturnCode.EXISTED, "任务已存在", existTask.getId())
-						.setProperty("status", existTask.getStatus())
-						.setProperty("imageUrl", existTask.getImageUrl());
-			}
-		}
 		Task targetTask = this.taskStoreService.get(changeDTO.getTaskId());
 		if (targetTask == null) {
 			return SubmitResultVO.fail(ReturnCode.NOT_FOUND, "关联任务不存在或已失效");
@@ -315,25 +311,36 @@ private Task newTask(BaseSubmitDTO base) {
 	}
 
 	private String translatePrompt(String prompt) {
-		if (TranslateWay.NULL.equals(this.properties.getTranslateWay()) || CharSequenceUtil.isBlank(prompt)) {
+		if (TranslateWay.NULL.equals(this.properties.getTranslateWay()) || CharSequenceUtil.isBlank(prompt) || !this.translateService.containsChinese(prompt)) {
 			return prompt;
 		}
-		List<String> imageUrls = new ArrayList<>();
-		Matcher imageMatcher = Pattern.compile("https?://[a-z0-9-_:@&?=+,.!/~*'%$]+\\x20+", Pattern.CASE_INSENSITIVE).matcher(prompt);
-		while (imageMatcher.find()) {
-			imageUrls.add(imageMatcher.group(0));
-		}
 		String paramStr = "";
 		Matcher paramMatcher = Pattern.compile("\\x20+-{1,2}[a-z]+.*$", Pattern.CASE_INSENSITIVE).matcher(prompt);
 		if (paramMatcher.find()) {
 			paramStr = paramMatcher.group(0);
 		}
-		String imageStr = CharSequenceUtil.join("", imageUrls);
-		String text = prompt.substring(imageStr.length(), prompt.length() - paramStr.length());
+		String promptWithoutParam = CharSequenceUtil.sub(prompt, 0, prompt.length() - paramStr.length());
+		List<String> imageUrls = new ArrayList<>();
+		Matcher imageMatcher = Pattern.compile("https?://[a-z0-9-_:@&?=+,.!/~*'%$]+\\x20+", Pattern.CASE_INSENSITIVE).matcher(promptWithoutParam);
+		while (imageMatcher.find()) {
+			imageUrls.add(imageMatcher.group(0));
+		}
+		String text = promptWithoutParam;
+		for (String imageUrl : imageUrls) {
+			text = CharSequenceUtil.replaceFirst(text, imageUrl, "");
+		}
 		if (CharSequenceUtil.isNotBlank(text)) {
 			text = this.translateService.translateToEnglish(text).trim();
 		}
-		return imageStr + text + paramStr;
+		if (CharSequenceUtil.isNotBlank(paramStr)) {
+			Matcher paramNomatcher = Pattern.compile("-{1,2}no\\s+(.*?)(?=-|$)").matcher(paramStr);
+			if (paramNomatcher.find()) {
+				String paramNoStr = paramNomatcher.group(1).trim();
+				String paramNoStrEn = this.translateService.translateToEnglish(paramNoStr).trim();
+				paramStr = paramNomatcher.replaceFirst("--no " + paramNoStrEn + " ");
+			}
+		}
+		return CharSequenceUtil.join("", imageUrls) + text + paramStr;
 	}
 
 }