Skip to content

Commit 38a2d3e

Browse files
HowlJoHowlJo
authored
Merge branch 'ChatGPTNextWeb:main' into main
2 parents 652bdd7 + 115f357 commit 38a2d3e

35 files changed

+1933
-768
lines changed

‎.env.template

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
21
# Your openai api key. (required)
32
OPENAI_API_KEY=sk-xxxx
43

54
# Access password, separated by comma. (optional)
65
CODE=your-password
76

8-
# You can start service behind a proxy
7+
# You can start service behind a proxy. (optional)
98
PROXY_URL=http://localhost:7890
109

1110
# (optional)
1211
# Default: Empty
13-
# Googel Gemini Pro API key, set if you want to use Google Gemini Pro API.
12+
# Google Gemini Pro API key, set if you want to use Google Gemini Pro API.
1413
GOOGLE_API_KEY=
1514

1615
# (optional)
1716
# Default: https://generativelanguage.googleapis.com/
18-
# Googel Gemini Pro API url without pathname, set if you want to customize Google Gemini Pro API url.
17+
# Google Gemini Pro API url without pathname, set if you want to customize Google Gemini Pro API url.
1918
GOOGLE_URL=
2019

2120
# Override openai api request base url. (optional)
@@ -47,15 +46,22 @@ ENABLE_BALANCE_QUERY=
4746
# If you want to disable parse settings from url, set this value to 1.
4847
DISABLE_FAST_LINK=
4948

49+
# (optional)
50+
# Default: Empty
51+
# To control custom models, use + to add a custom model, use - to hide a model, use name=displayName to customize model name, separated by comma.
52+
CUSTOM_MODELS=
53+
54+
# (optional)
55+
# Default: Empty
56+
# Change default model
57+
DEFAULT_MODEL=
5058

5159
# anthropic claude Api Key.(optional)
5260
ANTHROPIC_API_KEY=
5361

5462
### anthropic claude Api version. (optional)
5563
ANTHROPIC_API_VERSION=
5664

57-
58-
5965
### anthropic claude Api url (optional)
6066
ANTHROPIC_URL=
6167

‎.github/ISSUE_TEMPLATE/1_bug_report.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: '🐛 Bug Report'
2+
description: 'Report an bug'
3+
title: '[Bug] '
4+
labels: ['bug']
5+
body:
6+
- type: dropdown
7+
attributes:
8+
label: '📦 Deployment Method'
9+
multiple: true
10+
options:
11+
- 'Official installation package'
12+
- 'Vercel'
13+
- 'Zeabur'
14+
- 'Sealos'
15+
- 'Netlify'
16+
- 'Docker'
17+
- 'Other'
18+
validations:
19+
required: true
20+
- type: input
21+
attributes:
22+
label: '📌 Version'
23+
validations:
24+
required: true
25+
26+
- type: dropdown
27+
attributes:
28+
label: '💻 Operating System'
29+
multiple: true
30+
options:
31+
- 'Windows'
32+
- 'macOS'
33+
- 'Ubuntu'
34+
- 'Other Linux'
35+
- 'iOS'
36+
- 'iPad OS'
37+
- 'Android'
38+
- 'Other'
39+
validations:
40+
required: true
41+
- type: input
42+
attributes:
43+
label: '📌 System Version'
44+
validations:
45+
required: true
46+
- type: dropdown
47+
attributes:
48+
label: '🌐 Browser'
49+
multiple: true
50+
options:
51+
- 'Chrome'
52+
- 'Edge'
53+
- 'Safari'
54+
- 'Firefox'
55+
- 'Other'
56+
validations:
57+
required: true
58+
- type: input
59+
attributes:
60+
label: '📌 Browser Version'
61+
validations:
62+
required: true
63+
- type: textarea
64+
attributes:
65+
label: '🐛 Bug Description'
66+
description: A clear and concise description of the bug, if the above option is `Other`, please also explain in detail.
67+
validations:
68+
required: true
69+
- type: textarea
70+
attributes:
71+
label: '📷 Recurrence Steps'
72+
description: A clear and concise description of how to recurrence.
73+
- type: textarea
74+
attributes:
75+
label: '🚦 Expected Behavior'
76+
description: A clear and concise description of what you expected to happen.
77+
- type: textarea
78+
attributes:
79+
label: '📝 Additional Information'
80+
description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.

