Skip to content

Commit 6bebc34

Browse files
committed
Merge branch 'refs/heads/dev'
2 parents 6abcbf7 + 552d364 commit 6bebc34

19 files changed

+2863
-641
lines changed

Diff for: Dockerfile

+29-60
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,75 @@
11
# 阶段1:基础镜像准备
22
FROM node:18-alpine AS base
33

4-
ARG USE_CN_MIRROR
5-
64
# 设置工作目录
75
WORKDIR /app
86

9-
# 配置国内镜像源(如果需要)
10-
RUN \
11-
if [ "${USE_CN_MIRROR:-false}" = "true" ]; then \
12-
npm config set registry https://registry.npmmirror.com/; \
13-
fi
7+
# 配置国内镜像源
8+
RUN npm config set registry https://registry.npmmirror.com/
149

15-
# 安装必要的系统依赖(例如CA证书
10+
# 安装必要的系统依赖(例如 CA 证书
1611
RUN apk add --no-cache ca-certificates
1712

18-
# 创建distroless目录,准备复制必要的运行时文件
19-
RUN mkdir -p /distroless/bin /distroless/lib /distroless/etc/ssl/certs /distroless/etc
20-
21-
# 复制Node.js可执行文件
22-
RUN cp /usr/local/bin/node /distroless/bin/
23-
24-
# 复制Node.js运行时依赖的库文件
25-
RUN ldd /usr/local/bin/node | awk '{print $3}' | grep -v '^$' | xargs -I '{}' cp '{}' /distroless/lib/
26-
27-
# 复制动态链接器
28-
RUN cp /lib/ld-musl-$(uname -m).so.1 /distroless/lib/
29-
30-
# 复制CA证书
31-
RUN cp -r /etc/ssl/certs /distroless/etc/ssl/
32-
33-
# 创建非root用户
34-
RUN addgroup -g 1001 appgroup && \
35-
adduser -D -u 1001 -G appgroup appuser
36-
37-
# 复制用户和组信息
38-
RUN cp /etc/passwd /distroless/etc/passwd && \
39-
cp /etc/group /distroless/etc/group
40-
41-
42-
4313
# 阶段2:构建应用程序
4414
FROM base AS builder
4515

46-
ARG USE_CN_MIRROR
47-
4816
WORKDIR /app
4917

5018
# 复制依赖文件
5119
COPY package.json yarn.lock ./
5220

53-
# 确保在构建阶段NODE_ENV不为production
54-
ENV NODE_ENV=development
55-
56-
# 配置国内镜像源并安装依赖
57-
RUN \
58-
if [ "${USE_CN_MIRROR:-false}" = "true" ]; then \
59-
npm config set registry https://registry.npmmirror.com/; \
60-
fi && \
61-
yarn install
21+
# 安装所有依赖,包括开发依赖
22+
RUN yarn install
6223

6324
# 复制项目源代码
6425
COPY . .
6526

6627
# 构建应用程序
6728
RUN yarn build
6829

69-
# 重新设置NODE_ENV为production
30+
# 删除 node_modules 目录
31+
RUN rm -rf node_modules
32+
33+
# 设置 NODE_ENV 为 production
7034
ENV NODE_ENV=production
7135

72-
# 删除devDependencies,减小最终镜像大小
36+
# 安装生产依赖
7337
RUN yarn install --production --ignore-scripts --prefer-offline
7438

75-
# 修改文件权限,使appuser拥有所有权
76-
RUN chown -R appuser:appgroup /app
77-
78-
39+
# 清理 yarn 缓存
40+
RUN yarn cache clean --all
7941

8042
# 阶段3:构建最终的生产镜像
81-
FROM scratch
43+
FROM node:18-alpine
44+
45+
# 设置工作目录
46+
WORKDIR /app
8247

83-
# 复制distroless文件
84-
COPY --from=base /distroless /
48+
# 创建非 root 用户
49+
RUN addgroup -g 1001 appgroup && \
50+
adduser -D -u 1001 -G appgroup appuser
8551

8652
# 复制应用程序文件
87-
COPY --from=builder /app /app
53+
COPY --from=builder /app/server.js /app/server.js
54+
COPY --from=builder /app/dist /app/dist
55+
COPY --from=builder /app/api /app/api
56+
COPY --from=builder /app/node_modules /app/node_modules
57+
COPY --from=builder /app/package.json /app/package.json
58+
59+
# 修改文件权限,使 appuser 拥有所有权
60+
RUN chown -R appuser:appgroup /app
8861

8962
# 设置环境变量
9063
ENV NODE_ENV=production
9164
ENV HOSTNAME="0.0.0.0"
9265
ENV PORT=13000
9366
ENV NODE_OPTIONS="--dns-result-order=ipv4first --use-openssl-ca"
9467

