From 9f95144c25d101312ba3d7751c50c18909a11ebb Mon Sep 17 00:00:00 2001 From: linghaihui <75124771@qq.com> Date: Sat, 25 Mar 2023 14:15:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bingchat/app.js | 48 +++++---- bingchat/components/chatbox/index.js | 9 +- bingchat/config.js | 25 ++++- bingchat/pages/index/index.js | 149 ++++++++++----------------- 4 files changed, 108 insertions(+), 123 deletions(-) diff --git a/bingchat/app.js b/bingchat/app.js index 25a4ca3..626c5ca 100644 --- a/bingchat/app.js +++ b/bingchat/app.js @@ -1,42 +1,46 @@ -import { SERVER_HOST } from "config"; +import { + doRequest +} from "./config"; App({ - onShow: function () { - }, + onShow: function () {}, onLaunch: function () { - this.getSid(); + this.getSid(sid => { + console.log(sid) + }); }, globalData: {}, - getSid: function () { + getSid: function (callback) { var that = this; if (!this.globalData.sid) { var sid = wx.getStorageSync("sid1"); if (!sid) { wx.login({ success: (res) => { - wx.request({ - url: SERVER_HOST + "/bing/openid", - data: { - code: res.code, - }, - success: (res) => { - if (res.statusCode != 200) { - wx.showToast({ - title: "接口异常", - }); - return; - } - that.globalData.sid = res.data.data.openid; - wx.setStorageSync("sid1", that.globalData.sid); - }, - }); + doRequest("/openid", "GET", { + code: res.code + }).then(data => { + if (data.statusCode != 200) { + console.log(data) + callback("") + return; + } + that.globalData.sid = data.data.data.openid; + wx.setStorageSync("sid1", that.globalData.sid); + callback(data.data.data.openid) + }).catch(err => { + console.log(err) + callback("") + }) }, }); } else { this.globalData.sid = sid; wx.setStorageSync("sid1", this.globalData.sid); + callback(sid) } + } else { + callback(this.globalData.sid) } - return this.globalData.sid ? this.globalData.sid : ""; }, }); diff --git a/bingchat/components/chatbox/index.js b/bingchat/components/chatbox/index.js index d314c6d..0e147a4 100644 --- a/bingchat/components/chatbox/index.js +++ b/bingchat/components/chatbox/index.js @@ -25,8 +25,7 @@ Component({ }); }, detached() { - try { - } catch (error) {} + try {} catch (error) {} }, }, data: { @@ -83,11 +82,9 @@ Component({ suggestSubmit: function (e) { var suggest = e.currentTarget.dataset.suggest; this.triggerEvent( - "suggestSubmit", - { + "suggestSubmit", { suggest, - }, - {} + }, {} ); }, }, diff --git a/bingchat/config.js b/bingchat/config.js index 0b63ddc..fa73d96 100644 --- a/bingchat/config.js +++ b/bingchat/config.js @@ -1 +1,24 @@ -export const SERVER_HOST = "https://example.com"; +const SERVER_HOST = "https://example.com"; + +function doRequest(url, method = "GET", data = {}) { + return new Promise((resolve, reject) => { + data['t'] = new Date().getTime() + wx.request({ + url: SERVER_HOST + url, + method, + data, + dataType: "json", + enableHttp2: true, + success(res) { + resolve(res) + }, + fail(err) { + reject(err) + }, + }) + }) +} +export { + doRequest, + SERVER_HOST +} diff --git a/bingchat/pages/index/index.js b/bingchat/pages/index/index.js index 1ea60d3..36cd2b4 100644 --- a/bingchat/pages/index/index.js +++ b/bingchat/pages/index/index.js @@ -1,11 +1,11 @@ import { - SERVER_HOST + doRequest } from "../../config"; const systemInfo = wx.getSystemInfoSync() function inputPop() { - return systemInfo.platform == "ios" || systemInfo.platform == "android" + return systemInfo.platform == "ios" || systemInfo.platform == "android" } const initHeight = inputPop() ? 20 : 2 @@ -49,8 +49,8 @@ Page({ data: { InputBottom: initHeight, content: "", - systemInfo: systemInfo, - textareaFocus: false, + systemInfo: systemInfo, + textareaFocus: false, }, InputFocus(e) { if (inputPop()) { @@ -67,15 +67,16 @@ Page({ processContent(content) { return content.replace(/\\n/g, "\n"); }, - resetConversation: function () { - wx.request({ - url: SERVER_HOST + "/bing/reset", - data: { - t: new Date().getTime(), - sid: app.getSid(), - }, - enableHttp2: true, - }); + resetConversation: function (callback) { + app.getSid(sid => { + doRequest("/reset", "GET", { + sid: sid, + }).then(res => { + if (callback) { + callback(res) + } + }) + }) }, onShow() { const cht = app.globalData.cht; @@ -85,61 +86,27 @@ Page({ }); } }, - onLoad() { - }, + onLoad() {}, submitContent: function (content) { var that = this; const cht = app.globalData.cht; - content = this.processContent(content); - cht.data.chatList.push({ - type: "man", - avatarUrl: personAvatar, - dt: getNow(), - originContent: content, - }); - cht.setData({ - chatList: cht.data.chatList, - }); + that.pushStorageMessage(cht, content, "man", [], false) that.setData({ content: "", }); if (content == "重新对话！") { - this.resetConversation(); - cht.data.chatList.push({ - type: "rob", - avatarUrl: robAvatar, - dt: getNow(), - originContent: "现在我们可以开始新的对话😊", - suggests: [], + that.resetConversation(() => { + that.pushStorageMessage(cht, "现在我们可以开始新的对话😊", "rob", [], false) }); - cht.setData({ - chatList: cht.data.chatList, - }); - that.scrollTo(cht); return; } else { - cht.data.chatList.push({ - type: "rob", - avatarUrl: robAvatar, - dt: getNow(), - originContent: "搜索中🔍...", - suggests: [], - blink: true, - }); - cht.setData({ - chatList: cht.data.chatList, - }); + that.pushStorageMessage(cht, "搜索中🔍...", "rob", [], true) } - wx.request({ - url: SERVER_HOST + "/bing/chat", - method: "POST", - data: { + app.getSid(sid => { + doRequest("/chat", "POST", { q: content, - t: new Date().getTime(), - sid: app.getSid(), - }, - enableHttp2: true, - success(res) { + sid: sid, + }).then(res => { try { var robContent = ""; var suggests = []; @@ -175,43 +142,37 @@ Page({ } } } - cht.data.chatList.pop(); - cht.data.chatList.push({ - type: "rob", - avatarUrl: robAvatar, - dt: getNow(), - originContent: that.processContent(robContent), - suggests: suggests, - }); - cht.setData({ - chatList: cht.data.chatList, - }); - wx.setStorage({ - key: "chatList", - data: cht.data.chatList, - }); + that.pushStorageMessage(cht, robContent, "rob", suggests, false, true) } catch (error) { - console.log(error); wx.showToast({ title: "fatal error", - }); + }); + that.pushStorageMessage(cht, "发生致命错误😱", "rob", [], false, true) } - }, - fail(e) { - console.log(e); - cht.data.chatList.pop(); - cht.data.chatList.push({ - type: "rob", - avatarUrl: robAvatar, - dt: getNow(), - originContent: e.errMsg, - suggests: [], - }); - }, - }); - that.scrollTo(cht); + }).catch(e => { + that.pushStorageMessage(cht, e.errMsg, "rob", [], false, true) + }) + }) }, - scrollTo: function (cht) { + pushStorageMessage: function (cht, content, role, suggests, blink, pop) { + if (pop) { + cht.data.chatList.pop(); + } + cht.data.chatList.push({ + type: role, + avatarUrl: role == "rob" ? robAvatar : personAvatar, + dt: getNow(), + originContent: this.processContent(content), + suggests: suggests, + blink: blink, + }); + cht.setData({ + chatList: cht.data.chatList, + }); + wx.setStorage({ + key: "chatList", + data: cht.data.chatList, + }); setTimeout(() => { cht.setData({ scrollId: "item" + (cht.data.chatList.length - 1), @@ -234,10 +195,10 @@ Page({ onSuggestSubmit: function (e) { var suggest = e.detail.suggest; this.submitContent(suggest); - }, - focus: function(e){ - this.setData({ - textareaFocus: true - }) - } + }, + focus: function (e) { + this.setData({ + textareaFocus: true + }) + } });