g# This is a combination of 6 commits. (#675)

perf: node render perf: react flow performance config perf: pg index perf: oauth login doc doc
labring · Jan 1, 2024 · d645a74 · d645a74
1 parent 9ccfda4
commit d645a74
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 678 deletions.
diff --git a/docSite/content/docs/development/configuration.md b/docSite/content/docs/development/configuration.md
@@ -16,6 +16,8 @@ weight: 708
 
 ## 旧版本配置文件
 
+以下配置适合 4.6.6-alpha 之前
+
 ```json
 {
  "SystemParams": {

diff --git a/docSite/content/docs/development/docker.md b/docSite/content/docs/development/docker.md
@@ -7,9 +7,13 @@ toc: true
 weight: 707
 ---
 
-## 准备条件
+## 推荐配置
 
-服务器要求：2C2G 起
+| 环境 | 推荐配置（单节点） |
+| ---- | ---- |
+| 测试 | 2c2g 起 |
+| 100w 组向量 | 4c16g起 |
+| 500w 组向量 | 16c64g起 |
 
 ### 1. 准备好代理环境（国外服务器可忽略）
 

diff --git a/docSite/content/docs/development/intro.md b/docSite/content/docs/development/intro.md
@@ -16,15 +16,15 @@ weight: 705
 
 - [Git](http://git-scm.com/)
 - [Docker](https://www.docker.com/)（构建镜像）
-- [Node.js v18.x (LTS)](http://nodejs.org)
+- [Node.js v18.x (不推荐最新的，可能有兼容问题)](http://nodejs.org)
 - [pnpm](https://pnpm.io/) 版本 8.x.x 
 
 ## 开始本地开发
 
 **Tips**
 
 1. 用户默认的时区为 `Asia/Shanghai`,非 linux 环境时候，获取系统时间会异常，本地开发时候，可以将用户的时区调整成 UTC（+0）。
-2. 建议先服务器装好数据库在进行本地开发。
+2. 建议先服务器装好**数据库**，再进行本地开发。
 
 ### 1. Fork 存储库
 
@@ -79,11 +79,13 @@ cd projects/app
 pnpm dev
 ```
 
-### 6. 发布 - 镜像打包
+### 6. 部署打包
 
 ```bash
 # 根目录下执行
-docker build -t dockername/fastgpt --build-arg name=app .
+docker build -t dockername/fastgpt:tag --build-arg name=app .
+# 使用代理
+docker build -t dockername/fastgpt:tag --build-arg name=app --build-arg proxy=taobao .
 ```
 
 ## 提交代码至开源仓库

diff --git a/packages/service/common/vectorStore/pg/controller.ts b/packages/service/common/vectorStore/pg/controller.ts
@@ -22,7 +22,7 @@ export async function initPg() {
  data_id VARCHAR(50) NOT NULL,
  createTime TIMESTAMP DEFAULT CURRENT_TIMESTAMP
  );
- CREATE INDEX IF NOT EXISTS vector_index ON ${PgDatasetTableName} USING hnsw (vector vector_ip_ops) WITH (m = 32, ef_construction = 64);
+ CREATE INDEX CONCURRENTLY IF NOT EXISTS vector_index ON ${PgDatasetTableName} USING hnsw (vector vector_ip_ops) WITH (m = 32, ef_construction = 64);
  `);
 
  console.log('init pg successful');

diff --git a/projects/app/public/locales/en/common.json b/projects/app/public/locales/en/common.json
@@ -879,7 +879,8 @@
  },
  "login": {
  "Github": "Github",
- "Google": "Google"
+ "Google": "Google",
+ "Provider error": "Login exception, please try again"
  }
  }
  },

diff --git a/projects/app/public/locales/zh/common.json b/projects/app/public/locales/zh/common.json
@@ -879,7 +879,8 @@
  },
  "login": {
  "Github": "Github 登录",
- "Google": "Google 登录"
+ "Google": "Google 登录",
+ "Provider error": "登录异常，请重试"
  }
  }
  },

diff --git a/projects/app/src/pages/components/Ability.tsx b/projects/app/src/pages/components/Ability.tsx
diff --git a/projects/app/src/pages/components/Choice.tsx b/projects/app/src/pages/components/Choice.tsx