Merge remote-tracking branch 'origin/main'

# Conflicts:
#	README.md
#	go.mod
#	go.sum
#	model/log.go
#	web/src/App.js
#	web/src/components/ChannelsTable.js

web/src/pages/Channel/EditChannel.js

@@ -19,6 +19,8 @@ function type2secretPrompt(type) {
       return '按照如下格式输入：APPID|APISecret|APIKey';
     case 22:
       return '按照如下格式输入：APIKey-AppId，例如：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041';
+    case 23:
+      return '按照如下格式输入：AppId|SecretId|SecretKey';
     default:
       return '请输入渠道对应的鉴权密钥';
   }
@@ -80,7 +82,10 @@ const EditChannel = () => {
           localModels = ['SparkDesk'];
           break;
         case 19:
-          localModels = ['360GPT_S2_V9', 'embedding-bert-512-v1', 'embedding_s1_v1', 'semantic_similarity_s1_v1', '360GPT_S2_V9.4'];
+          localModels = ['360GPT_S2_V9', 'embedding-bert-512-v1', 'embedding_s1_v1', 'semantic_similarity_s1_v1'];
+          break;
+        case 23:
+          localModels = ['hunyuan'];
           break;
       }
       setInputs((inputs) => ({ ...inputs, models: localModels }));

web/src/pages/NotFound/index.js

@@ -1,19 +1,12 @@
 import React from 'react';
-import { Segment, Header } from 'semantic-ui-react';
+import { Message } from 'semantic-ui-react';
 
 const NotFound = () => (
   <>
-    <Header
-      block
-      as="h4"
-      content="404"
-      attached="top"
-      icon="info"
-      className="small-icon"
-    />
-    <Segment attached="bottom">
-      未找到所请求的页面
-    </Segment>
+    <Message negative>
+      <Message.Header>页面不存在</Message.Header>
+      <p>请检查你的浏览器地址是否正确</p>
+    </Message>
   </>
 );
 

web/src/pages/User/EditUser.js

@@ -102,7 +102,7 @@ const EditUser = () => {
               label='密码'
               name='password'
               type={'password'}
-              placeholder={'请输入新的密码'}
+              placeholder={'请输入新的密码，最短 8 位'}
               onChange={handleInputChange}
               value={password}
               autoComplete='new-password'