feat: 可设置是否转发上游mj图片地址

constant/midjourney.go

 package constant
 package constant
 
 
 var MjNotifyEnabled = false
 var MjNotifyEnabled = false
-
 var MjModeClearEnabled = false
 var MjModeClearEnabled = false
+var MjForwardUrlEnabled = true
 
 
 const (
 const (
 	MjErrorUnknown = 5
 	MjErrorUnknown = 5

controller/midjourney.go

@@ -10,11 +10,11 @@ import (
 	"log"
 	"log"
 	"net/http"
 	"net/http"
 	"one-api/common"
 	"one-api/common"
+	"one-api/constant"
 	"one-api/dto"
 	"one-api/dto"
 	"one-api/model"
 	"one-api/model"
 	"one-api/service"
 	"one-api/service"
 	"strconv"
 	"strconv"
-	"strings"
 	"time"
 	"time"
 )
 )
 
 
@@ -233,6 +233,12 @@ func GetAllMidjourney(c *gin.Context) {
 	if logs == nil {
 	if logs == nil {
 		logs = make([]*model.Midjourney, 0)
 		logs = make([]*model.Midjourney, 0)
 	}
 	}
+	if constant.MjForwardUrlEnabled {
+		for i, midjourney := range logs {
+			midjourney.ImageUrl = common.ServerAddress + "/mj/image/" + midjourney.MjId
+			logs[i] = midjourney
+		}
+	}
 	c.JSON(200, gin.H{
 	c.JSON(200, gin.H{
 		"success": true,
 		"success": true,
 		"message": "",
 		"message": "",
@@ -259,7 +265,7 @@ func GetUserMidjourney(c *gin.Context) {
 	if logs == nil {
 	if logs == nil {
 		logs = make([]*model.Midjourney, 0)
 		logs = make([]*model.Midjourney, 0)
 	}
 	}
-	if !strings.Contains(common.ServerAddress, "localhost") {
+	if constant.MjForwardUrlEnabled {
 		for i, midjourney := range logs {
 		for i, midjourney := range logs {
 			midjourney.ImageUrl = common.ServerAddress + "/mj/image/" + midjourney.MjId
 			midjourney.ImageUrl = common.ServerAddress + "/mj/image/" + midjourney.MjId
 			logs[i] = midjourney
 			logs[i] = midjourney

model/option.go

@@ -93,6 +93,7 @@ func InitOptionMap() {
 	common.OptionMap["DefaultCollapseSidebar"] = strconv.FormatBool(common.DefaultCollapseSidebar)
 	common.OptionMap["DefaultCollapseSidebar"] = strconv.FormatBool(common.DefaultCollapseSidebar)
 	common.OptionMap["MjNotifyEnabled"] = strconv.FormatBool(constant.MjNotifyEnabled)
 	common.OptionMap["MjNotifyEnabled"] = strconv.FormatBool(constant.MjNotifyEnabled)
 	common.OptionMap["MjModeClearEnabled"] = strconv.FormatBool(constant.MjModeClearEnabled)
 	common.OptionMap["MjModeClearEnabled"] = strconv.FormatBool(constant.MjModeClearEnabled)
+	common.OptionMap["MjForwardUrlEnabled"] = strconv.FormatBool(constant.MjForwardUrlEnabled)
 	common.OptionMap["CheckSensitiveEnabled"] = strconv.FormatBool(constant.CheckSensitiveEnabled)
 	common.OptionMap["CheckSensitiveEnabled"] = strconv.FormatBool(constant.CheckSensitiveEnabled)
 	common.OptionMap["CheckSensitiveOnPromptEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnPromptEnabled)
 	common.OptionMap["CheckSensitiveOnPromptEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnPromptEnabled)
 	//common.OptionMap["CheckSensitiveOnCompletionEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnCompletionEnabled)
 	//common.OptionMap["CheckSensitiveOnCompletionEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnCompletionEnabled)
@@ -198,6 +199,8 @@ func updateOptionMap(key string, value string) (err error) {
 			constant.MjNotifyEnabled = boolValue
 			constant.MjNotifyEnabled = boolValue
 		case "MjModeClearEnabled":
 		case "MjModeClearEnabled":
 			constant.MjModeClearEnabled = boolValue
 			constant.MjModeClearEnabled = boolValue
+		case "MjForwardUrlEnabled":
+			constant.MjForwardUrlEnabled = boolValue
 		case "CheckSensitiveEnabled":
 		case "CheckSensitiveEnabled":
 			constant.CheckSensitiveEnabled = boolValue
 			constant.CheckSensitiveEnabled = boolValue
 		case "CheckSensitiveOnPromptEnabled":
 		case "CheckSensitiveOnPromptEnabled":

relay/relay-mj.go

@@ -110,11 +110,13 @@ func coverMidjourneyTaskDto(c *gin.Context, originTask *model.Midjourney) (midjo
 	midjourneyTask.StartTime = originTask.StartTime
 	midjourneyTask.StartTime = originTask.StartTime
 	midjourneyTask.FinishTime = originTask.FinishTime
 	midjourneyTask.FinishTime = originTask.FinishTime
 	midjourneyTask.ImageUrl = ""
 	midjourneyTask.ImageUrl = ""
-	if originTask.ImageUrl != "" {
+	if originTask.ImageUrl != "" && constant.MjForwardUrlEnabled {
 		midjourneyTask.ImageUrl = common.ServerAddress + "/mj/image/" + originTask.MjId
 		midjourneyTask.ImageUrl = common.ServerAddress + "/mj/image/" + originTask.MjId
 		if originTask.Status != "SUCCESS" {
 		if originTask.Status != "SUCCESS" {
 			midjourneyTask.ImageUrl += "?rand=" + strconv.FormatInt(time.Now().UnixNano(), 10)
 			midjourneyTask.ImageUrl += "?rand=" + strconv.FormatInt(time.Now().UnixNano(), 10)
 		}
 		}
+	} else {
+		midjourneyTask.ImageUrl = originTask.ImageUrl
 	}
 	}
 	midjourneyTask.Status = originTask.Status
 	midjourneyTask.Status = originTask.Status
 	midjourneyTask.FailReason = originTask.FailReason
 	midjourneyTask.FailReason = originTask.FailReason

web/src/components/OperationSetting.js

@@ -39,6 +39,7 @@ const OperationSetting = () => {
     SensitiveWords: '',
     SensitiveWords: '',
     MjNotifyEnabled: '',
     MjNotifyEnabled: '',
     MjModeClearEnabled: '',
     MjModeClearEnabled: '',
+    MjForwardUrlEnabled: '',
     DrawingEnabled: '',
     DrawingEnabled: '',
     DataExportEnabled: '',
     DataExportEnabled: '',
     DataExportDefaultTime: 'hour',
     DataExportDefaultTime: 'hour',
@@ -323,6 +324,12 @@ const OperationSetting = () => {
               onChange={handleInputChange}
               onChange={handleInputChange}
             />
             />
             <Form.Checkbox
             <Form.Checkbox
+              checked={inputs.MjForwardUrlEnabled === 'true'}
+              label='开启之后将上游地址替换为服务器地址'
+              name='MjForwardUrlEnabled'
+              onChange={handleInputChange}
+            />
+            <Form.Checkbox
               checked={inputs.MjModeClearEnabled === 'true'}
               checked={inputs.MjModeClearEnabled === 'true'}
               label='开启之后会清除用户提示词中的--fast、--relax以及--turbo参数'
               label='开启之后会清除用户提示词中的--fast、--relax以及--turbo参数'
               name='MjModeClearEnabled'
               name='MjModeClearEnabled'