Merge branch 'main'

package-lock.json

@@ -6186,6 +6186,11 @@
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
       "dev": true
     },
+    "github-markdown-css": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/github-markdown-css/-/github-markdown-css-5.2.0.tgz",
+      "integrity": "sha512-hq5RaCInSUZ48bImOZpkppW2/MT44StRgsbsZ8YA4vJFwLKB/Vo3k7R2t+pUGqO+ThG0QDMi96TewV/B3vyItg=="
+    },
     "glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -7825,6 +7830,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "marked": {
+      "version": "4.2.12",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz",
+      "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw=="
+    },
     "matcher": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",

package.json

@@ -12,6 +12,8 @@
   "dependencies": {
     "@quasar/extras": "^1.0.0",
     "core-js": "^3.6.5",
+    "github-markdown-css": "^5.2.0",
+    "marked": "^4.2.12",
     "moment": "^2.29.4",
     "quasar": "^1.0.0"
   },

quasar.conf.js

@@ -81,7 +81,7 @@ module.exports = function (/* ctx */) {
       proxy: {
         // 接口地址代理
         '/': {
-          target: 'http://localhost:8090', // 接口的域名
+          target: 'http://localhost:8092', // 接口的域名
           secure: false, // 如果是https接口，需要配置这个参数
           changeOrigin: true // 如果接口跨域，需要进行这个参数配置
         }

src/api/chatbot/chatbot.js

@@ -1,7 +1,8 @@
 import service from "../../utils/request";
-export const sendQuestion= (param)=>{
+export const sendQuestion= (params)=>{
     return service({//获取新闻列表
-        url:'/bot?question='+param,
+        url:'/bot',
-        method:'get'
+        method:'get',
+        params
     })
 }

src/components/EssentialLink.vue

@@ -1,49 +0,0 @@
-<template>
-  <q-item
-    clickable
-    tag="a"
-    target="_blank"
-    :href="link"
-  >
-    <q-item-section
-      v-if="icon"
-      avatar
-    >
-      <q-icon :name="icon" />
-    </q-item-section>
-
-    <q-item-section>
-      <q-item-label>{{ title }}</q-item-label>
-      <q-item-label caption>
-        {{ caption }}
-      </q-item-label>
-    </q-item-section>
-  </q-item>
-</template>
-
-<script>
-export default {
-  name: 'EssentialLink',
-  props: {
-    title: {
-      type: String,
-      required: true
-    },
-
-    caption: {
-      type: String,
-      default: ''
-    },
-
-    link: {
-      type: String,
-      default: '#'
-    },
-
-    icon: {
-      type: String,
-      default: ''
-    }
-  }
-}
-</script>

src/layouts/MainLayout.vue

@@ -14,15 +14,38 @@
     <q-footer elevated class="no-shadow" ref="footer">
       <q-toolbar
         class="bg-grey-3 text-black no-shadow row justify-center q-pt-md q-pb-sm"
+      >
+        <q-select
+          bg-color="white"
+          rounded
+          outlined
+          v-model="select_model"
+          :options="options"
+          option-value="value"
+          emit-value
+          map-options
+          ><q-tooltip>机器人型号</q-tooltip>
+           <template v-slot:option="{ itemProps, itemEvents, opt }">
+          <q-item
+            v-bind="itemProps"
+            v-on="itemEvents"
+          >
+            <q-item-section>
+              <q-item-label >{{opt.label}}
+                <q-tooltip >{{opt.value}}</q-tooltip>
+              </q-item-label>
+
+            </q-item-section>
+          </q-item>
+        </template>
+          </q-select
         >
         <q-input
           class="WAL__field col-grow q-mr-sm"
           style="max-width: 1000px"
           bg-color="white"
-          bottom-slots
           v-model="search_text"
           label="请输入你的问题"
-          counter
           rounded
           outlined
           @keyup.enter.native="sendMsg"
@@ -36,7 +59,11 @@
               icon="send"
               @click="sendMsg"
             >
-            <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
+              <q-tooltip
+                anchor="top middle"
+                self="bottom middle"
+                :offset="[10, 10]"
+              >
                 发送问题给机器人
               </q-tooltip>
             </q-btn>
@@ -48,7 +75,11 @@
               icon="close"
               @click="clearMsgs"
             >
-            <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
+              <q-tooltip
+                anchor="top middle"
+                self="bottom middle"
+                :offset="[10, 10]"
+              >
                 清空聊天记录
               </q-tooltip>
             </q-btn>
@@ -62,70 +93,100 @@
 <script>
 import { sendQuestion } from "../api/chatbot/chatbot";
 import moment from "moment";
-import {dta} from "../utils/date_utils";
+import { dta } from "../utils/date_utils";
-const bot_message_records="bot_message_records"
+const bot_message_records = "bot_message_records";
 export default {
   name: "MainLayout",
   data() {
     return {
+      select_model: "TEXT_DEVINCI_003",
+      options: [
+        {
+          value: "TEXT_DEVINCI_003",
+          label: "聪明"
+        },
+        {
+          value: "TEXT_CURIE_001",
+          label: "还行"
+        },
+        {
+          value: "TEXT_BABBAGE_001",
+          label: "有点呆"
+        },
+        {
+          value: "TEXT_ADA_001",
+          label: "憨批"
+        }
+      ],
       search_text: "",
       disable: false,
       messages: [
         {
           name: "bot",
-          text: ["请告诉我你的问题"],
+          text: "请告诉我你的问题",
           sent: false,
           datetime: moment().format(dta)
-        },
+        }
-      ],
+      ]
     };
   },
-  created(){
+  created() {
-    let records = localStorage.getItem(bot_message_records)
+    //查询localStorage中是否存在聊天记录 存在则加载到页面
-    if(records&&records!="[]"){
+    let records = localStorage.getItem(bot_message_records);
-      this.messages=JSON.parse(records)
+    if (records && records != "[]") {
-      localStorage.removeItem(bot_message_records)
+      this.messages = JSON.parse(records);
+      localStorage.removeItem(bot_message_records);
     }
-    window.addEventListener("pagehide",()=>{
+    //监听pagehide事件 页面关闭时保存聊天记录到localStorage中
-      localStorage.setItem(bot_message_records,JSON.stringify(this.messages))
+    window.addEventListener("pagehide", () => {
-    })
+      localStorage.setItem(bot_message_records, JSON.stringify(this.messages));
+    });
   },
   methods: {
-    //发送问题
+    //请求机器人接口
     async sendMsg() {
-      if (!this.search_text||this.disable) {
+      if (!this.search_text || this.disable) {
         return;
       }
       this.disable = true;
       //讲自己的问题加入到msg集合中
 
-      let text = this.search_text
+      let text = this.search_text;
-      this.search_text = ""
+      this.search_text = "";
-      this.addMessage("me", true, text,moment().format(dta));
+      this.addMessage("me", true, text, moment().format(dta));
-      await sendQuestion(text).then((res) => {
+      await sendQuestion({question:text,model:this.select_model})
-        //发送问题给机器人
+        .then((res) => {
-        this.addMessage("bot", false, res.data,moment().format(dta));
+          if(res.code==1){
-        //清空输入框
+            this.addMessage("bot", false, res.data, moment().format(dta));
-      }).catch(()=>{
+          }else{
-        this.addMessage("bot", false, "出错了！！！",moment().format(dta));
+            this.$q.notify({
+              color:"red",
+              message:"请求服务器错误",
+              position:"top",
+              timeout: 3000
             })
-      
+            this.addMessage("bot", false,"出错了！！！", moment().format(dta));
+          }
+        })
+        .catch(() => {
+          this.addMessage("bot", false, "出错了！！！", moment().format(dta));
+        });
 
       this.disable = false;
     },
-    addMessage(name, sent, text,datetime) {
+    addMessage(name, sent, text, datetime) {
       this.messages.push({
         name: name,
-        text: [text],
+        text: text,
         sent: sent,
         datetime
       });
     },
-    clearMsgs(){
+    clearMsgs() {
-      this.messages=[];
+      this.messages = [];
-      localStorage.removeItem(bot_message_records)
+      localStorage.removeItem(bot_message_records);
+    }
   }
-  },
 };
 </script>
 <style lang="css">

src/pages/Index.vue

@@ -12,15 +12,30 @@
           :key="index"
         >
           <q-chat-message
-            style="white-space: pre-wrap"
-            :text="message.text"
             :name="message.name"
             :sent="message.sent"
             :stamp="fromNow(message.datetime)"
-          />
+            :bg-color="message.sent ? 'green-7' : 'white'"
+          >
+            <div
+              v-if="message.sent"
+              :style="{ 'max-width': width * 0.8 + 'px' }"
+            >
+              {{ message.text }}
             </div>
-        <div class="col-xs-11 col-sm-10 col-md-9 col-lg-8 col-xl-7" v-show="disable">
+            <div
-          <q-chat-message name="bot">
+              v-else
+              class="markdown-body"
+              :style="{ 'max-width': width * 0.8 + 'px' }"
+              v-html="markdownToHtml(message.text)"
+            ></div>
+          </q-chat-message>
+        </div>
+        <div
+          class="col-xs-11 col-sm-10 col-md-9 col-lg-8 col-xl-7"
+          v-show="disable"
+        >
+          <q-chat-message name="bot" bg-color="white">
             <q-spinner-dots size="2rem" />
           </q-chat-message>
           <q-tooltip
@@ -38,22 +53,54 @@
 
 <script>
 import { dta, fromNow } from "../utils/date_utils";
+import { marked } from "marked"; //解析markdown
+import "github-markdown-css";
 export default {
   props: ["messages", "disable"],
   watch: {
     messages: function (val) {
       //当消息集合变动时 滚动到容器底部
       this.$refs.scrollArea.setScrollPosition("vertical", 9999999, 300);
+    },
+    width(val) {
+      // 为了避免频繁触发resize函数导致页面卡顿，使用定时器
+      if (!this.timer) {
+        // 一旦监听到的screenWidth值改变，就将其重新赋给data里的screenWidth
+        this.width = val;
+        this.timer = true;
+        const that = this;
+        setTimeout(function () {
+          that.timer = false;
+        }, 10);
+      }
     }
   },
   data() {
-    return {};
+    return { width: document.body.clientWidth };
   },
   mounted() {
     this.$refs.scrollArea.setScrollPosition("vertical", 9999999, 300);
+    //设置机器人消息最大宽度
+    window.onresize = () =>
+      (() => {
+        window.screenWidth = document.body.clientWidth;
+        this.width = window.screenWidth;
+      })();
   },
-
   methods: {
+    markdownToHtml(text) {
+      marked.setOptions({
+        renderer: new marked.Renderer(),
+        gfm: true, //默认为true。 允许 Git Hub标准的markdown.
+        tables: true, //默认为true。 允许支持表格语法。该选项要求 gfm 为true。
+        breaks: false, //默认为false。 允许回车换行。该选项要求 gfm 为true。
+        pedantic: false, //默认为false。 尽可能地兼容 markdown.pl的晦涩部分。不纠正原始模型任何的不良行为和错误。
+        sanitize: false, //对输出进行过滤（清理）
+        smartLists: true,
+        smartypants: false //使用更为时髦的标点，比如在引用语法中加入破折号。
+      });
+      return marked(text);
+    },
     fromNow(date) {
       return fromNow(date, dta);
     }

src/utils/request.js

@@ -27,7 +27,7 @@ service.interceptors.request.use(
 // response拦截器
 service.interceptors.response.use(
   (response) => {
-    return response
+    return response.data
   },
   (error) => {
     if (error && error.response) {