wechaty-web-panel 1.6.21 → 1.6.22

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 更新日志
 
+### V1.6.22(2023-10-14)
+1、添加fastGPT单独支持，可以记录日志到fastGPT平台
+2、添加群公告发布功能，除web协议以外支持
+
 ### V1.6.20(2023-09-19)
 1、修复h5链接发送图片无效
 

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

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

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

@@ -112,10 +112,10 @@ class OfficialOpenAi {
     reset() {
         this.chatGPT = null;
     }
-    async getReply(content, uid, adminId = '', systemMessage = '') {
+    async getReply(content, uid, adminId = '', systemMessage = '', isFastGPT) {
         try {
             if (!this.chatGPT) {
-                console.log('看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
+                console.log(isFastGPT ? '看到此消息说明启用了fastgpt' : '看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
                 await this.init();
             }
             if (this.config.filter) {
@@ -132,7 +132,14 @@ class OfficialOpenAi {
                     return [{ type: 1, content: '上下文已重置' }];
                 }
             }
-            const { conversationId, text, id } = systemMessage ? await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 }) : await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 });
+            const sendParams = { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 };
+            if (systemMessage) {
+                sendParams.systemMessage = systemMessage;
+            }
+            if (isFastGPT) {
+                sendParams.chatId = uid;
+            }
+            const { conversationId, text, id } = await this.chatGPT.sendMessage(content, sendParams);
             if (this.config.filter) {
                 const censor = await this.contentCensor.checkText(text);
                 if (!censor) {

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

@@ -149,7 +149,7 @@ Current date: ${currentDate}`;
         }
     }
     async sendMessage(text, opts = {}) {
-        const { parentMessageId, messageId = (0, uuid_1.v4)(), timeoutMs, onProgress, stream = !!onProgress, completionParams, conversationId } = opts;
+        const { parentMessageId, messageId = (0, uuid_1.v4)(), timeoutMs, onProgress, stream = !!onProgress, completionParams, conversationId, chatId } = opts;
         let { abortSignal } = opts;
         let abortController = null;
         if (timeoutMs && !abortSignal) {
@@ -185,6 +185,9 @@ Current date: ${currentDate}`;
                 messages,
                 stream
             };
+            if (chatId) {
+                body.chatId = chatId;
+            }
             if (this._apiOrg) {
                 headers["OpenAI-Organization"] = this._apiOrg;
             }

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

@@ -8,32 +8,19 @@ const axios_1 = __importDefault(require("axios"));
 exports.BASE_URL = "https://api.dify.ai/v1";
 exports.routes = {
     application: {
-        method: "GET",
-        url: () => `/parameters`
-    },
-    feedback: {
-        method: "POST",
-        url: (messageId) => `/messages/${messageId}/feedbacks`
-    },
-    createCompletionMessage: {
-        method: "POST",
-        url: () => `/completion-messages`
-    },
-    createChatMessage: {
-        method: "POST",
-        url: () => `/chat-messages`
-    },
-    getConversationMessages: {
-        method: "GET",
-        url: () => "/messages"
-    },
-    getConversations: {
-        method: "GET",
-        url: () => "/conversations"
-    },
-    renameConversation: {
-        method: "PATCH",
-        url: (conversationId) => `/conversations/${conversationId}`
+        method: "GET", url: () => `/parameters`
+    }, feedback: {
+        method: "POST", url: (messageId) => `/messages/${messageId}/feedbacks`
+    }, createCompletionMessage: {
+        method: "POST", url: () => `/completion-messages`
+    }, createChatMessage: {
+        method: "POST", url: () => `/chat-messages`
+    }, getConversationMessages: {
+        method: "GET", url: () => "/messages"
+    }, getConversations: {
+        method: "GET", url: () => "/conversations"
+    }, renameConversation: {
+        method: "PATCH", url: (conversationId) => `/conversations/${conversationId}`
     }
 };
 class DifyClient {
@@ -48,8 +35,7 @@ class DifyClient {
     }
     async sendRequest({ method, endpoint, data, params, stream = false, timeoutMs = 60 * 1000 }) {
         const headers = {
-            "Authorization": `Bearer ${this.apiKey}`,
-            "Content-Type": "application/json"
+            "Authorization": `Bearer ${this.apiKey}`, "Content-Type": "application/json"
         };
         const url = `${this.baseUrl}${endpoint}`;
         let response;
@@ -69,17 +55,14 @@ class DifyClient {
         }
         else {
             response = await fetch(url, {
-                headers,
-                method,
-                body: JSON.stringify(data)
+                headers, method, body: JSON.stringify(data)
             });
         }
         return response;
     }
     messageFeedback(messageId, rating, user) {
         const data = {
-            rating,
-            user
+            rating, user
         };
         return this.sendRequest({ method: exports.routes.feedback.method, endpoint: exports.routes.feedback.url(messageId), data });
     }
@@ -92,10 +75,7 @@ exports.DifyClient = DifyClient;
 class CompletionClient extends DifyClient {
     createCompletionMessage(inputs, query, user, responseMode) {
         const data = {
-            inputs,
-            query,
-            responseMode,
-            user
+            inputs, query, responseMode, user
         };
         return this.sendRequest({
             method: exports.routes.createCompletionMessage.method,
@@ -109,17 +89,14 @@ exports.CompletionClient = CompletionClient;
 class ChatClient extends DifyClient {
     async sendMessage(query, { systemMessage, user, responseMode = "json", conversationId = null, timeoutMs = 60 * 1000 }) {
         const data = {
-            inputs: {},
-            query,
-            user,
-            responseMode
+            inputs: {}, query, user, responseMode
         };
         if (systemMessage || this.systemMessage) {
-            data.inputs['systemMessage'] = systemMessage || this.systemMessage;
+            data.inputs["systemMessage"] = systemMessage || this.systemMessage;
         }
         if (conversationId)
             data.conversation_id = conversationId;
-        console.log('request data', data);
+        console.log("request data", data);
         const res = await this.sendRequest({
             method: exports.routes.createChatMessage.method,
             endpoint: exports.routes.createChatMessage.url(),
@@ -135,9 +112,7 @@ class ChatClient extends DifyClient {
         }
         const response = res.data;
         return {
-            text: response.answer,
-            conversationId: response.conversation_id,
-            id: response.id
+            text: response.answer, conversationId: response.conversation_id, id: response.id
         };
     }
     getConversationMessages(user, conversationId = "", firstId = null, limit = null) {
@@ -149,21 +124,19 @@ class ChatClient extends DifyClient {
         if (limit)
             params.limit = limit;
         return this.sendRequest({
-            method: exports.routes.getConversationMessages.method,
-            endpoint: exports.routes.getConversationMessages.url(),
-            params
+            method: exports.routes.getConversationMessages.method, endpoint: exports.routes.getConversationMessages.url(), params
         });
     }
     getConversations(user, firstId = null, limit = null, pinned = null) {
         const params = { user, first_id: firstId, limit, pinned };
-        return this.sendRequest({ method: exports.routes.getConversations.method, endpoint: exports.routes.getConversations.url(), params });
+        return this.sendRequest({
+            method: exports.routes.getConversations.method, endpoint: exports.routes.getConversations.url(), params
+        });
     }
     renameConversation(conversationId, name, user) {
         const data = { name, user };
         return this.sendRequest({
-            method: exports.routes.renameConversation.method,
-            endpoint: exports.routes.renameConversation.url(conversationId),
-            data
+            method: exports.routes.renameConversation.method, endpoint: exports.routes.renameConversation.url(conversationId), data
         });
     }
 }

package/dist/cjs/src/common/index.d.ts

@@ -91,4 +91,11 @@ export function getRoomEveryDayContent(date: any, city: any, endWord: any): Prom
  * @return {string}
  */
 export function getCountDownContent(date: any, prefix: any, suffix: any, endWord: any): string;
+/**
+ * 发送群公告
+ * @param roomIds
+ * @param content
+ * @return {Promise<void>}
+ */
+export function sendRoomNotice(room: any, content: any): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/common/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCountDownContent = exports.getRoomEveryDayContent = exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getNewsContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = void 0;
+exports.sendRoomNotice = exports.getCountDownContent = exports.getRoomEveryDayContent = exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getNewsContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = void 0;
 const api_js_1 = require("../proxy/api.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const userDb_js_1 = require("../db/userDb.js");
@@ -343,6 +343,20 @@ async function addRoom(that, contact, roomName, replys) {
     }
 }
 exports.addRoom = addRoom;
+/**
+ * 发送群公告
+ * @param roomIds
+ * @param content
+ * @return {Promise<void>}
+ */
+async function sendRoomNotice(room, content) {
+    const config = await (0, configDb_js_1.allConfig)();
+    const { role } = config.userInfo;
+    if (role === 'vip' && room && content) {
+        await room.announce(content);
+    }
+}
+exports.sendRoomNotice = sendRoomNotice;
 /**
  * 重新同步好友和群组
  * @param that

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.21",
+    "version": "1.6.22",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

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

@@ -1,6 +1,6 @@
 export function reset(adminId: any): void;
 export function resetAll(): void;
-export function getChatGPTReply(content: any, uid: any, adminId: any, config?: {
+export function getChatGPTReply(content: any, uid: any, adminId: any, config: {
     token: string;
     debug: boolean;
     proxyPass: string;
@@ -10,5 +10,5 @@ export function getChatGPTReply(content: any, uid: any, adminId: any, config?: {
     model: string;
     systemMessage: string;
     keywordSystemMessages: never[];
-}): Promise<any>;
+} | undefined, isFastGPT: any): Promise<any>;
 //# sourceMappingURL=chatgpt.d.ts.map

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: [] }) {
+async function getChatGPTReply(content, 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);
+    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage, isFastGPT);
 }
 exports.getChatGPTReply = getChatGPTReply;
 //# sourceMappingURL=chatgpt.js.map

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

@@ -22,7 +22,7 @@ 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);
+                res = await (0, chatgpt_js_1.getChatGPTReply)(content, uid, adminId, config, false);
                 replys = res;
                 break;
             case 7:
@@ -37,6 +37,11 @@ async function dispatchBot({ botType, content, uid, adminId, config }) {
                 res = await (0, dify_js_1.getDifyAiReply)(content, uid, adminId, config);
                 replys = res;
                 break;
+            case 9:
+                // fastGPT api
+                res = await (0, chatgpt_js_1.getChatGPTReply)(content, uid, adminId, config, true);
+                replys = res;
+                break;
             default:
                 replys = [];
                 break;

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

@@ -132,6 +132,20 @@ async function initMqtt(that) {
                         await (0, aibotk_js_1.getRssConfig)();
                         void (0, rss_js_1.initRssTask)(that);
                     }
+                    else if (topic === `aibotk/${userId}/roomnotice`) {
+                        console.log('发送群公告请求');
+                        const rooms = content.rooms;
+                        for (let item of rooms) {
+                            const room = await that.Room.find({ id: item.wxid, topic: item.name });
+                            if (room) {
+                                await index_js_1.sendRoomNotice.call(that, room, content.content);
+                                await (0, index_js_3.delay)(1000);
+                            }
+                            else {
+                                console.log(`没有找到群:【${item.name}】，无法发送群公告`);
+                            }
+                        }
+                    }
                 });
             }
         }

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

@@ -2,5 +2,5 @@
  * 重置实例
  */
 export function reset(): void;
-export function getGptOfficialReply(content: any, uid: any): Promise<any>;
+export function getGptOfficialReply(content: any, uid: any, isFastGPT: any): Promise<any>;
 //# sourceMappingURL=openAi.d.ts.map

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

@@ -17,7 +17,7 @@ function reset() {
     }
 }
 exports.reset = reset;
-async function getGptOfficialReply(content, uid) {
+async function getGptOfficialReply(content, uid, isFastGPT) {
     const config = await (0, configDb_js_1.allConfig)();
     if (!config.gpttoken) {
         console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
@@ -43,7 +43,7 @@ async function getGptOfficialReply(content, uid) {
     if (!chatGPT) {
         chatGPT = new officialOpenAi_js_1.default(chatConfig);
     }
-    return await chatGPT.getReply(content, uid);
+    return await chatGPT.getReply(content, uid, '', '', isFastGPT);
 }
 exports.getGptOfficialReply = getGptOfficialReply;
 //# sourceMappingURL=openAi.js.map

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

@@ -164,8 +164,8 @@ async function dispatchAiBot(bot, msg, name, id) {
                 replys = res;
                 break;
             case 6:
-                // ChatGPT3
-                res = await (0, openAi_js_1.getGptOfficialReply)(msg, id);
+                // ChatGPT-api
+                res = await (0, openAi_js_1.getGptOfficialReply)(msg, id, false);
                 replys = res;
                 break;
             case 7:
@@ -178,6 +178,11 @@ async function dispatchAiBot(bot, msg, name, id) {
                 res = await (0, difyAi_js_1.getDifyReply)(msg, id);
                 replys = res;
                 break;
+            case 9:
+                // fast gpt
+                res = await (0, openAi_js_1.getGptOfficialReply)(msg, id, true);
+                replys = res;
+                break;
             default:
                 replys = [{ type: 1, content: '' }];
                 break;

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

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

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

@@ -107,10 +107,10 @@ class OfficialOpenAi {
     reset() {
         this.chatGPT = null;
     }
-    async getReply(content, uid, adminId = '', systemMessage = '') {
+    async getReply(content, uid, adminId = '', systemMessage = '', isFastGPT) {
         try {
             if (!this.chatGPT) {
-                console.log('看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
+                console.log(isFastGPT ? '看到此消息说明启用了fastgpt' : '看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
                 await this.init();
             }
             if (this.config.filter) {
@@ -127,7 +127,14 @@ class OfficialOpenAi {
                     return [{ type: 1, content: '上下文已重置' }];
                 }
             }
-            const { conversationId, text, id } = systemMessage ? await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 }) : await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 });
+            const sendParams = { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 };
+            if (systemMessage) {
+                sendParams.systemMessage = systemMessage;
+            }
+            if (isFastGPT) {
+                sendParams.chatId = uid;
+            }
+            const { conversationId, text, id } = await this.chatGPT.sendMessage(content, sendParams);
             if (this.config.filter) {
                 const censor = await this.contentCensor.checkText(text);
                 if (!censor) {

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

@@ -141,7 +141,7 @@ Current date: ${currentDate}`;
         }
     }
     async sendMessage(text, opts = {}) {
-        const { parentMessageId, messageId = uuidv4(), timeoutMs, onProgress, stream = !!onProgress, completionParams, conversationId } = opts;
+        const { parentMessageId, messageId = uuidv4(), timeoutMs, onProgress, stream = !!onProgress, completionParams, conversationId, chatId } = opts;
         let { abortSignal } = opts;
         let abortController = null;
         if (timeoutMs && !abortSignal) {
@@ -177,6 +177,9 @@ Current date: ${currentDate}`;
                 messages,
                 stream
             };
+            if (chatId) {
+                body.chatId = chatId;
+            }
             if (this._apiOrg) {
                 headers["OpenAI-Organization"] = this._apiOrg;
             }

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

@@ -2,32 +2,19 @@ import axios from "axios";
 export const BASE_URL = "https://api.dify.ai/v1";
 export const routes = {
     application: {
-        method: "GET",
-        url: () => `/parameters`
-    },
-    feedback: {
-        method: "POST",
-        url: (messageId) => `/messages/${messageId}/feedbacks`
-    },
-    createCompletionMessage: {
-        method: "POST",
-        url: () => `/completion-messages`
-    },
-    createChatMessage: {
-        method: "POST",
-        url: () => `/chat-messages`
-    },
-    getConversationMessages: {
-        method: "GET",
-        url: () => "/messages"
-    },
-    getConversations: {
-        method: "GET",
-        url: () => "/conversations"
-    },
-    renameConversation: {
-        method: "PATCH",
-        url: (conversationId) => `/conversations/${conversationId}`
+        method: "GET", url: () => `/parameters`
+    }, feedback: {
+        method: "POST", url: (messageId) => `/messages/${messageId}/feedbacks`
+    }, createCompletionMessage: {
+        method: "POST", url: () => `/completion-messages`
+    }, createChatMessage: {
+        method: "POST", url: () => `/chat-messages`
+    }, getConversationMessages: {
+        method: "GET", url: () => "/messages"
+    }, getConversations: {
+        method: "GET", url: () => "/conversations"
+    }, renameConversation: {
+        method: "PATCH", url: (conversationId) => `/conversations/${conversationId}`
     }
 };
 export class DifyClient {
@@ -42,8 +29,7 @@ export class DifyClient {
     }
     async sendRequest({ method, endpoint, data, params, stream = false, timeoutMs = 60 * 1000 }) {
         const headers = {
-            "Authorization": `Bearer ${this.apiKey}`,
-            "Content-Type": "application/json"
+            "Authorization": `Bearer ${this.apiKey}`, "Content-Type": "application/json"
         };
         const url = `${this.baseUrl}${endpoint}`;
         let response;
@@ -63,17 +49,14 @@ export class DifyClient {
         }
         else {
             response = await fetch(url, {
-                headers,
-                method,
-                body: JSON.stringify(data)
+                headers, method, body: JSON.stringify(data)
             });
         }
         return response;
     }
     messageFeedback(messageId, rating, user) {
         const data = {
-            rating,
-            user
+            rating, user
         };
         return this.sendRequest({ method: routes.feedback.method, endpoint: routes.feedback.url(messageId), data });
     }
@@ -85,10 +68,7 @@ export class DifyClient {
 export class CompletionClient extends DifyClient {
     createCompletionMessage(inputs, query, user, responseMode) {
         const data = {
-            inputs,
-            query,
-            responseMode,
-            user
+            inputs, query, responseMode, user
         };
         return this.sendRequest({
             method: routes.createCompletionMessage.method,
@@ -101,17 +81,14 @@ export class CompletionClient extends DifyClient {
 export class ChatClient extends DifyClient {
     async sendMessage(query, { systemMessage, user, responseMode = "json", conversationId = null, timeoutMs = 60 * 1000 }) {
         const data = {
-            inputs: {},
-            query,
-            user,
-            responseMode
+            inputs: {}, query, user, responseMode
         };
         if (systemMessage || this.systemMessage) {
-            data.inputs['systemMessage'] = systemMessage || this.systemMessage;
+            data.inputs["systemMessage"] = systemMessage || this.systemMessage;
         }
         if (conversationId)
             data.conversation_id = conversationId;
-        console.log('request data', data);
+        console.log("request data", data);
         const res = await this.sendRequest({
             method: routes.createChatMessage.method,
             endpoint: routes.createChatMessage.url(),
@@ -127,9 +104,7 @@ export class ChatClient extends DifyClient {
         }
         const response = res.data;
         return {
-            text: response.answer,
-            conversationId: response.conversation_id,
-            id: response.id
+            text: response.answer, conversationId: response.conversation_id, id: response.id
         };
     }
     getConversationMessages(user, conversationId = "", firstId = null, limit = null) {
@@ -141,21 +116,19 @@ export class ChatClient extends DifyClient {
         if (limit)
             params.limit = limit;
         return this.sendRequest({
-            method: routes.getConversationMessages.method,
-            endpoint: routes.getConversationMessages.url(),
-            params
+            method: routes.getConversationMessages.method, endpoint: routes.getConversationMessages.url(), params
         });
     }
     getConversations(user, firstId = null, limit = null, pinned = null) {
         const params = { user, first_id: firstId, limit, pinned };
-        return this.sendRequest({ method: routes.getConversations.method, endpoint: routes.getConversations.url(), params });
+        return this.sendRequest({
+            method: routes.getConversations.method, endpoint: routes.getConversations.url(), params
+        });
     }
     renameConversation(conversationId, name, user) {
         const data = { name, user };
         return this.sendRequest({
-            method: routes.renameConversation.method,
-            endpoint: routes.renameConversation.url(conversationId),
-            data
+            method: routes.renameConversation.method, endpoint: routes.renameConversation.url(conversationId), data
         });
     }
 }

package/dist/esm/src/common/index.d.ts

@@ -91,4 +91,11 @@ export function getRoomEveryDayContent(date: any, city: any, endWord: any): Prom
  * @return {string}
  */
 export function getCountDownContent(date: any, prefix: any, suffix: any, endWord: any): string;
+/**
+ * 发送群公告
+ * @param roomIds
+ * @param content
+ * @return {Promise<void>}
+ */
+export function sendRoomNotice(room: any, content: any): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/src/common/index.js

@@ -330,6 +330,19 @@ async function addRoom(that, contact, roomName, replys) {
         console.log(`不存在此群：${roomName}`);
     }
 }
+/**
+ * 发送群公告
+ * @param roomIds
+ * @param content
+ * @return {Promise<void>}
+ */
+async function sendRoomNotice(room, content) {
+    const config = await allConfig();
+    const { role } = config.userInfo;
+    if (role === 'vip' && room && content) {
+        await room.announce(content);
+    }
+}
 /**
  * 重新同步好友和群组
  * @param that
@@ -380,6 +393,7 @@ export { addRoomWelcomeSay };
 export { updateContactAndRoom };
 export { getRoomEveryDayContent };
 export { getCountDownContent };
+export { sendRoomNotice };
 export default {
     updateRoomOnly,
     updateContactOnly,

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.21",
+    "version": "1.6.22",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

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

@@ -1,6 +1,6 @@
 export function reset(adminId: any): void;
 export function resetAll(): void;
-export function getChatGPTReply(content: any, uid: any, adminId: any, config?: {
+export function getChatGPTReply(content: any, uid: any, adminId: any, config: {
     token: string;
     debug: boolean;
     proxyPass: string;
@@ -10,5 +10,5 @@ export function getChatGPTReply(content: any, uid: any, adminId: any, config?: {
     model: string;
     systemMessage: string;
     keywordSystemMessages: never[];
-}): Promise<any>;
+} | undefined, isFastGPT: any): Promise<any>;
 //# sourceMappingURL=chatgpt.d.ts.map

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

@@ -15,7 +15,7 @@ export function resetAll() {
     });
     chatGPT = {};
 }
-export async function getChatGPTReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 80, model: "", systemMessage: "", keywordSystemMessages: [] }) {
+export async function getChatGPTReply(content, 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参数方可使用' }];
@@ -33,6 +33,6 @@ export async function getChatGPTReply(content, uid, adminId, config = { token: "
             content = content.replace(finalSystemMsg.keyword, '');
         }
     }
-    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage);
+    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage, isFastGPT);
 }
 //# sourceMappingURL=chatgpt.js.map

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

@@ -16,7 +16,7 @@ export async function dispatchBot({ botType, content, uid, adminId, config }) {
         switch (botType) {
             case 6:
                 // ChatGPT api
-                res = await getChatGPTReply(content, uid, adminId, config);
+                res = await getChatGPTReply(content, uid, adminId, config, false);
                 replys = res;
                 break;
             case 7:
@@ -31,6 +31,11 @@ export async function dispatchBot({ botType, content, uid, adminId, config }) {
                 res = await getDifyAiReply(content, uid, adminId, config);
                 replys = res;
                 break;
+            case 9:
+                // fastGPT api
+                res = await getChatGPTReply(content, uid, adminId, config, true);
+                replys = res;
+                break;
             default:
                 replys = [];
                 break;

package/dist/esm/src/proxy/mqtt.js

@@ -1,10 +1,10 @@
 import * as mqtt from 'mqtt';
 import { allConfig } from '../db/configDb.js';
-import { contactSay, roomSay } from '../common/index.js';
+import { contactSay, roomSay, sendRoomNotice } from '../common/index.js';
 import { getConfig, getMqttConfig, getGptConfig, getRssConfig } from "./aibotk.js";
 import { dispatchEventContent } from '../service/event-dispatch-service.js';
 import { sendTaskMessage } from "../task/index.js";
-import { randomRange } from '../lib/index.js';
+import { delay, randomRange } from "../lib/index.js";
 import { reset } from './bot/chatgpt.js';
 import { reset as webReset } from './bot/chatgpt-web.js';
 import { reset as difyReset } from './bot/dify.js';
@@ -106,6 +106,20 @@ async function initMqtt(that) {
                         await getRssConfig();
                         void initRssTask(that);
                     }
+                    else if (topic === `aibotk/${userId}/roomnotice`) {
+                        console.log('发送群公告请求');
+                        const rooms = content.rooms;
+                        for (let item of rooms) {
+                            const room = await that.Room.find({ id: item.wxid, topic: item.name });
+                            if (room) {
+                                await sendRoomNotice.call(that, room, content.content);
+                                await delay(1000);
+                            }
+                            else {
+                                console.log(`没有找到群:【${item.name}】，无法发送群公告`);
+                            }
+                        }
+                    }
                 });
             }
         }

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

@@ -2,5 +2,5 @@
  * 重置实例
  */
 export function reset(): void;
-export function getGptOfficialReply(content: any, uid: any): Promise<any>;
+export function getGptOfficialReply(content: any, uid: any, isFastGPT: any): Promise<any>;
 //# sourceMappingURL=openAi.d.ts.map

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

@@ -10,7 +10,7 @@ export function reset() {
         chatGPT = null;
     }
 }
-export async function getGptOfficialReply(content, uid) {
+export async function getGptOfficialReply(content, uid, isFastGPT) {
     const config = await allConfig();
     if (!config.gpttoken) {
         console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
@@ -36,6 +36,6 @@ export async function getGptOfficialReply(content, uid) {
     if (!chatGPT) {
         chatGPT = new OfficialOpenAi(chatConfig);
     }
-    return await chatGPT.getReply(content, uid);
+    return await chatGPT.getReply(content, uid, '', '', isFastGPT);
 }
 //# sourceMappingURL=openAi.js.map

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

@@ -157,8 +157,8 @@ async function dispatchAiBot(bot, msg, name, id) {
                 replys = res;
                 break;
             case 6:
-                // ChatGPT3
-                res = await getGptOfficialReply(msg, id);
+                // ChatGPT-api
+                res = await getGptOfficialReply(msg, id, false);
                 replys = res;
                 break;
             case 7:
@@ -171,6 +171,11 @@ async function dispatchAiBot(bot, msg, name, id) {
                 res = await getDifyReply(msg, id);
                 replys = res;
                 break;
+            case 9:
+                // fast gpt
+                res = await getGptOfficialReply(msg, id, true);
+                replys = res;
+                break;
             default:
                 replys = [{ type: 1, content: '' }];
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.6.21",
+  "version": "1.6.22",
   "description": "智能微秘书插件",
   "exports": {
     ".": {