Merge pull request #14 from jsoncode/master

update front_end config and proxy

Author: xixihahaliu

README.md

@@ -199,6 +199,15 @@ vim front_end/.env # set the excetly host.
 <summary>Beginner's recommendation!</summary>
 
 ```shell
+# Change the script file format from DOS to UNIX.
+sed -i "s/\r//" scripts/run_for_local.sh
+sed -i "s/^M//" scripts/run_for_local.sh
+# delete BOM
+sed -i '1s/^.*#//;s/\r$//' scripts/run_for_local.sh
+# check bom
+head -1 scripts/run_for_local.sh | od -c
+# 0000000   !   /   b   i   n   /   b   a   s   h  \n
+
 # Front desk startup, log prints to the screen in real time, press ctrl+c to stop.
 docker-compose -f docker-compose-windows.yaml up qanything_local
 ```
@@ -208,6 +217,9 @@ docker-compose -f docker-compose-windows.yaml up qanything_local
 <summary>Recommended for experienced players!</summary>
 
 ```shell
+# The script file is changed from DOS format to Unix format.
+sed -i "s/\r//" scripts/run_for_local.sh
+sed -i "s/^M//" scripts/run_for_local.sh
 # Background startup, ctrl+c will not stop.
 docker-compose -f docker-compose-windows.yaml up -d
 # Execute the following command to view the log.
@@ -217,12 +229,6 @@ docker-compose -f docker-compose-windows.yaml down
 ```
 </details>
 
-2. Double click run_in_windows.bat
-3. Execute command line:
-```shell
-Start-Process -FilePath ".\run_in_windows.bat" -Wait -NoNewWindow
-```
-
 ##### in the Linux system
 <details>
 <summary>Beginner's recommendation!</summary>

README_zh.md

@@ -196,6 +196,14 @@ vim front_end/.env # 设置准确的host，本地环境默认一般是localhost
 <summary>新手推荐！</summary>
 
 ```shell
+# 脚本文件从dos格式改为unix格式
+sed -i "s/\r//" scripts/run_for_local.sh
+sed -i "s/^M//" scripts/run_for_local.sh
+# 删除dos系统中的BOM字符
+sed -i '1s/^ *//' scripts/run_for_local.sh
+# 查看BOM是否删除成功
+head -1 scripts/run_for_local.sh | od -c
+# 如果显示：0000000   !   /   b   i   n   /   b   a   s   h  \n 表示成功
 # 前台启动，日志实时打印到屏幕上，ctrl+c即可停止
 docker-compose -f docker-compose-windows.yaml up qanything_local
 ```
@@ -205,6 +213,9 @@ docker-compose -f docker-compose-windows.yaml up qanything_local
 <summary>老手推荐！</summary>
 
 ```shell
+# 脚本文件从dos格式改为unix格式
+sed -i "s/\r//" scripts/run_for_local.sh
+sed -i "s/^M//" scripts/run_for_local.sh
 # 后台启动，ctrl+c不会停止
 docker-compose -f docker-compose-windows.yaml up -d
 # 执行如下命令查看日志
@@ -214,12 +225,6 @@ docker-compose -f docker-compose-windows.yaml down
 ```
 </details>
 
-2. 双击 run_in_windows.bat 
-3. 命令行执行run_in_windows.bat：
-```shell
-Start-Process -FilePath ".\run_in_windows.bat" -Wait -NoNewWindow
-```
-
 ##### 在Linux系统下
 <details>
 <summary>新手推荐！</summary>

front_end/.env

@@ -1,4 +1,5 @@
-VITE_APP_API_HOST=
-VITE_APP_API_PREFIX=/api/local_doc_qa
+VITE_APP_API_HOST=http://localhost:8777
+VITE_APP_API_PREFIX=/api
 VITE_APP_WEB_PREFIX=/qanything
+VITE_APP_MODE=dev
 

front_end/.env.development

@@ -1,3 +1,4 @@
-VITE_APP_API_HOST=http://localhost
-VITE_APP_API_PREFIX=/api/local_doc_qa
+VITE_APP_API_HOST=http://localhost:8777
+VITE_APP_API_PREFIX=/api
 VITE_APP_WEB_PREFIX=/qanything
+VITE_APP_MODE=prod

front_end/.env.production

@@ -4,7 +4,7 @@
  * @LastEditors: 祝占朋 [email protected]
  * @LastEditTime: 2023-12-04 14:43:43
  * @FilePath: /ai-demo/src/components/AddKnowledgeDialog.vue
