Skip to content

Commit 109bdbe

Browse files
authored
4.11.2 dev (labring#5368)
* 4.11.2 dev (#103) * update document * update doc * update doc * doc img * action * fix action * fix: action * fix: action * perf: action * doc * perf: action
1 parent 1014f34 commit 109bdbe

File tree

137 files changed

+648
-586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+648
-586
lines changed

.github/workflows/docs-deploy.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,46 @@ permissions:
1515
pull-requests: write
1616

1717
jobs:
18+
sync-images:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout current repository
22+
uses: actions/checkout@v4
23+
24+
- name: Checkout target repository
25+
uses: actions/checkout@v4
26+
with:
27+
repository: labring/fastgpt-img
28+
token: ${{ secrets.DOCS_IMGS_SYNC_TOKEN }}
29+
path: fastgpt-img
30+
31+
- name: Sync images
32+
run: |
33+
# Create imgs directory if it doesn't exist
34+
mkdir -p fastgpt-img
35+
36+
# Copy all images from document/public/imgs to the target repository
37+
cp -r document/public/imgs/* fastgpt-img
38+
39+
# Navigate to target repository
40+
cd fastgpt-img
41+
42+
# Configure git
43+
git config user.name "github-actions[bot]"
44+
git config user.email "github-actions[bot]@users.noreply.github.com"
45+
46+
# Add, commit and push changes
47+
git add .
48+
if ! git diff --cached --quiet; then
49+
git commit -m "Sync images from FastGPT document at $(date)"
50+
git push
51+
echo "Images synced successfully"
52+
else
53+
echo "No changes to sync"
54+
fi
1855
# Add a new job to generate unified timestamp
1956
generate-timestamp:
57+
needs: sync-images
2058
runs-on: ubuntu-latest
2159
outputs:
2260
datetime: ${{ steps.datetime.outputs.datetime }}
@@ -40,6 +78,13 @@ jobs:
4078
- name: Checkout
4179
uses: actions/checkout@v4
4280

81+
- name: Rewrite image paths
82+
if: matrix.domain_config.suffix == 'io'
83+
run: |
84+
find document/content/docs -name "*.mdx" -type f | while read file; do
85+
sed -i 's|](/imgs/|](https://cdn.jsdelivr.net/gh/labring/fastgpt-img@main/|g' "$file"
86+
done
87+
4388
- name: Docker meta
4489
id: meta
4590
uses: docker/metadata-action@v5

.github/workflows/docs-preview.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v4
2222

23+
- name: Rewrite image paths
24+
run: |
25+
find document/content/docs -name "*.mdx" -type f | while read file; do
26+
sed -i 's|](/imgs/|](https://cdn.jsdelivr.net/gh/labring/fastgpt-img@main/|g' "$file"
27+
done
28+
2329
- name: Get current datetime
2430
id: datetime
2531
run: echo "datetime=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dist
44
node_modules
55
document/
66
*.md
7+
*.mdx
78

89
pnpm-lock.yaml
910
cl100l_base.ts

.vscode/settings.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525
"[typescript]": {
2626
"editor.defaultFormatter": "esbenp.prettier-vscode"
2727
},
28+
"mdx.server.enable": true,
29+
"markdown.copyFiles.overwriteBehavior": "nameIncrementally",
2830
"markdown.copyFiles.destination": {
29-
"/document/content/**/*": "${documentWorkspaceFolder}/document/public/"
31+
"/document/content/docs/**/*": "${documentWorkspaceFolder}/document/public/imgs/"
32+
},
33+
"files.associations": {
34+
"*.mdx": "markdown"
3035
}
3136
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The FastGPT is licensed under the Apache License 2.0, with the following additio
77
a. Multi-tenant SaaS service: Unless explicitly authorized by FastGPT in writing, you may not use the FastGPT.AI source code to operate a multi-tenant SaaS service that is similar to the FastGPT.
88
b. LOGO and copyright information: In the process of using FastGPT, you may not remove or modify the LOGO or copyright information in the FastGPT console.
99

10-
Please contact yujinlong@sealos.io by email to inquire about licensing matters.
10+
Please contact dennis@sealos.io by email to inquire about licensing matters.
1111

1212
2. As a contributor, you should agree that your contributed code:
1313

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ https://github.com/labring/FastGPT/assets/15308462/7d3a38df-eb0e-4388-9250-2409b
107107
* [部署 FastGPT](https://doc.fastgpt.io/docs/introduction/development/sealos/)
108108
* [系统配置文件说明](https://doc.fastgpt.io/docs/introduction/development/configuration/)
109109
* [多模型配置方案](https://doc.fastgpt.io/docs/introduction/development/modelConfig/one-api/)
110-
* [版本更新/升级介绍](https://doc.fastgpt.io/docs/introduction/development/upgrading/intro)
110+
* [版本更新/升级介绍](https://doc.fastgpt.io/docs/introduction/development/upgrading/index)
111111
* [OpenAPI API 文档](https://doc.fastgpt.io/docs/introduction/development/openapi/)
112112
* [知识库结构详解](https://doc.fastgpt.io/docs/introduction/guide/knowledge_base/RAG/)
113113

@@ -216,4 +216,4 @@ https://github.com/labring/FastGPT/assets/15308462/7d3a38df-eb0e-4388-9250-2409b
216216
1. 允许作为后台服务直接商用,但不允许提供 SaaS 服务。
217217
2. 未经商业授权,任何形式的商用服务均需保留相关版权信息。
218218
3. 完整请查看 [FastGPT Open Source License](./LICENSE)
219-
4. 联系方式:[email protected][点击查看商业版定价策略](https://doc.fastgpt.io/docs/introduction/shopping_cart/intro/)
219+
4. 联系方式:[email protected][点击查看商业版定价策略](https://doc.fastgpt.io/docs/introduction/commercial/)

README_en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Project tech stack: NextJs + TS + ChakraUI + MongoDB + PostgreSQL (PG Vector plu
8080
- [Deploying FastGPT](https://doc.fastgpt.io/docs/introduction/development/docker)
8181
- [Guide on System Configs](https://doc.fastgpt.io/docs/introduction/development/configuration)
8282
- [Configuring Multiple Models](https://doc.fastgpt.io/docs//introduction/development/modelConfig/intro)
83-
- [Version Updates & Upgrades](https://doc.fastgpt.io/docs/introduction/development/upgrading/intro)
83+
- [Version Updates & Upgrades](https://doc.fastgpt.io/docs/introduction/development/upgrading/index)
8484

8585
<a href="#FastGPT">
8686
<img src="https://img.shields.io/badge/-Back_to_Top-7d09f1.svg" alt="#" align="right">
@@ -185,7 +185,7 @@ This repository complies with the [FastGPT Open Source License](./LICENSE) open
185185
1. Direct commercial use as a backend service is allowed, but provision of SaaS services is not allowed.
186186
2. Without commercial authorization, any form of commercial service must retain relevant copyright information.
187187
3. For full details, please see [FastGPT Open Source License](./LICENSE)
188-
4. Contact: [email protected] , [click to view commercial version pricing strategy](https://doc.fastgpt.io/docs/introduction/shopping_cart/intro/)
188+
4. Contact: [email protected] , [click to view commercial version pricing strategy](https://doc.fastgpt.io/docs/introduction/commercial/)
189189

190190
<a href="#FastGPT">
191191
<img src="https://img.shields.io/badge/-Back_to_Top-7d09f1.svg" alt="#" align="right">

README_ja.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ https://github.com/labring/FastGPT/assets/15308462/7d3a38df-eb0e-4388-9250-2409b
102102
- [FastGPT のデプロイ](https://doc.fastgpt.io/docs/introduction/development/docker)
103103
- [システム 設定 ガイド](https://doc.fastgpt.io/docs/introduction/development/configuration)
104104
- [複数 モデルの 設定](https://doc.fastgpt.io/docs/introduction/development/modelConfig/ai-proxy)
105-
- [バージョン 更新 とアップグレード](https://doc.fastgpt.io/docs/introduction/development/upgrading/intro)
105+
- [バージョン 更新 とアップグレード](https://doc.fastgpt.io/docs/introduction/development/upgrading/index)
106106

107107
<!-- ## :point_right: ロードマップ
108108
- [FastGPT ロードマップ](https://kjqvjse66l.feishu.cn/docx/RVUxdqE2WolDYyxEKATcM0XXnte) -->

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
如果您发现了 FastGPT 的安全漏洞,请按照以下步骤进行报告:
66

77
1. **报告方式**
8-
发送邮件至:yujinlong@sealos.io
8+
发送邮件至:dennis@sealos.io
99
请备注版本以及您的 GitHub 账号
1010

1111
3. **响应时间**

deploy/docker/yml.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ services:
9595
9696
fastgpt:
9797
container_name: fastgpt
98-
image: ghcr.io/labring/fastgpt:v4.11.0 # git
99-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.11.0 # 阿里云
98+
image: ghcr.io/labring/fastgpt:v4.11.1 # git
99+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.11.1 # 阿里云
100100
ports:
101101
- 3000:3000
102102
networks:
@@ -152,15 +152,15 @@ services:
152152
- ./config.json:/app/data/config.json
153153
sandbox:
154154
container_name: sandbox
155-
image: ghcr.io/labring/fastgpt-sandbox:v4.10.1 # git
156-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.10.1 # 阿里云
155+
image: ghcr.io/labring/fastgpt-sandbox:v4.11.1 # git
156+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.11.1 # 阿里云
157157
networks:
158158
- fastgpt
159159
restart: always
160160
fastgpt-mcp-server:
161161
container_name: fastgpt-mcp-server
162-
image: ghcr.io/labring/fastgpt-mcp_server:v4.10.1 # git
163-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.10.1 # 阿里云
162+
image: ghcr.io/labring/fastgpt-mcp_server:v4.11.1 # git
163+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.11.1 # 阿里云
164164
ports:
165165
- 3005:3000
166166
networks:
@@ -169,8 +169,8 @@ services:
169169
environment:
170170
- FASTGPT_ENDPOINT=http://fastgpt:3000
171171
fastgpt-plugin:
172-
image: ghcr.io/labring/fastgpt-plugin:v0.1.5 # git
173-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.5 # 阿里云
172+
image: ghcr.io/labring/fastgpt-plugin:v0.1.7 # git
173+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.7 # 阿里云
174174
container_name: fastgpt-plugin
175175
restart: always
176176
networks:

0 commit comments

Comments
 (0)