From ba83d6c31dac1a3c6d894d48c494a01941fc35a6 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Thu, 1 Feb 2024 22:21:37 +0800
Subject: [PATCH 1/5] fix: #638

---
 guoba.support.js         | 1 +
 utils/xinghuo/xinghuo.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/guoba.support.js b/guoba.support.js
index fe8303b..a147105 100644
--- a/guoba.support.js
+++ b/guoba.support.js
@@ -625,6 +625,7 @@ export function supportGuoba () {
               { label: '讯飞星火认知大模型V1.5', value: 'api' },
               { label: '讯飞星火认知大模型V2.0', value: 'apiv2' },
               { label: '讯飞星火认知大模型V3.0', value: 'apiv3' },
+              { label: '讯飞星火认知大模型V3.5', value: 'apiv3.5' },
               { label: '讯飞星火助手', value: 'assistants' }
             ]
           }
diff --git a/utils/xinghuo/xinghuo.js b/utils/xinghuo/xinghuo.js
index b090410..c0e74a5 100644
--- a/utils/xinghuo/xinghuo.js
+++ b/utils/xinghuo/xinghuo.js
@@ -86,6 +86,8 @@ export default class XinghuoClient {
       APILink = '/v2.1/chat'
     } else if (Config.xhmode === 'apiv3') {
       APILink = '/v3.1/chat'
+    } else if (Config.xhmode === 'apiv3.5') {
+      APILink = '/v3.5/chat'
     }
     const date = new Date().toGMTString()
     const algorithm = 'hmac-sha256'

From fc8bace2c5b624e4296d7a75b46a7fafa56fcd80 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Thu, 1 Feb 2024 22:25:16 +0800
Subject: [PATCH 2/5] fix: xh 3.5

---
 utils/xinghuo/xinghuo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/xinghuo/xinghuo.js b/utils/xinghuo/xinghuo.js
index c0e74a5..bd22a04 100644
--- a/utils/xinghuo/xinghuo.js
+++ b/utils/xinghuo/xinghuo.js
@@ -377,7 +377,7 @@ export default class XinghuoClient {
     let chatId = option?.chatId
     let image = option?.image
 
-    if (Config.xhmode == 'api' || Config.xhmode == 'apiv2' || Config.xhmode == 'apiv3' || Config.xhmode == 'assistants') {
+    if (Config.xhmode == 'api' || Config.xhmode == 'apiv2' || Config.xhmode == 'apiv3' || Config.xhmode == 'apiv3.5' || Config.xhmode == 'assistants') {
       if (!Config.xhAppId || !Config.xhAPISecret || !Config.xhAPIKey) throw new Error('未配置api')
       let Prompt = []
       // 设定

From 8ec1ee4c1e0b8df0c6fc5705cb0231e2e14dfd0b Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Thu, 1 Feb 2024 22:42:42 +0800
Subject: [PATCH 3/5] fix: xh 3.5

---
 utils/xinghuo/xinghuo.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/utils/xinghuo/xinghuo.js b/utils/xinghuo/xinghuo.js
index bd22a04..bad4033 100644
--- a/utils/xinghuo/xinghuo.js
+++ b/utils/xinghuo/xinghuo.js
@@ -178,7 +178,13 @@ export default class XinghuoClient {
     const wsUrl = Config.xhmode == 'assistants' ? Config.xhAssistants : await this.getWsUrl()
     if (!wsUrl) throw new Error('获取ws链接失败')
     let domain = 'general'
-    if (Config.xhmode == 'apiv2') { domain = 'generalv2' } else if (Config.xhmode == 'apiv3') { domain = 'generalv3' }
+    if (Config.xhmode == 'apiv2') {
+      domain = 'generalv2'
+    } else if (Config.xhmode == 'apiv3') {
+      domain = 'generalv3'
+    } else if (Config.xhmode == 'apiv3.5') {
+      domain = 'generalv3.5'
+    }
     // 编写消息内容
     const wsSendData = {
       header: {

From 8cc7105f2d9b5296dc704b43d91e215874db2b06 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Thu, 1 Feb 2024 22:50:16 +0800
Subject: [PATCH 4/5] fix: xh prompt turn to system role

---
 utils/xinghuo/xinghuo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/xinghuo/xinghuo.js b/utils/xinghuo/xinghuo.js
index bad4033..3040f79 100644
--- a/utils/xinghuo/xinghuo.js
+++ b/utils/xinghuo/xinghuo.js
@@ -395,7 +395,7 @@ export default class XinghuoClient {
           logger.warn('星火设定序列化失败,本次对话不附带设定')
         }
       } else {
-        Prompt = Config.xhPrompt ? [{ role: 'user', content: Config.xhPrompt }] : []
+        Prompt = Config.xhPrompt ? [{ role: 'system', content: Config.xhPrompt }] : []
       }
       if (Config.xhPromptEval) {
         Prompt.forEach(obj => {

From 389940085a46b7e046dc0809956bae442151f578 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Thu, 1 Feb 2024 22:51:58 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20xh=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/prompts.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/prompts.js b/apps/prompts.js
index a78e4d3..65c2524 100644
--- a/apps/prompts.js
+++ b/apps/prompts.js
@@ -159,7 +159,8 @@ export class help extends plugin {
       Custom: 'sydney',
       claude: 'slackClaudeGlobalPreset',
       qwen: 'promptPrefixOverride',
-      gemini: 'geminiPrompt'
+      gemini: 'geminiPrompt',
+      xh: 'xhPrompt'
     }
 
     if (keyMap[use]) {
@@ -169,6 +170,9 @@ export class help extends plugin {
       } else {
         Config[keyMap[use]] = prompt.content
       }
+      if (use === 'xh') {
+        Config.xhPromptSerialize = false
+      }
       await redis.set(`CHATGPT:PROMPT_USE_${use}`, promptName)
       await e.reply(`你当前正在使用${use}模式，已将该模式设定应用为"${promptName}"。更该设定后建议结束对话以使设定更好生效`, true)
     } else {