wechaty-web-panel 1.6.56 → 1.6.58

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## 更新日志
 
-### V1.6.55(2024-06-03)
+### V1.6.58(2024-07-10)
+1、Dify 和 FastGPT 每次调用都会携带用户信息和群聊信息，可以使用环境变量获取，实现真正的个性化机器人服务，更像真人
+
+### V1.6.57(2024-06-05)
+1、添加聊天内容记录到本地
+
+### V1.6.56(2024-06-03)
 1、添加聊天内容记录到本地
 2、添加内测功能-聊天总结功能
 

package/README.md

@@ -8,6 +8,29 @@ Wechaty Web Panel 插件，让你的 Wechaty 机器人快速接入 web 控制面
 
 本项目为插件源码，非直接运行的项目。如需可直接运行的项目，请直接拉取 [https://github.com/leochen-g/wechat-assistant-pro](https://github.com/leochen-g/wechat-assistant-pro) 即可
 
+## 快速测试
+
+### 下载源码并安装依赖
+
+```sh
+git clone https://github.com/leochen-g/wechaty-web-panel.git
+cd wechaty-web-panel
+npm install # 可指定淘宝镜像源加速: --registry=https://registry.npmmirror.com
+```
+
+### 测试微信
+
+在 test/wechat.js文件中填入apiKey与apiSecret，运行如下命令
+```sh
+npm run test:wechat
+```
+
+### 测试企业微信
+需要有企业微信token，在test/wework.js填入workProToken、apiKey与apiSecret，运行如下命令
+```sh
+npm run test:wework
+```
+
 ## 面板主要功能
 
 * 定时提醒

package/dist/cjs/src/botInstance/dify.d.ts

@@ -31,7 +31,10 @@ declare class DifyAi {
      * @return {Promise<void>}
      */
     reset(): Promise<void>;
-    getReply(content: any, uid: any, adminId?: string, systemMessage?: string): Promise<{
+    getReply({ content, inputs }: {
+        content: any;
+        inputs: any;
+    }, id: any, adminId?: string, systemMessage?: string): Promise<{
         type: number;
         content: any;
     }[]>;

package/dist/cjs/src/botInstance/dify.js

@@ -59,7 +59,7 @@ class DifyAi {
     reset() {
         this.difyChat = null;
     }
-    async getReply(content, uid, adminId = '', systemMessage = '') {
+    async getReply({ content, inputs }, id, adminId = '', systemMessage = '') {
         try {
             if (!this.difyChat) {
                 console.log('启用Dify对话平台');
@@ -74,12 +74,12 @@ class DifyAi {
             }
             if (systemMessage || content === 'reset' || content === '重置') {
                 console.log('重新更新上下文对话');
-                this.chatOption[uid] = {};
+                this.chatOption[id] = {};
                 if (content === 'reset' || content === '重置') {
                     return [{ type: 1, content: '上下文已重置' }];
                 }
             }
-            const { conversationId, text, files } = systemMessage ? await this.difyChat.sendMessage(content, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000, user: uid }) : await this.difyChat.sendMessage(content, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000, user: uid });
+            const { conversationId, text, files } = systemMessage ? await this.difyChat.sendMessage(content, { ...this.chatOption[id], inputs, systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000, user: id }) : await this.difyChat.sendMessage(content, { ...this.chatOption[id], inputs, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000, user: id });
             if (this.config.filter) {
                 const censor = await this.contentCensor.checkText(text);
                 if (!censor) {
@@ -88,11 +88,11 @@ class DifyAi {
                 }
             }
             if (this.config.record) {
-                void (0, aichatDb_js_1.addAichatRecord)({ contactId: uid, adminId, input: content, output: text, time: (0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss') });
+                void (0, aichatDb_js_1.addAichatRecord)({ contactId: id, adminId, input: content, output: text, time: (0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss') });
             }
             // 保存对话id 对于同一个用户的对话不更新conversationId
-            if (!this.chatOption[uid]?.conversationId) {
-                this.chatOption[uid] = {
+            if (!this.chatOption[id]?.conversationId) {
+                this.chatOption[id] = {
                     conversationId
                 };
             }

package/dist/cjs/src/botInstance/officialOpenAi.d.ts

@@ -66,7 +66,7 @@ declare class OfficialOpenAi {
      * @return {Promise<void>}
      */
     reset(): Promise<void>;
-    getReply(content: any, uid: any, adminId: string | undefined, systemMessage: string | undefined, isFastGPT: any): Promise<{
+    getReply(content: any, uid: any, adminId: string | undefined, systemMessage: string | undefined, isFastGPT: any, variables: any): Promise<{
         type: number;
         content: any;
     }[]>;

package/dist/cjs/src/botInstance/officialOpenAi.js

@@ -135,7 +135,7 @@ class OfficialOpenAi {
     reset() {
         this.chatGPT = null;
     }
-    async getReply(content, uid, adminId = '', systemMessage = '', isFastGPT) {
+    async getReply(content, uid, adminId = '', systemMessage = '', isFastGPT, variables) {
         try {
             if (!this.chatGPT) {
                 console.log(isFastGPT ? '看到此消息说明启用了FastGPT' : '看到此消息说明已启用ChatGPT');
@@ -165,6 +165,9 @@ class OfficialOpenAi {
             if (systemMessage) {
                 sendParams.systemMessage = systemMessage;
             }
+            if (isFastGPT && variables) {
+                sendParams.variables = variables;
+            }
             const { conversationId, text, id } = await this.chatGPT.sendMessage(content, sendParams);
             if (this.config.filter) {
                 const censor = await this.contentCensor.checkText(text);

package/dist/cjs/src/botInstance/sdk/chatGPT.js

@@ -148,7 +148,7 @@ let ChatGPTAPI = class {
         }
     }
     async sendMessage(text, opts = {}) {
-        const { parentMessageId, messageId = (0, uuid_1.v4)(), timeoutMs, onProgress, stream = !!onProgress, completionParams, conversationId, chatId } = opts;
+        const { parentMessageId, messageId = (0, uuid_1.v4)(), timeoutMs, onProgress, stream = !!onProgress, completionParams, conversationId, chatId, variables } = opts;
         let { abortSignal } = opts;
         let abortController = null;
         if (timeoutMs && !abortSignal) {
@@ -187,6 +187,9 @@ let ChatGPTAPI = class {
             if (chatId) {
                 body.chatId = chatId;
             }
+            if (variables) {
+                body.variables = variables;
+            }
             if (this._apiOrg) {
                 headers["OpenAI-Organization"] = this._apiOrg;
             }

package/dist/cjs/src/botInstance/sdk/difyClient.d.ts

@@ -85,12 +85,13 @@ export class CompletionClient extends DifyClient {
     createCompletionMessage(inputs: any, user: any, stream?: boolean, files?: null): Promise<import("axios").AxiosResponse<any, any>>;
 }
 export class ChatClient extends DifyClient {
-    sendMessage(query: any, { systemMessage, user, conversationId, timeoutMs, files }: {
+    sendMessage(query: any, { systemMessage, user, conversationId, timeoutMs, files, inputs }: {
         systemMessage: any;
         user: any;
         conversationId?: null | undefined;
         timeoutMs?: number | undefined;
         files?: null | undefined;
+        inputs: any;
     }): Promise<any>;
     getConversationMessages(user: any, conversationId?: string, firstId?: null, limit?: null): Promise<import("axios").AxiosResponse<any, any>>;
     getConversations(user: any, firstId?: null, limit?: null, pinned?: null): Promise<import("axios").AxiosResponse<any, any>>;

package/dist/cjs/src/botInstance/sdk/difyClient.js

@@ -132,9 +132,11 @@ class CompletionClient extends DifyClient {
 }
 exports.CompletionClient = CompletionClient;
 class ChatClient extends DifyClient {
-    async sendMessage(query, { systemMessage, user, conversationId = null, timeoutMs = 100 * 1000, files = null }) {
+    async sendMessage(query, { systemMessage, user, conversationId = null, timeoutMs = 100 * 1000, files = null, inputs }) {
         const data = {
-            inputs: {},
+            inputs: {
+                ...inputs
+            },
             query,
             user,
             response_mode: this.stream ? 'streaming' : 'blocking',

package/dist/cjs/src/handlers/on-message.js

@@ -104,9 +104,16 @@ async function dispatchFriendFilterByMsgType(that, msg) {
                 break;
             case that.Message.Type.Audio:
                 let finalConfig = await (0, msg_filters_js_1.getCustomConfig)({ name, id: contact.id, roomName: '', roomId: '', room: false, type: 'openWhisper' });
+                if (!finalConfig && config?.customBot?.openWhisper) {
+                    finalConfig = {
+                        botConfig: {
+                            whisperConfig: config?.customBot?.whisperConfig
+                        }
+                    };
+                }
                 if (finalConfig) {
                     const audioFileBox = await msg.toFileBox();
-                    const text = await (0, multimodal_js_1.getVoiceText)(audioFileBox, finalConfig.botConfig.whisperConfig);
+                    const text = msg.text().trim() ? msg.text().trim() : await (0, multimodal_js_1.getVoiceText)(audioFileBox, finalConfig.botConfig.whisperConfig);
                     console.log('语音解析结果', text);
                     const keyword = finalConfig.botConfig.whisperConfig?.keywords?.length ? finalConfig.botConfig?.whisperConfig.keywords?.find((item) => text.includes(item)) : true;
                     const isIgnore = checkIgnore(content.trim(), aibotConfig.ignoreMessages);
@@ -165,9 +172,6 @@ async function dispatchFriendFilterByMsgType(that, msg) {
             case that.Message.Type.Video:
                 console.log(`发消息人${await contact.name()}:发了一个视频`);
                 break;
-            case that.Message.Type.Audio:
-                console.log(`发消息人${await contact.name()}:发了一个视频`);
-                break;
             case that.Message.Type.MiniProgram:
                 console.log(`发消息人${await contact.name()}:发了一个小程序`);
                 const miniProgram = await msg.toMiniProgram();
@@ -314,9 +318,16 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
             case that.Message.Type.Audio:
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个语音`);
                 let finalConfig = await (0, msg_filters_js_1.getCustomConfig)({ name: contactName, id: contactId, roomName, roomId: room.id, room, type: 'openWhisper' });
+                if (!finalConfig && config?.customBot?.openWhisper) {
+                    finalConfig = {
+                        botConfig: {
+                            whisperConfig: config?.customBot?.whisperConfig
+                        }
+                    };
+                }
                 if (finalConfig) {
                     const audioFileBox = await msg.toFileBox();
-                    const text = await (0, multimodal_js_1.getVoiceText)(audioFileBox, finalConfig.botConfig.whisperConfig);
+                    const text = msg.text().trim() ? msg.text().trim() : await (0, multimodal_js_1.getVoiceText)(audioFileBox, finalConfig.botConfig.whisperConfig);
                     console.log('语音解析结果', text);
                     const keyword = finalConfig.botConfig.whisperConfig?.keywords?.length ? finalConfig.botConfig?.whisperConfig?.keywords?.find((item) => text.includes(item)) : true;
                     const isIgnore = checkIgnore(content.trim(), aibotConfig.ignoreMessages);
@@ -338,7 +349,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                             }
                             return;
                         }
-                        replys = await await (0, reply_js_1.getRoomTextReply)({
+                        replys = await (0, reply_js_1.getRoomTextReply)({
                             that,
                             content: text,
                             isFriend,

package/dist/cjs/src/package-json.d.ts

@@ -14,7 +14,8 @@ export namespace packageJson {
         clean: string;
         dist: string;
         "dist:commonjs": string;
-        test: string;
+        "test:wechat": string;
+        "test:wework": string;
         release: string;
         "release:dry": string;
     };
@@ -41,6 +42,15 @@ export namespace packageJson {
         "eslint-plugin-prettier": string;
         "npm-run-all": string;
         prettier: string;
+        "@juzi/wechaty": string;
+        "@grpc/grpc-js": string;
+        "@juzi/wechaty-puppet": string;
+        "@juzi/wechaty-puppet-service": string;
+        wechaty: string;
+        "wechaty-puppet-service": string;
+        "wechaty-puppet-wechat4u": string;
+        "wechaty-puppet-padlocal": string;
+        "wechaty-puppet": string;
     };
     const readme: string;
     namespace engines {

package/dist/cjs/src/package-json.js

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.56",
+    "version": "1.6.58",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -20,7 +20,8 @@ exports.packageJson = {
         "clean": "shx rm -fr dist/*",
         "dist": "npm-run-all clean build dist:commonjs",
         "dist:commonjs": "jq -n \"{ type: \\\"commonjs\\\" }\" > dist/cjs/package.json",
-        "test": "node test/index.js",
+        "test:wechat": "node test/wechat.js",
+        "test:wework": "node test/wework.js",
         "release": "verpub publish",
         "release:dry": "verpub --dry-run"
     },
@@ -61,7 +62,16 @@ exports.packageJson = {
         "eslint-config-prettier": "^6.11.0",
         "eslint-plugin-prettier": "^3.1.4",
         "npm-run-all": "^4.1.5",
-        "prettier": "^2.0.5"
+        "prettier": "^2.0.5",
+        "@juzi/wechaty": "^1.0.87",
+        "@grpc/grpc-js": "1.9.14",
+        "@juzi/wechaty-puppet": "^1.0.78",
+        "@juzi/wechaty-puppet-service": "^1.0.87",
+        "wechaty": "^1.20.2",
+        "wechaty-puppet-service": "^1.18.2",
+        "wechaty-puppet-wechat4u": "^1.14.12",
+        "wechaty-puppet-padlocal": "^1.20.1",
+        "wechaty-puppet": "^1.21.1"
     },
     "readme": "README.md",
     "engines": {

package/dist/cjs/src/proxy/bot/chatgpt.d.ts

@@ -1,6 +1,9 @@
 export function reset(adminId: any): void;
 export function resetAll(): void;
-export function getChatGPTReply(content: any, uid: any, adminId: any, config: {
+export function getChatGPTReply({ content, variables }: {
+    content: any;
+    variables: any;
+}, uid: any, adminId: any, config: {
     token: string;
     debug: boolean;
     proxyPass: string;

package/dist/cjs/src/proxy/bot/chatgpt.js

@@ -23,7 +23,7 @@ function resetAll() {
     chatGPT = {};
 }
 exports.resetAll = resetAll;
-async function getChatGPTReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 80, model: "", systemMessage: "", keywordSystemMessages: [] }, isFastGPT) {
+async function getChatGPTReply({ content, variables }, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 80, model: "", systemMessage: "", keywordSystemMessages: [] }, isFastGPT) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
         return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
@@ -41,7 +41,7 @@ async function getChatGPTReply(content, uid, adminId, config = { token: "", debu
             content = content.replace(finalSystemMsg.keyword, '');
         }
     }
-    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage, isFastGPT);
+    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage, isFastGPT, variables);
 }
 exports.getChatGPTReply = getChatGPTReply;
 //# sourceMappingURL=chatgpt.js.map

package/dist/cjs/src/proxy/bot/dify.d.ts

@@ -1,6 +1,9 @@
 export function reset(adminId: any): void;
 export function resetAll(): void;
-export function getDifyAiReply(content: any, uid: any, adminId: any, config?: {
+export function getDifyAiReply({ content, inputs }: {
+    content: any;
+    inputs: any;
+}, uid: any, adminId: any, config?: {
     token: string;
     debug: boolean;
     proxyPass: string;

package/dist/cjs/src/proxy/bot/dify.js

@@ -23,7 +23,7 @@ function resetAll() {
     difyAi = {};
 }
 exports.resetAll = resetAll;
-async function getDifyAiReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 80, model: "", systemMessage: "", keywordSystemMessages: [], isAiAgent: false }) {
+async function getDifyAiReply({ content, inputs }, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 80, model: "", systemMessage: "", keywordSystemMessages: [], isAiAgent: false }) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置Dify的 api秘钥方可使用');
         return [{ type: 1, content: '请到智能微秘书平台配置Dify的 api秘钥方可使用' }];
@@ -41,7 +41,7 @@ async function getDifyAiReply(content, uid, adminId, config = { token: "", debug
             content = content.replace(finalSystemMsg.keyword, '');
         }
     }
-    return await difyAi[adminId].getReply(content, uid, adminId, systemMessage);
+    return await difyAi[adminId].getReply({ content, inputs }, uid, adminId, systemMessage);
 }
 exports.getDifyAiReply = getDifyAiReply;
 //# sourceMappingURL=dify.js.map

package/dist/cjs/src/proxy/bot/dispatch.d.ts

@@ -3,5 +3,5 @@
  * @param {botType: 机器人类别, content: 消息内容, uid: 说话的用户id, updateId: 更新的用户id, adminId: 对话实例id，用于分割不同配置, config: 机器人配置}
  * @returns
  */
-export function dispatchBot({ botType, content, uid, adminId, config }: any): Promise<any>;
+export function dispatchBot({ botType, content, id, uid, uname, roomId, roomName, adminId, config }: any): Promise<any>;
 //# sourceMappingURL=dispatch.d.ts.map

package/dist/cjs/src/proxy/bot/dispatch.js

@@ -15,7 +15,7 @@ const global_js_1 = __importDefault(require("../../db/global.js"));
  * @param {botType: 机器人类别, content: 消息内容, uid: 说话的用户id, updateId: 更新的用户id, adminId: 对话实例id，用于分割不同配置, config: 机器人配置}
  * @returns
  */
-async function dispatchBot({ botType, content, uid, adminId, config }) {
+async function dispatchBot({ botType, content, id, uid, uname, roomId, roomName, adminId, config }) {
     console.log('进入定制机器人回复');
     try {
         const gptConfig = global_js_1.default.getGptConfigById(adminId);
@@ -23,29 +23,29 @@ async function dispatchBot({ botType, content, uid, adminId, config }) {
         switch (botType) {
             case 6:
                 // ChatGPT api
-                res = await (0, chatgpt_js_1.getChatGPTReply)(content, uid, adminId, config, false);
+                res = await (0, chatgpt_js_1.getChatGPTReply)({ content }, id, adminId, config, false);
                 replys = res;
                 break;
             case 7:
                 // ChatGPT web
                 console.log('进入聊天');
-                res = await (0, chatgpt_web_js_1.getChatGPTWebReply)(content, uid, adminId, config);
+                res = await (0, chatgpt_web_js_1.getChatGPTWebReply)(content, id, adminId, config);
                 replys = res;
                 break;
             case 8:
                 // dify ai
                 console.log('进入Dify聊天');
-                res = await (0, dify_js_1.getDifyAiReply)(content, uid, adminId, config);
+                res = await (0, dify_js_1.getDifyAiReply)({ content, inputs: { uid, uname, roomId, roomName } }, id, adminId, config);
                 replys = res;
                 break;
             case 9:
                 // fastGPT api
-                res = await (0, chatgpt_js_1.getChatGPTReply)(content, uid, adminId, config, true);
+                res = await (0, chatgpt_js_1.getChatGPTReply)({ content, variables: { uid, uname, roomId, roomName } }, id, adminId, config, true);
                 replys = res;
                 break;
             case 11:
                 // coze api
-                res = await (0, coze_js_1.getCozeReply)(content, uid, adminId, config);
+                res = await (0, coze_js_1.getCozeReply)(content, id, adminId, config);
                 replys = res;
                 break;
             default:

package/dist/cjs/src/proxy/difyAi.d.ts

@@ -2,10 +2,15 @@
  * 重置实例
  */
 export function reset(): void;
-export function getDifyReply(content: any, uid: any): Promise<any>;
-export function getDifySimpleReply({ content, uid, config }: {
+export function getDifyReply({ content, id, inputs }: {
     content: any;
-    uid: any;
+    id: any;
+    inputs: any;
+}): Promise<any>;
+export function getDifySimpleReply({ content, id, inputs, config }: {
+    content: any;
+    id: any;
+    inputs: any;
     config: any;
 }): Promise<{
     type: number;

package/dist/cjs/src/proxy/difyAi.js

@@ -17,7 +17,7 @@ function reset() {
     }
 }
 exports.reset = reset;
-async function getDifyReply(content, uid) {
+async function getDifyReply({ content, id, inputs }) {
     const config = await (0, configDb_js_1.allConfig)();
     if (!config.dify_token) {
         console.log('请到智能微秘书平台配置difyAi apikey参数方可使用');
@@ -42,10 +42,10 @@ async function getDifyReply(content, uid) {
     if (!difyAi) {
         difyAi = new dify_js_1.default(chatConfig);
     }
-    return await difyAi.getReply(content, uid);
+    return await difyAi.getReply({ content, inputs }, id);
 }
 exports.getDifyReply = getDifyReply;
-async function getDifySimpleReply({ content, uid, config }) {
+async function getDifySimpleReply({ content, id, inputs, config }) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置聊天总结API Token参数方可使用');
         return [{ type: 1, content: '请到平台配置API Token参数方可使用' }];
@@ -59,7 +59,7 @@ async function getDifySimpleReply({ content, uid, config }) {
         systemMessage: '',
         isAiAgent: true,
     };
-    return await new dify_js_1.default(chatConfig).getReply(content, uid);
+    return await new dify_js_1.default(chatConfig).getReply({ content, inputs }, id);
 }
 exports.getDifySimpleReply = getDifySimpleReply;
 //# sourceMappingURL=difyAi.js.map

package/dist/cjs/src/proxy/openAi.d.ts

@@ -2,12 +2,13 @@
  * 重置实例
  */
 export function reset(): void;
-export function getGptOfficialReply(content: any, uid: any, isFastGPT: any): Promise<any>;
-export function getSimpleGptReply({ content, uid, config, isFastGPT }: {
+export function getGptOfficialReply(content: any, uid: any, isFastGPT: any, variables: any): Promise<any>;
+export function getSimpleGptReply({ content, uid, config, isFastGPT, variables }: {
     content: any;
     uid: any;
     config: any;
     isFastGPT: any;
+    variables: any;
 }): Promise<{
     type: number;
     content: any;

package/dist/cjs/src/proxy/openAi.js

@@ -17,7 +17,7 @@ function reset() {
     }
 }
 exports.reset = reset;
-async function getGptOfficialReply(content, uid, isFastGPT) {
+async function getGptOfficialReply(content, uid, isFastGPT, variables) {
     const config = await (0, configDb_js_1.allConfig)();
     if (!config.gpttoken) {
         console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
@@ -46,10 +46,10 @@ async function getGptOfficialReply(content, uid, isFastGPT) {
     if (!chatGPT) {
         chatGPT = new officialOpenAi_js_1.default(chatConfig);
     }
-    return await chatGPT.getReply(content, uid, '', '', isFastGPT);
+    return await chatGPT.getReply(content, uid, '', '', isFastGPT, variables);
 }
 exports.getGptOfficialReply = getGptOfficialReply;
-async function getSimpleGptReply({ content, uid, config, isFastGPT }) {
+async function getSimpleGptReply({ content, uid, config, isFastGPT, variables }) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置聊天总结的API Token参数方可使用');
         return [{ type: 1, content: '请到平台配置聊天总结的API Token参数方可使用' }];
@@ -64,7 +64,7 @@ async function getSimpleGptReply({ content, uid, config, isFastGPT }) {
         model: config.model,
         systemMessage: config.prompt, // 预设promotion
     };
-    return await new officialOpenAi_js_1.default(chatConfig).getReply(content, uid, '', '', isFastGPT);
+    return await new officialOpenAi_js_1.default(chatConfig).getReply(content, uid, '', '', isFastGPT, variables);
 }
 exports.getSimpleGptReply = getSimpleGptReply;
 //# sourceMappingURL=openAi.js.map

package/dist/cjs/src/service/event-dispatch-service.d.ts

@@ -21,10 +21,14 @@ export function dispatchEventContent(that: any, eName: string, msg: string, name
  * @param {*} name 发消息人
  * @param {*} id 发消息人id
  */
-export function dispatchAiBot(bot: any, msg: any, name: any, id: any): Promise<any>;
-export function dispatchSummerBot({ content, uid, config }: {
+export function dispatchAiBot({ bot, msg, name, id, uid, uname, roomId, roomName }: any): Promise<any>;
+export function dispatchSummerBot({ content, id, uid, uname, roomId, roomName, config }: {
     content: any;
+    id: any;
     uid: any;
+    uname: any;
+    roomId: any;
+    roomName: any;
     config: any;
 }): Promise<"" | {
     type: number;

package/dist/cjs/src/service/event-dispatch-service.js

@@ -147,13 +147,13 @@ exports.dispatchEventContent = dispatchEventContent;
  * @param {*} name 发消息人
  * @param {*} id 发消息人id
  */
-async function dispatchAiBot(bot, msg, name, id) {
+async function dispatchAiBot({ bot, msg, name, id, uid, uname, roomId, roomName }) {
     try {
         let res, replys;
         switch (bot) {
             case 0:
                 // 天行机器人
-                res = await api.getResByTX(msg, id);
+                res = await (0, api_js_1.getResByTX)(msg, id);
                 replys = [{ type: 1, content: res }];
                 break;
             case 5:
@@ -173,12 +173,12 @@ async function dispatchAiBot(bot, msg, name, id) {
                 break;
             case 8:
                 // dify ai
-                res = await (0, difyAi_js_1.getDifyReply)(msg, id);
+                res = await (0, difyAi_js_1.getDifyReply)({ content: msg, id, inputs: { uid, uname, roomId, roomName } });
                 replys = res;
                 break;
             case 9:
                 // fast gpt
-                res = await (0, openAi_js_1.getGptOfficialReply)(msg, id, true);
+                res = await (0, openAi_js_1.getGptOfficialReply)(msg, id, true, { uid, uname, roomId, roomName });
                 replys = res;
                 break;
             case 11:
@@ -198,28 +198,28 @@ async function dispatchAiBot(bot, msg, name, id) {
     }
 }
 exports.dispatchAiBot = dispatchAiBot;
-async function dispatchSummerBot({ content, uid, config }) {
+async function dispatchSummerBot({ content, id, uid, uname, roomId, roomName, config }) {
     try {
         let res, replys;
         switch (config.botType) {
             case 6:
                 // ChatGPT-api
-                res = await (0, openAi_js_1.getSimpleGptReply)({ content, uid, config, isFastGPT: false });
+                res = await (0, openAi_js_1.getSimpleGptReply)({ content, uid: id, config, isFastGPT: false });
                 replys = res;
                 break;
             case 8:
                 // dify ai
-                res = await (0, difyAi_js_1.getDifySimpleReply)({ content, uid, config });
+                res = await (0, difyAi_js_1.getDifySimpleReply)({ content, id, inputs: { uid, uname, roomId, roomName }, config });
                 replys = res;
                 break;
             case 9:
                 // fast gpt
-                res = await (0, openAi_js_1.getSimpleGptReply)({ content, uid, config, isFastGPT: true });
+                res = await (0, openAi_js_1.getSimpleGptReply)({ content, uid: id, config, isFastGPT: true, variables: { uid, uname, roomId, roomName } });
                 replys = res;
                 break;
             case 11:
                 // coze
-                res = await (0, cozeAi_js_1.getCozeSimpleReply)({ content, uid, config, isFastGPT: true });
+                res = await (0, cozeAi_js_1.getCozeSimpleReply)({ content, uid: id, config, isFastGPT: true });
                 replys = res;
                 break;
             default:

package/dist/cjs/src/service/msg-filters.d.ts

@@ -126,12 +126,13 @@ export function keywordsMsg({ msg, config, room, isMention }: {
     room: any;
     isMention: any;
 }): Promise<any>;
-export function robotMsg({ msg, name, id, config, isMention, room, roomId, isFriend }: {
+export function robotMsg({ msg, name, id, config, isMention, roomName, room, roomId, isFriend }: {
     msg: any;
     name: any;
     id: any;
     config: any;
     isMention: any;
+    roomName: any;
     room: any;
     roomId: any;
     isFriend: any;