95-
# 设置工作目录
96-
WORKDIR /app
97-
9868
# 暴露端口
9969
EXPOSE 13000
10070

101-
# 使用非root用户
71+
# 使用非 root 用户
10272
USER appuser
10373

10474
# 启动命令
105-
ENTRYPOINT ["/bin/node"]
106-
CMD ["server.js"]
75+
CMD ["node", "server.js"]

Diff for: README.md

+35-6
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@
6767

6868
<img src="./docs/images/testing.png" alt="测试" style="zoom:50%;" />
6969

70+
### v2.1.0
71+
72+
🔔 **新特性与优化**
73+
74+
-**新增快捷聊天测试**
75+
- 对接魔改 NextChat,可快捷测试模型。
76+
- 新增 `closeChat` 设置,方便中转站使用。
77+
- 🧪 **添加实验性功能模块** from [elfmaid](https://linux.do/u/elfmaid)
78+
- 批量测试 gpt Refresh Tokens
79+
- 批量测试 claude Session Keys
80+
- 批量测试 gemini API Keys
81+
- ✂️ **新增粘贴按钮 ** by [fangyuan](https://linux.do/u/fangyuan99)
82+
- 📝 **新增自定义对话验证功能**
83+
- 快捷prompt测试 by [fangyuan](https://linux.do/u/fangyuan99)
84+
85+
🔧 **优化与修复**
86+
87+
- 🐳 **优化 Dockerfile** 减小镜像体积。
88+
89+
- 🎨 **修复布局问题** 改善界面显示
90+
7091
### v2.0.0
7192

7293
🔔 **全新特性与优化**
@@ -171,8 +192,13 @@
171192
- **描述**: 是否关闭公告显示。设置为 `true` 时关闭公告显示,设置为 `false` 或未定义时显示公告。 **方便中转站使用**
172193
- **示例**: `"closeAnnouncement": true`
173194

195+
🚪 closeChat **方便中转站使用**
196+
197+
- **描述**:是否关闭快捷聊天功能。设置为 `true` 时关闭聊天功能,设置为 `false` 或未定义时开启聊天功能。
198+
- **示例**`"closeChat": true`
199+
174200
```
175-
https://check.crond.dev/?settings={"key":"*sk*","url":"*api*","models":["gpt-4o-mini","gpt-4o"],"timeout":10,"concurrency":2,"closeAnnouncement":true}
201+
https://check.crond.dev/?settings={"key":"*sk*","url":"*api*","models":["gpt-4o-mini","gpt-4o"],"timeout":10,"concurrency":2,"closeAnnouncement":true,"closeChat":true}
176202
```
177203

178204
解码后的 JSON 字符串如下:
@@ -184,26 +210,29 @@ https://check.crond.dev/?settings={"key":"*sk*","url":"*api*","models":["gpt-4o-
184210
"models": ["gpt-4o-mini", "gpt-4o"],
185211
"timeout": 10,
186212
"concurrency": 2,
187-
"closeAnnouncement": true
213+
"closeAnnouncement": true,
214+
"closeChat": true
188215
}
189216
```
190217

191218
- **voapi** 示例
192219

193220
```
194221
{
195-
"name": "check",
196-
"link": "https://check.crond.dev/?settings={%22key%22:%22*sk*%22,%22url%22:%22*api*%22,%22models%22:[%22gpt-4o-mini%22],%22timeout%22:10,%22concurrency%22:2,%22closeAnnouncement%22:true}",
197-
"icon": "https://check.crond.dev/logo.png"
222+
"name": "check",
223+
"link": "https://check.crond.dev/?settings={%22key%22:%22*sk*%22,%22url%22:%22*api*%22,%22models%22:[%22gpt-4o-mini%22],%22timeout%22:10,%22concurrency%22:2,%22closeAnnouncement%22:true,%22closeChat%22:true}",
224+
"icon": "https://check.crond.dev/logo.png"
198225
}
226+
199227
```
200228

201229
- **newapi** 示例
202230

203231
```
204232
{
205-
"CHECK": "https://check.crond.dev/?settings={\"key\":\"{key}\",\"url\":\"{address}\",\"models\":[\"gpt-4o-mini\"],\"timeout\":10,\"concurrency\":2,\"closeAnnouncement\":true}"
233+
"CHECK": "https://check.crond.dev/?settings={\"key\":\"{key}\",\"url\":\"{address}\",\"models\":[\"gpt-4o-mini\"],\"timeout\":10,\"concurrency\":2,\"closeAnnouncement\":true,\"closeChat\":true}"
206234
}
235+
207236
```
208237

209238
### 🛠 **高级验证功能**

0 commit comments

Comments
 (0)