From 4917e5a92fa67f6a44d5015c8988d00b74486d1d Mon Sep 17 00:00:00 2001
From: CaIon <1808837298@qq.com>
Date: Thu, 14 Mar 2024 21:21:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=81=E8=AE=B8=E5=BC=80=E5=85=B3mj?=
=?UTF-8?q?=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
constant/midjourney.go | 2 ++
model/option.go | 4 ++++
service/midjourney.go | 4 +++-
web/src/components/OperationSetting.js | 29 +++++++++++++++++++-------
4 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/constant/midjourney.go b/constant/midjourney.go
index 3d321ca..8b88a44 100644
--- a/constant/midjourney.go
+++ b/constant/midjourney.go
@@ -1,5 +1,7 @@
package constant
+var MjNotifyEnabled = false
+
const (
MjErrorUnknown = 5
MjRequestError = 4
diff --git a/model/option.go b/model/option.go
index 9a7ad60..a108e93 100644
--- a/model/option.go
+++ b/model/option.go
@@ -2,6 +2,7 @@ package model
import (
"one-api/common"
+ "one-api/constant"
"strconv"
"strings"
"time"
@@ -88,6 +89,7 @@ func InitOptionMap() {
common.OptionMap["DataExportInterval"] = strconv.Itoa(common.DataExportInterval)
common.OptionMap["DataExportDefaultTime"] = common.DataExportDefaultTime
common.OptionMap["DefaultCollapseSidebar"] = strconv.FormatBool(common.DefaultCollapseSidebar)
+ common.OptionMap["MjNotifyEnabled"] = strconv.FormatBool(constant.MjNotifyEnabled)
common.OptionMapRWMutex.Unlock()
loadOptionsFromDatabase()
@@ -181,6 +183,8 @@ func updateOptionMap(key string, value string) (err error) {
common.DataExportEnabled = boolValue
case "DefaultCollapseSidebar":
common.DefaultCollapseSidebar = boolValue
+ case "MjNotifyEnabled":
+ constant.MjNotifyEnabled = boolValue
}
}
switch key {
diff --git a/service/midjourney.go b/service/midjourney.go
index 7c47cd6..3ab967f 100644
--- a/service/midjourney.go
+++ b/service/midjourney.go
@@ -163,7 +163,9 @@ func DoMidjourneyHttpRequest(c *gin.Context, timeout time.Duration, fullRequestU
return MidjourneyErrorWithStatusCodeWrapper(constant.MjErrorUnknown, "read_request_body_failed", http.StatusInternalServerError), nullBytes, err
}
delete(mapResult, "accountFilter")
- delete(mapResult, "notifyHook")
+ if !constant.MjNotifyEnabled {
+ delete(mapResult, "notifyHook")
+ }
//req, err := http.NewRequest(c.Request.Method, fullRequestURL, requestBody)
// make new request with mapResult
reqBody, err := json.Marshal(mapResult)
diff --git a/web/src/components/OperationSetting.js b/web/src/components/OperationSetting.js
index 1a3a4be..9e3bcfe 100644
--- a/web/src/components/OperationSetting.js
+++ b/web/src/components/OperationSetting.js
@@ -23,6 +23,7 @@ const OperationSetting = () => {
LogConsumeEnabled: '',
DisplayInCurrencyEnabled: '',
DisplayTokenStatEnabled: '',
+ MjNotifyEnabled: '',
DrawingEnabled: '',
DataExportEnabled: '',
DataExportDefaultTime: 'hour',
@@ -229,7 +230,6 @@ const OperationSetting = () => {
/>
-
{
name='DisplayTokenStatEnabled'
onChange={handleInputChange}
/>
-
{
{
submitConfig('general').then();
- }}>保存通用设置
+ }}>保存通用设置
+
+
+
+
+
+
+