Merge remote-tracking branch 'origin/alpha' into alpha

fd943659 · CaIon · bf30adcd · 0d51f07d · fd943659 · fd943659
Commit fd943659 authored Jun 19, 2025 by CaIon
10 changed files
--- a/controller/misc.go
+++ b/controller/misc.go
@@ -76,6 +76,7 @@ func GetStatus(c *gin.Context) {
 		"demo_site_enabled":        operation_setting.DemoSiteEnabled,
 		"self_use_mode_enabled":    operation_setting.SelfUseModeEnabled,
 		"default_use_auto_group":   setting.DefaultUseAutoGroup,
+		"pay_methods":              setting.PayMethods,
 		// 面板启用开关
 		"api_info_enabled":      cs.ApiInfoEnabled,

--- a/dto/openai_request.go
+++ b/dto/openai_request.go
@@ -53,6 +53,7 @@ type GeneralOpenAIRequest struct {
 	Modalities          json.RawMessage   `json:"modalities,omitempty"`
 	Audio               json.RawMessage   `json:"audio,omitempty"`
 	EnableThinking      any               `json:"enable_thinking,omitempty"` // ali
+	THINKING            json.RawMessage   `json:"thinking,omitempty"`        // doubao
 	ExtraBody           json.RawMessage   `json:"extra_body,omitempty"`
 	WebSearchOptions    *WebSearchOptions `json:"web_search_options,omitempty"`
 	// OpenRouter Params

--- a/model/option.go
+++ b/model/option.go
@@ -79,6 +79,7 @@ func InitOptionMap() {
 	common.OptionMap["Chats"] = setting.Chats2JsonString()
 	common.OptionMap["AutoGroups"] = setting.AutoGroups2JsonString()
 	common.OptionMap["DefaultUseAutoGroup"] = strconv.FormatBool(setting.DefaultUseAutoGroup)
+	common.OptionMap["PayMethods"] = setting.PayMethods2JsonString()
 	common.OptionMap["GitHubClientId"] = ""
 	common.OptionMap["GitHubClientSecret"] = ""
 	common.OptionMap["TelegramBotToken"] = ""
@@ -388,6 +389,8 @@ func updateOptionMap(key string, value string) (err error) {
 		operation_setting.AutomaticDisableKeywordsFromString(value)
 	case "StreamCacheQueueLength":
 		setting.StreamCacheQueueLength, _ = strconv.Atoi(value)
+	case "PayMethods":
+		err = setting.UpdatePayMethodsByJsonString(value)
 	}
 	return err
 }

--- a/relay/channel/gemini/relay-gemini.go
+++ b/relay/channel/gemini/relay-gemini.go
@@ -374,7 +374,9 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest, info *relaycommon
 		if content.Role == "assistant" {
 			content.Role = "model"
 		}
-		geminiRequest.Contents = append(geminiRequest.Contents, content)
+		if len(content.Parts) > 0 {
+			geminiRequest.Contents = append(geminiRequest.Contents, content)
+		}
 	}
 	if len(system_content) > 0 {

--- a/setting/payment.go
+++ b/setting/payment.go
 package setting
+import "encoding/json"
 var PayAddress = ""
 var CustomCallbackAddress = ""
 var EpayId = ""
 var EpayKey = ""
 var Price = 7.3
 var MinTopUp = 1
+var PayMethods = []map[string]string{
+	{
+		"name":  "支付宝",
+		"color": "rgba(var(--semi-blue-5), 1)",
+		"type":  "zfb",
+	},
+	{
+		"name":  "微信",
+		"color": "rgba(var(--semi-green-5), 1)",
+		"type":  "wx",
+	},
+}
+func UpdatePayMethodsByJsonString(jsonString string) error {
+	PayMethods = make([]map[string]string, 0)
+	return json.Unmarshal([]byte(jsonString), &PayMethods)
+}
+func PayMethods2JsonString() string {
+	jsonBytes, err := json.Marshal(PayMethods)
+	if err != nil {
+		return "[]"
+	}
+	return string(jsonBytes)
+}
+func ContainsPayMethod(method string) bool {
+	for _, payMethod := range PayMethods {
+		if payMethod["type"] == method {
+			return true
+		}
+	}
+	return false
+}
--- a/web/src/components/settings/SystemSetting.js
+++ b/web/src/components/settings/SystemSetting.js
@@ -17,7 +17,7 @@ import {
  removeTrailingSlash,
  showError,
  showSuccess,
-  verifyJSON
+  verifyJSON,
 } from '../../helpers';
 import axios from 'axios';
@@ -73,6 +73,7 @@ const SystemSetting = () => {
    LinuxDOOAuthEnabled: '',
    LinuxDOClientId: '',
    LinuxDOClientSecret: '',
+    PayMethods: '',
  });
  const [originInputs, setOriginInputs] = useState({});
@@ -230,6 +231,12 @@ const SystemSetting = () => {
        return;
      }
    }