- * @Description: 
+ * @Description:
 -->
 <template>
   <Teleport to="body">
@@ -191,9 +191,7 @@ const acceptList = [
 //上传前校验
 const beforeFileUpload = async (file, index) => {
   return new Promise((resolve, reject) => {
-    console.log(file.name.split('.').pop());
-    console.log(acceptList.includes);
-    if (acceptList.includes('.' + file.name.split('.').pop().toLowerCase())) {
+    if (file.name && acceptList.includes('.' + file.name.split('.').pop().toLowerCase())) {
       fileList.value.push({
         file_name: file.name,
         file: file,

front_end/src/components/AddKnowledgeDialog.vue

@@ -120,6 +120,7 @@
   <DefaultModal :content="content" :confirm-loading="confirmLoading" @ok="confirm" />
 </template>
 <script lang="ts" setup>
+import { apiBase } from '@/services';
 import { IChatItem } from '@/utils/types';
 import { useThrottleFn, useClipboard } from '@vueuse/core';
 import { message } from 'ant-design-vue';
@@ -244,10 +245,9 @@ const send = () => {
     history.value = [];
   }
   showLoading.value = true;
-  const severUrl = import.meta.env.VITE_APP_SERVER_URL;
   ctrl = new AbortController();
 
-  fetchEventSource(severUrl + '/local_doc_qa/local_doc_chat', {
+  fetchEventSource(apiBase + '/local_doc_qa/local_doc_chat', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

front_end/src/components/Chat.vue

@@ -4,7 +4,7 @@
  * @LastEditors: 祝占朋 [email protected]
  * @LastEditTime: 2024-01-08 15:09:48
  * @FilePath: /qanything-open-source/src/components/FileUploadDialog.vue
- * @Description: 
+ * @Description:
 -->
 <template>
   <Teleport to="body">
@@ -84,6 +84,7 @@
   </Teleport>
 </template>
 <script lang="ts" setup>
+import { apiBase } from '@/services';
 import { useKnowledgeModal } from '@/store/useKnowledgeModal';
 import { useKnowledgeBase } from '@/store/useKnowledgeBase';
 import { useOptiionList } from '@/store/useOptiionList';
@@ -149,7 +150,7 @@ const acceptList = [
 //上传前校验
 const beforeFileUpload = async (file, index) => {
   return new Promise((resolve, reject) => {
-    if (acceptList.includes('.' + file.name.split('.').pop().toLowerCase())) {
+    if (file.name && acceptList.includes('.' + file.name.split('.').pop().toLowerCase())) {
       uploadFileList.value.push({
         file_name: file.name,
         file: file,
@@ -233,8 +234,7 @@ const uplolad = async () => {
   // 上传模式，soft：文件名重复的文件不再上传，strong：文件名重复的文件强制上传
   formData.append('mode', 'strong');
 
-  const base = import.meta.env.VITE_APP_SERVER_URL;
-  fetch(base + '/local_doc_qa/upload_files', {
+  fetch(apiBase + '/local_doc_qa/upload_files', {
     method: 'POST',
     body: formData,
   })

front_end/src/components/FileUploadDialog.vue

@@ -4,7 +4,7 @@
  * @LastEditors: 祝占朋 [email protected]
  * @LastEditTime: 2023-12-11 16:06:52
  * @FilePath: /ai-demo/src/components/NewAddKnowledgeDialog.vue
- * @Description: 
+ * @Description:
 -->
 <template>
   <Teleport to="body">
@@ -191,9 +191,7 @@ const acceptList = [
 //上传前校验
 const beforeFileUpload = async (file, index) => {
   return new Promise((resolve, reject) => {
-    console.log(file.name.split('.').pop());
-    console.log(acceptList.includes);
-    if (acceptList.includes('.' + file.name.split('.').pop().toLowerCase())) {
+    if (file.name && acceptList.includes('.' + file.name.split('.').pop().toLowerCase())) {
       fileList.value.push({
         file_name: file.name,
         file: file,

front_end/src/components/NewAddKnowledgeDialog.vue

@@ -2,7 +2,8 @@ const forceHandle = {
   // 注意：切换页面是否要清空保留的requests根据业务来处理
   requests: {} as any,
   getKey(config: any) {
-    const url = config.url.split('?')[0];
+    console.log(config.url);
+    const url = config.url?.split('?')[0];
     return `${url}/&request_type=${config.method}`;
   },
   clear() {