This commit is contained in:
zlwu committed 2026-06-23 10:25:33 +08:00
1 parent 3e15776dba
commit 93c28759d0
54 files changed
+6504 -5865

No files matched your search

+41
View File
@@ -34,6 +34,47 @@ cp "${ROOT}/deploy/docker/docker-compose.yml" "${STAGING}/deploy/docker/"
sed -e "s|^ZKXW_BACKEND_IMAGE=.*|ZKXW_BACKEND_IMAGE=${BACKEND_IMAGE}|" \
-e "s|^ZKXW_WEB_IMAGE=.*|ZKXW_WEB_IMAGE=${WEB_IMAGE}|" \
"${ROOT}/deploy/docker/.env.example" > "${STAGING}/deploy/docker/.env.example"
# 若本地 deploy/docker/.env 已配置登录 RSA 私钥,注入到交付包 .env.example(避免多 worker 登录解密失败)
LOCAL_ENV="${ROOT}/deploy/docker/.env"
if [[ -f "${LOCAL_ENV}" ]]; then
STAGING_ENV="${STAGING}/deploy/docker/.env.example"
if python3 - "${LOCAL_ENV}" "${STAGING_ENV}" <<'PY'
import sys
from pathlib import Path
local_env, staging_env = map(Path, sys.argv[1:3])
rsa_line = next(
(line for line in local_env.read_text().splitlines() if line.startswith("LOGIN_RSA_PRIVATE_KEY_PEM=")),
"",
)
if not rsa_line:
sys.exit(2)
lines: list[str] = []
for line in staging_env.read_text().splitlines():
if line.startswith("# LOGIN_RSA_PRIVATE_KEY_PEM=") or line.startswith("LOGIN_RSA_PRIVATE_KEY_PEM="):
continue
if line.startswith("# 登录 RSA"):
lines.append(
"# 登录 RSA(多 worker/多实例须配置同一私钥;打包时已从 deploy/docker/.env 注入)"
)
continue
if line.startswith("API_REQUEST_LOG_ENABLED="):
lines.append(rsa_line)
lines.append(line)
staging_env.write_text("\n".join(lines) + "\n")
PY
then
echo " 已从 deploy/docker/.env 注入 LOGIN_RSA_PRIVATE_KEY_PEM"
elif [[ $? -eq 2 ]]; then
echo " 警告: deploy/docker/.env 未配置 LOGIN_RSA_PRIVATE_KEY_PEM,交付包内仍为占位;多 worker 下登录可能失败"
else
echo " 错误: 注入 LOGIN_RSA_PRIVATE_KEY_PEM 失败" >&2
exit 1
fi
fi
cp "${ROOT}/deploy/docker/README.md" "${STAGING}/deploy/docker/"
cp -R "${ROOT}/deploy/docker/mysql" "${STAGING}/deploy/docker/"
cp "${ROOT}/docs/sql/zkxw.sql" "${STAGING}/docs/sql/zkxw.sql"