wangxuming/NianAIGC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复token缺失bug

Browse Source
This commit is contained in:
brother7
2026-06-01 13:40:17 +08:00
parent 1e032637de
commit 13ddc66cfe
6 changed files with 123 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/deploy.sh
View File

@@ -18,12 +18,30 @@ else
exit 1
fi
if [ ! -f .env.local ]; then
if command -v node >/dev/null 2>&1; then
node scripts/ensure-deploy-env.mjs "$ROOT_DIR"
elif [ ! -f .env.local ]; then
cp .env.example .env.local
echo "[deploy] Created .env.local from .env.example"
echo "[deploy] Real generation requires API keys in .env.local. Empty keys keep mock/local flows available."
fi
if ! grep -q '^ZHINIAN_INTERNAL_WORKER_TOKEN=' .env.local || grep -q '^ZHINIAN_INTERNAL_WORKER_TOKEN=$\|^ZHINIAN_INTERNAL_WORKER_TOKEN=change-me-worker-token$' .env.local; then
if command -v openssl >/dev/null 2>&1; then
WORKER_TOKEN="$(openssl rand -hex 32)"
if grep -q '^ZHINIAN_INTERNAL_WORKER_TOKEN=' .env.local; then
sed -i.bak "s/^ZHINIAN_INTERNAL_WORKER_TOKEN=.*/ZHINIAN_INTERNAL_WORKER_TOKEN=${WORKER_TOKEN}/" .env.local
rm -f .env.local.bak
else
printf '\nZHINIAN_INTERNAL_WORKER_TOKEN=%s\n' "$WORKER_TOKEN" >> .env.local
fi
echo "[deploy] Added ZHINIAN_INTERNAL_WORKER_TOKEN to .env.local"
else
echo "[deploy] ZHINIAN_INTERNAL_WORKER_TOKEN is required in .env.local, and openssl was not found to generate one."
exit 1
fi
fi
mkdir -p .runtime/data .runtime/uploads .runtime/generated-results
if [ -z "${APP_PORT:-}" ] && [ -f .env.local ]; then

44
scripts/ensure-deploy-env.mjs Normal file
View File

@@ -0,0 +1,44 @@
#!/usr/bin/env node
import { randomBytes } from "node:crypto";
import { copyFileSync, existsSync, readFileSync, writeFileSync } from "node:fs";
import { join, resolve } from "node:path";
const rootDir = resolve(process.argv[2] || process.cwd());
const envPath = join(rootDir, ".env.local");
const examplePath = join(rootDir, ".env.example");
if (!existsSync(envPath)) {
if (!existsSync(examplePath)) {
console.error("[deploy] .env.local was not found and .env.example is missing.");
process.exit(1);
}
copyFileSync(examplePath, envPath);
console.log("[deploy] Created .env.local from .env.example");
console.log("[deploy] Real generation requires API keys in .env.local. Empty keys keep mock/local flows available.");
}
let envText = readFileSync(envPath, "utf8");
const token = readEnvValue(envText, "ZHINIAN_INTERNAL_WORKER_TOKEN");
if (!token || token === "change-me-worker-token") {
envText = setEnvValue(envText, "ZHINIAN_INTERNAL_WORKER_TOKEN", randomBytes(32).toString("hex"));
writeFileSync(envPath, envText);
console.log("[deploy] Added ZHINIAN_INTERNAL_WORKER_TOKEN to .env.local");
}
function readEnvValue(text, name) {
const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
const match = text.match(new RegExp(`^${escaped}=(.*)$`, "m"));
return match?.[1]?.trim().replace(/^['"]|['"]$/g, "") || "";
}
function setEnvValue(text, name, value) {
const line = `${name}=${value}`;
const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
if (new RegExp(`^${escaped}=`, "m").test(text)) {
return text.replace(new RegExp(`^${escaped}=.*$`, "m"), line);
}
const suffix = text.endsWith("\n") ? "" : "\n";
return `${text}${suffix}${line}\n`;
}

7
scripts/worker.mjs
View File

@@ -1,12 +1,17 @@
#!/usr/bin/env node
const baseUrl = (process.env.ZHINIAN_WORKER_BASE_URL || process.env.NEXT_PUBLIC_APP_URL || "http://127.0.0.1:3000").replace(/\/$/, "");
const token = process.env.ZHINIAN_INTERNAL_WORKER_TOKEN || "";
const token = (process.env.ZHINIAN_INTERNAL_WORKER_TOKEN || "").trim();
const intervalMs = positiveInt(process.env.ZHINIAN_WORKER_INTERVAL_MS, 5000);
const limit = positiveInt(process.env.ZHINIAN_WORKER_BATCH_SIZE, 3);
const once = process.argv.includes("--once");
const workerId = process.env.ZHINIAN_WORKER_ID || `worker-${Math.random().toString(16).slice(2)}`;
if (process.env.NODE_ENV === "production" && !token) {
console.error("[zhinian-worker] ZHINIAN_INTERNAL_WORKER_TOKEN is required in production. Set the same value for zhinian-aigc and zhinian-worker.");
process.exit(1);
}
async function tick() {
const response = await fetch(`${baseUrl}/api/internal/worker/tick`, {
method: "POST",