From 452757140e8d2801ac273fdaa75773084c371480 Mon Sep 17 00:00:00 2001
From: CaIon <1808837298@qq.com>
Date: Mon, 27 Nov 2023 14:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=A3=80=E6=9F=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/relay-image.go          |  3 ++
 controller/relay-openai.go         |  2 ++
 web/src/components/OtherSetting.js | 46 +++++++++++++++---------------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/controller/relay-image.go b/controller/relay-image.go
index a1abd03..c1f837b 100644
--- a/controller/relay-image.go
+++ b/controller/relay-image.go
@@ -36,6 +36,9 @@ func relayImageHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode
 	if imageRequest.Size == "" {
 		imageRequest.Size = "1024x1024"
 	}
+	if imageRequest.N == 0 {
+		imageRequest.N = 1
+	}
 	// Prompt validation
 	if imageRequest.Prompt == "" {
 		return errorWrapper(errors.New("prompt is required"), "required_field_missing", http.StatusBadRequest)
diff --git a/controller/relay-openai.go b/controller/relay-openai.go
index 19b09c9..7cb4b87 100644
--- a/controller/relay-openai.go
+++ b/controller/relay-openai.go
@@ -54,6 +54,7 @@ func openaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*O
 			err := json.Unmarshal(common.StringToByteSlice(streamResp), &streamResponses)
 			if err != nil {
 				common.SysError("error unmarshalling stream response: " + err.Error())
+				wg.Done()
 				return // just ignore the error
 			}
 			for _, streamResponse := range streamResponses {
@@ -66,6 +67,7 @@ func openaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*O
 			err := json.Unmarshal(common.StringToByteSlice(streamResp), &streamResponses)
 			if err != nil {
 				common.SysError("error unmarshalling stream response: " + err.Error())
+				wg.Done()
 				return // just ignore the error
 			}
 			for _, streamResponse := range streamResponses {
diff --git a/web/src/components/OtherSetting.js b/web/src/components/OtherSetting.js
index 526a7d8..c3d56ec 100644
--- a/web/src/components/OtherSetting.js
+++ b/web/src/components/OtherSetting.js
@@ -108,7 +108,7 @@ const OtherSetting = () => {
       <Grid.Column>
         <Form loading={loading}>
           <Header as='h3'>通用设置</Header>
-          <Form.Button onClick={checkUpdate}>检查更新</Form.Button>
+          {/*<Form.Button onClick={checkUpdate}>检查更新</Form.Button>*/}
           <Form.Group widths='equal'>
             <Form.TextArea
               label='公告'
@@ -178,28 +178,28 @@ const OtherSetting = () => {
           <Form.Button onClick={submitFooter}>设置页脚</Form.Button>
         </Form>
       </Grid.Column>
-      <Modal
-        onClose={() => setShowUpdateModal(false)}
-        onOpen={() => setShowUpdateModal(true)}
-        open={showUpdateModal}
-      >
-        <Modal.Header>新版本：{updateData.tag_name}</Modal.Header>
-        <Modal.Content>
-          <Modal.Description>
-            <div dangerouslySetInnerHTML={{ __html: updateData.content }}></div>
-          </Modal.Description>
-        </Modal.Content>
-        <Modal.Actions>
-          <Button onClick={() => setShowUpdateModal(false)}>关闭</Button>
-          <Button
-            content='详情'
-            onClick={() => {
-              setShowUpdateModal(false);
-              openGitHubRelease();
-            }}
-          />
-        </Modal.Actions>
-      </Modal>
+      {/*<Modal*/}
+      {/*  onClose={() => setShowUpdateModal(false)}*/}
+      {/*  onOpen={() => setShowUpdateModal(true)}*/}
+      {/*  open={showUpdateModal}*/}
+      {/*>*/}
+      {/*  <Modal.Header>新版本：{updateData.tag_name}</Modal.Header>*/}
+      {/*  <Modal.Content>*/}
+      {/*    <Modal.Description>*/}
+      {/*      <div dangerouslySetInnerHTML={{ __html: updateData.content }}></div>*/}
+      {/*    </Modal.Description>*/}
+      {/*  </Modal.Content>*/}
+      {/*  <Modal.Actions>*/}
+      {/*    <Button onClick={() => setShowUpdateModal(false)}>关闭</Button>*/}
+      {/*    <Button*/}
+      {/*      content='详情'*/}
+      {/*      onClick={() => {*/}
+      {/*        setShowUpdateModal(false);*/}
+      {/*        openGitHubRelease();*/}
+      {/*      }}*/}
+      {/*    />*/}
+      {/*  </Modal.Actions>*/}
+      {/*</Modal>*/}
     </Grid>
   );
 };