‎.github/ISSUE_TEMPLATE/1_bug_report_cn.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: '🐛 反馈缺陷'
2+
description: '反馈一个问题/缺陷'
3+
title: '[Bug] '
4+
labels: ['bug']
5+
body:
6+
- type: dropdown
7+
attributes:
8+
label: '📦 部署方式'
9+
multiple: true
10+
options:
11+
- '官方安装包'
12+
- 'Vercel'
13+
- 'Zeabur'
14+
- 'Sealos'
15+
- 'Netlify'
16+
- 'Docker'
17+
- 'Other'
18+
validations:
19+
required: true
20+
- type: input
21+
attributes:
22+
label: '📌 软件版本'
23+
validations:
24+
required: true
25+
26+
- type: dropdown
27+
attributes:
28+
label: '💻 系统环境'
29+
multiple: true
30+
options:
31+
- 'Windows'
32+
- 'macOS'
33+
- 'Ubuntu'
34+
- 'Other Linux'
35+
- 'iOS'
36+
- 'iPad OS'
37+
- 'Android'
38+
- 'Other'
39+
validations:
40+
required: true
41+
- type: input
42+
attributes:
43+
label: '📌 系统版本'
44+
validations:
45+
required: true
46+
- type: dropdown
47+
attributes:
48+
label: '🌐 浏览器'
49+
multiple: true
50+
options:
51+
- 'Chrome'
52+
- 'Edge'
53+
- 'Safari'
54+
- 'Firefox'
55+
- 'Other'
56+
validations:
57+
required: true
58+
- type: input
59+
attributes:
60+
label: '📌 浏览器版本'
61+
validations:
62+
required: true
63+
- type: textarea
64+
attributes:
65+
label: '🐛 问题描述'
66+
description: 请提供一个清晰且简洁的问题描述，若上述选项为`Other`，也请详细说明。
67+
validations:
68+
required: true
69+
- type: textarea
70+
attributes:
71+
label: '📷 复现步骤'
72+
description: 请提供一个清晰且简洁的描述，说明如何复现问题。
73+
- type: textarea
74+
attributes:
75+
label: '🚦 期望结果'
76+
description: 请提供一个清晰且简洁的描述，说明您期望发生什么。
77+
- type: textarea
78+
attributes:
79+
label: '📝 补充信息'
80+
description: 如果您的问题需要进一步说明，或者您遇到的问题无法在一个简单的示例中复现，请在这里添加更多信息。

‎.github/ISSUE_TEMPLATE/2_feature_request.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: '🌠 Feature Request'
2+
description: 'Suggest an idea'
3+
title: '[Feature Request] '
4+
labels: ['enhancement']
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: '🥰 Feature Description'
9+
description: Please add a clear and concise description of the problem you are seeking to solve with this feature request.
10+
validations:
11+
required: true
12+
- type: textarea
13+
attributes:
14+
label: '🧐 Proposed Solution'
15+
description: Describe the solution you'd like in a clear and concise manner.
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: '📝 Additional Information'
21+
description: Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/2_feature_request_cn.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: '🌠 功能需求'
2+
description: '提出需求或建议'
3+
title: '[Feature Request] '
4+
labels: ['enhancement']
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: '🥰 需求描述'
9+
description: 请添加一个清晰且简洁的问题描述，阐述您希望通过这个功能需求解决的问题。
10+
validations:
11+
required: true
12+
- type: textarea
13+
attributes:
14+
label: '🧐 解决方案'
15+
description: 请清晰且简洁地描述您想要的解决方案。
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: '📝 补充信息'
21+
description: 在这里添加关于问题的任何其他背景信息。

0 commit comments

Comments
 (0)