Skip to content

pull request #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allentofight merged 4 commits into from
Jul 7, 2023
Merged

pull request #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
296ac0b
解决日志冲突
dongdong0421 Jul 5, 2023
a684eec
Merge pull request #238 from dongdong-gogogo/main
novicezk Jul 7, 2023
6b517e8
fix: 修复SLF4J冲突问题; 修复V Subtle无法获取进度的bug
Jul 7, 2023
dae519a
Merge pull request #244 from novicezk/dev
novicezk Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: 修复SLF4J冲突问题; 修复V Subtle无法获取进度的bug
  • Loading branch information
zhukai committed Jul 7, 2023
commit 6b517e826b775c958fc28f54d3d153bea8a500a7
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

代理 MidJourney 的discord频道，实现api形式调用AI绘图

[![GitHub release](https://img.shields.io/static/v1?label=release&message=v2.3.4&color=blue)](https://www.github.com/novicezk/midjourney-proxy)
[![GitHub release](https://img.shields.io/static/v1?label=release&message=v2.3.5&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)

## 现有功能
Expand Down Expand Up @@ -46,7 +46,7 @@ docker run -d --name midjourney-proxy \
-p 8080:8080 \
-v /xxx/xxx/config:/home/spring/config \
--restart=always \
novicezk/midjourney-proxy:2.3.4
novicezk/midjourney-proxy:2.3.5
```
3. 访问 `http://ip:port/mj` 查看API文档

Expand All @@ -58,7 +58,7 @@ docker run -d --name midjourney-proxy \
-e mj.discord.channel-id=xxx \
-e mj.discord.user-token=xxx \
--restart=always \
novicezk/midjourney-proxy:2.3.4
novicezk/midjourney-proxy:2.3.5
```
## 配置项
- mj.discord.guild-id：discord服务器ID
Expand Down
24 changes: 12 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.github.novicezk</groupId>
<artifactId>midjourney-proxy</artifactId>
<version>2.3.4</version>
<version>2.3.5</version>

<properties>
<hutool.version>5.8.18</hutool.version>
Expand Down Expand Up @@ -73,7 +73,7 @@
<groupId>com.unfbx</groupId>
<artifactId>chatgpt-java</artifactId>
<version>${chatgpt-java.version}</version>
<exclusions>
<exclusions>
<exclusion>
<artifactId>slf4j-simple</artifactId>
<groupId>org.slf4j</groupId>
Expand All @@ -85,16 +85,16 @@
<artifactId>dataurl</artifactId>
<version>${dataurl.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>${knife4j.verison}</version>
</dependency>
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${user-agent-utils.verison}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>${knife4j.verison}</version>
</dependency>
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${user-agent-utils.verison}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/novicezk/midjourney/wss/handle/VariationMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
* 开始(create): Making variations for image #1 with prompt **cat** - <@1012983546824114217> (Waiting to start)
* 进度(update): **cat** - Variations (Strong) by <@1012983546824114217> (0%) (relaxed)
* 5.2前-进度(update): **cat** - Variations by <@1012983546824114217> (0%) (relaxed)
* 完成(create): **cat** - Variations (Strong) by <@1012983546824114217> (relaxed)
* 完成(create): **cat** - Variations (Strong或Subtle) by <@1012983546824114217> (relaxed)
* 5.2前-完成(create): **cat** - Variations by <@1012983546824114217> (relaxed)
*/
@Slf4j
@Component
public class VariationMessageHandler extends MessageHandler {
private static final String START_CONTENT_REGEX = "Making variations for image #(\\d) with prompt \\*\\*(.*?)\\*\\* - <@\\d+> \\((.*?)\\)";
private static final String OLD_CONTENT_REGEX = "\\*\\*(.*?)\\*\\* - Variations by <@\\d+> \\((.*?)\\)";
private static final String CONTENT_REGEX = "\\*\\*(.*?)\\*\\* - Variations \\(Strong\\) by <@\\d+> \\((.*?)\\)";
private static final String CONTENT_REGEX = "\\*\\*(.*?)\\*\\* - Variations \\(.*?\\) by <@\\d+> \\((.*?)\\)";

@Override
public void handle(MessageType messageType, DataObject message) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/banner.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ ___ _(/ ___ __ __ _ __ __ _____/
.-/ .-/ .-/ / .-/
(_/ (_/ (_/ (_/

:: MidJourney Proxy :: v2.3.4
:: MidJourney Proxy :: v2.3.5
2 changes: 1 addition & 1 deletion src/main/resources/config/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ knife4j:
description: 代理 MidJourney 的discord频道，实现api形式调用AI绘图
concat: novicezk
url: https://github.com/novicezk/midjourney-proxy
version: v2.3.4
version: v2.3.5
terms-of-service-url: https://github.com/novicezk/midjourney-proxy
group:
api:
Expand Down