+    if (originInputs['PayMethods'] !== inputs.PayMethods) {
+      if (!verifyJSON(inputs.PayMethods)) {
+        showError('充值方式设置不是合法的 JSON 字符串');
+        return;
+      }
+    }
    const options = [
      { key: 'PayAddress', value: removeTrailingSlash(inputs.PayAddress) },
@@ -256,6 +263,9 @@ const SystemSetting = () => {
    if (originInputs['TopupGroupRatio'] !== inputs.TopupGroupRatio) {
      options.push({ key: 'TopupGroupRatio', value: inputs.TopupGroupRatio });
    }
+    if (originInputs['PayMethods'] !== inputs.PayMethods) {
+      options.push({ key: 'PayMethods', value: inputs.PayMethods });
+    }
    await updateOptions(options);
  };
@@ -658,6 +668,12 @@ const SystemSetting = () => {
                    placeholder='为一个 JSON 文本，键为组名称，值为倍率'
                    autosize
                  />
+                  <Form.TextArea
+                    field='PayMethods'
+                    label='充值方式设置'
+                    placeholder='为一个 JSON 文本'
+                    autosize
+                  />
                  <Button onClick={submitPayAddress}>更新支付设置</Button>
                </Form.Section>
              </Card>

--- a/web/src/components/table/TaskLogsTable.js
+++ b/web/src/components/table/TaskLogsTable.js
@@ -96,20 +96,8 @@ const renderTimestamp = (timestampInSeconds) => {
 };
 function renderDuration(submit_time, finishTime) {
-  // 确保startTime和finishTime都是有效的时间戳
  if (!submit_time || !finishTime) return 'N/A';
+  const durationSec = finishTime - submit_time;
-  // 将时间戳转换为Date对象
-  const start = new Date(submit_time);
-  const finish = new Date(finishTime);
-  // 计算时间差（毫秒）
-  const durationMs = finish - start;
-  // 将时间差转换为秒，并保留一位小数
-  const durationSec = (durationMs / 1000).toFixed(1);
-  // 设置颜色：大于60秒则为红色，小于等于60秒则为绿色
  const color = durationSec > 60 ? 'red' : 'green';
  // 返回带有样式的颜色标签

--- a/web/src/helpers/data.js
+++ b/web/src/helpers/data.js
@@ -9,6 +9,7 @@ export function setStatusData(data) {
  localStorage.setItem('enable_task', data.enable_task);
  localStorage.setItem('enable_data_export', data.enable_data_export);
  localStorage.setItem('chats', JSON.stringify(data.chats));
+  localStorage.setItem('pay_methods', JSON.stringify(data.pay_methods));
  localStorage.setItem(
    'data_export_default_time',
    data.data_export_default_time,

--- a/web/src/pages/Channel/EditChannel.js
+++ b/web/src/pages/Channel/EditChannel.js
@@ -298,18 +298,27 @@ const EditChannel = (props) => {
    }
  };
-  useEffect(() => {
+useEffect(() => {
-    let localModelOptions = [...originModelOptions];
+  // 使用 Map 来避免重复，以 value 为键
-    inputs.models.forEach((model) => {
+  const modelMap = new Map();
-      if (!localModelOptions.find((option) => option.label === model)) {
-        localModelOptions.push({
+  // 先添加原始模型选项
-          label: model,
+  originModelOptions.forEach(option => {
-          value: model,
+    modelMap.set(option.value, option);
-        });
+  });
-      }
-    });
+  // 再添加当前选中的模型（如果不存在）
-    setModelOptions(localModelOptions);
+  inputs.models.forEach(model => {
-  }, [originModelOptions, inputs.models]);
+    if (!modelMap.has(model)) {
+      modelMap.set(model, {
+        label: model,
+        value: model,
+      });
+    }
+  });
+  setModelOptions(Array.from(modelMap.values()));
+}, [originModelOptions, inputs.models]);
  useEffect(() => {
    fetchModels().then();

--- a/web/src/pages/TopUp/index.js
+++ b/web/src/pages/TopUp/index.js