Merge branch 'songquanpeng' into sync_upstream

web/src/constants/ChannelConstants.js

@@ -23,6 +23,12 @@ export const CHANNEL_OPTIONS = {
     value: 11,
     color: 'orange'
   },
+  25: {
+    key: 25,
+    text: 'Google Gemini',
+    value: 25,
+    color: 'orange'
+  },
   15: {
     key: 15,
     text: '百度文心千帆',

web/src/views/Channel/index.js

@@ -137,7 +137,7 @@ export default function ChannelPage() {
     const res = await API.get(`/api/channel/test`);
     const { success, message } = res.data;
     if (success) {
-      showInfo('已成功开始测试所有已启用通道，请刷新页面查看结果。');
+      showInfo('已成功开始测试所有通道，请刷新页面查看结果。');
     } else {
       showError(message);
     }

web/src/views/Channel/type/Config.js

@@ -50,7 +50,7 @@ const typeConfig = {
   },
   14: {
     input: {
-      models: ['claude-instant-1', 'claude-2']
+      models: ['claude-instant-1', 'claude-2', 'claude-2.0', 'claude-2.1']
     }
   },
   15: {
@@ -67,8 +67,14 @@ const typeConfig = {
     }
   },
   17: {
+    inputLabel: {
+      other: '插件参数'
+    },
     input: {
-      models: ['qwen-turbo', 'qwen-plus', 'text-embedding-v1']
+      models: ['qwen-turbo', 'qwen-plus', 'qwen-max', 'qwen-max-longcontext', 'text-embedding-v1']
+    },
+    prompt: {
+      other: '请输入插件参数，即 X-DashScope-Plugin 请求头的取值'
     }
   },
   18: {
@@ -96,6 +102,11 @@ const typeConfig = {
     prompt: {
       key: '按照如下格式输入：AppId|SecretId|SecretKey'
     }
+  },
+  25: {
+    input: {
+      models: ['gemini-pro']
+    }
   }
 };
 

web/src/views/Setting/component/OperationSetting.js

@@ -23,6 +23,7 @@ const OperationSetting = () => {
     ChatLink: '',
     QuotaPerUnit: 0,
     AutomaticDisableChannelEnabled: '',
+    AutomaticEnableChannelEnabled: '',
     ChannelDisableThreshold: 0,
     LogConsumeEnabled: '',
     DisplayInCurrencyEnabled: '',
@@ -327,6 +328,16 @@ const OperationSetting = () => {
               />
             }
           />
+          <FormControlLabel
+            label="成功时自动启用通道"
+            control={
+              <Checkbox
+                checked={inputs.AutomaticEnableChannelEnabled === 'true'}
+                onChange={handleInputChange}
+                name="AutomaticEnableChannelEnabled"
+              />
+            }
+          />
           <Button
             variant="contained"
             onClick={() => {