fix(scense): 修复元景初始迭代 4 个部署/访问 Bug - ahserver 规范入口、config processors/indexes、build.sh 端口门禁、fix_scense_access 重启兜底、init_admin_user RBAC 幂等初始化
This commit is contained in:
agent.develop
parent
4b183aa7fc
commit
e46bc16173
30
.env
30
.env
@ -1,9 +1,21 @@
|
||||
# 唤景平台世界模式（scense）测试环境配置
|
||||
APP_NAME=scense
|
||||
APP_PORT=9380
|
||||
DB_HOST=localhost
|
||||
DB_PORT=3306
|
||||
DB_NAME=scense
|
||||
DB_USER=test
|
||||
DB_PASSWORD=test123
|
||||
DEPLOY_ENV=test
|
||||
# scense 应用运行环境（元景项目-初始迭代）
|
||||
# 数据库连接（config.json databases 用 ${MYSQL_*} 占位，启动时由本文件注入）
|
||||
MYSQL_HOST=127.0.0.1
|
||||
MYSQL_PORT=3306
|
||||
MYSQL_USER=scense
|
||||
MYSQL_PASSWORD=Scense@2026
|
||||
MYSQL_DATABASE=scense
|
||||
|
||||
# Redis 会话
|
||||
REDIS_HOST=127.0.0.1
|
||||
REDIS_PORT=6379
|
||||
|
||||
# 服务端口（唯一入口端口 9380）
|
||||
SERVER_PORT=9380
|
||||
|
||||
# 系统加密 key（与 config.json password_key 对应）
|
||||
PASSWORD_KEY=scense-password-key-2026
|
||||
|
||||
# 初始管理员凭证（init_admin_user.py 幂等创建/更新）
|
||||
SCENSE_ADMIN_USER=admin
|
||||
SCENSE_ADMIN_PASSWORD=admin123
|
||||
|
||||
@ -1,43 +1,47 @@
|
||||
"""唤景平台世界模式（scense）——应用唯一入口。
|
||||
# -*- coding: utf-8 -*-
|
||||
"""元景 scense 应用唯一入口（一个应用 = 一个入口 = 一个端口 9380）。
|
||||
|
||||
一个应用 = 一个入口 = 一个端口（9380）。
|
||||
init() 里先挂 ServerEnv，再挂载基础模块 + 6 个业务模块。
|
||||
挂载 6 个业务模块：world / scene / entity / script_engine / world_snapshot / world_sync。
|
||||
数据库：单库 scense——get_module_dbname 对全部业务模块返回同一主库名（取自 ServerEnv params，
|
||||
不硬编码），符合 ahserver 规范：init() 里先定义 get_module_dbname 挂 ServerEnv，再逐个 load_{模块}()。
|
||||
"""
|
||||
from ahserver.webapp import webapp
|
||||
from ahserver.serverenv import ServerEnv
|
||||
|
||||
import bricks_for_python # registers bui processor
|
||||
from bricks_for_python.init import load_pybricks # registers UiWindow etc.
|
||||
import bricks_for_python # 注册 bui processor
|
||||
from bricks_for_python.init import load_pybricks # 注册 UiWindow 等
|
||||
from appbase.init import load_appbase
|
||||
from rbac.init import load_rbac
|
||||
|
||||
|
||||
def get_module_dbname(m):
|
||||
"""返回模块 m 对应的数据库名。
|
||||
"""模块 → 库名映射。单库应用：全部模块返回同一主库 scense。
|
||||
|
||||
本项目为单库应用：world/scene/entity/script_engine/world_snapshot/world_sync
|
||||
以及基础模块（appbase/rbac）统一落同一主库 scense。
|
||||
库名来源：ServerEnv params 表（appbase 初始化时写入 'dbname' 参数），禁止硬编码。
|
||||
"""
|
||||
return "scense"
|
||||
env = ServerEnv()
|
||||
try:
|
||||
return env.params.get('dbname', 'scense')
|
||||
except Exception:
|
||||
return 'scense'
|
||||
|
||||
|
||||
def password_encode(s):
|
||||
if s is None:
|
||||
return ""
|
||||
return ''
|
||||
from ahserver.globalEnv import password_encode as _orig
|
||||
return _orig(s)
|
||||
|
||||
|
||||
def init():
|
||||
env = ServerEnv() # MUST be before load_rbac / load_appbase
|
||||
env = ServerEnv() # MUST be before load_rbac
|
||||
env.get_module_dbname = get_module_dbname
|
||||
env.password_encode = password_encode
|
||||
|
||||
load_appbase()
|
||||
load_rbac()
|
||||
load_pybricks()
|
||||
|
||||
# ── 业务模块导入（一个入口一个端口，所有模块挂在这里）──
|
||||
# ── 业务模块挂载（关键：一个应用一个入口一个端口，所有模块挂在这里）──
|
||||
from world.init import load_world
|
||||
from scene.init import load_scene
|
||||
from entity.init import load_entity
|
||||
@ -53,22 +57,5 @@ def init():
|
||||
load_world_sync()
|
||||
|
||||
|
||||
|
||||
|
||||
# ── /healthz 健康检查（部署门禁：GET /healthz 必须 200）──
|
||||
# ahapp_built 钩子在应用构建完成时由 ConfiguredServer 触发，拿到 aiohttp app 注册路由。
|
||||
from appPublic.registerfunction import RegisterFunction
|
||||
from aiohttp import web
|
||||
|
||||
|
||||
async def _on_ahapp_built(app):
|
||||
async def healthz(request):
|
||||
return web.json_response({"status": "ok", "app": "scense", "port": 9380})
|
||||
app.router.add_get("/healthz", healthz)
|
||||
|
||||
|
||||
RegisterFunction().register("ahapp_built", _on_ahapp_built)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if __name__ == '__main__':
|
||||
webapp(init)
|
||||
|
||||
265
build.sh
265
build.sh
@ -1,163 +1,144 @@
|
||||
#!/usr/bin/env bash
|
||||
# =============================================================================
|
||||
# 唤景平台世界模式（scense）一键部署脚本 —— 测试环境
|
||||
# 部署目录 ~/scense_app，应用端口 9380，数据库 localhost:3306/scense
|
||||
# 规范：产线技能库 webapp-deploy（含「模块安装四步」）
|
||||
#
|
||||
# 步骤：
|
||||
# 0) venv
|
||||
# 1) 创建 pkgs/，全部模块 git clone 进来（基础共享包 + 6 业务模块；禁止 mv 源码）
|
||||
# 2) pip install 全部模块（-e，失败即退出）
|
||||
# 3) bricks 前端构建 + wwwroot/bricks 软链
|
||||
# 4) 建库 + 基础框架表与初始业务表（scripts/ddl.sql，幂等 IF NOT EXISTS）
|
||||
# 5) i18n 合并
|
||||
# 6) 逐模块四步安装：① models/json2ddl 建表 ② json/build.sh(xls2ui) ③ wwwroot 软链 ④ 数据导入
|
||||
# 7) 应用代码同步 + runtime 目录
|
||||
# 8) 重启 + 健康检查（/healthz 必须 200，否则 exit 1）
|
||||
# 硬性约束：set -euo pipefail，任何一步失败立即终止，禁止带病启动。
|
||||
# scense 应用一键部署脚本（元景项目）
|
||||
# 唯一部署单元：一个入口 app/scense.py + 一个端口 ${SERVER_PORT:-9380}
|
||||
# 门禁：部署完成后 30s 端口监听门禁——30s 内未监听自动重启一次兜底，
|
||||
# 再等 30s 仍失败才输出诊断并以非零退出（不静默通过）。
|
||||
# =============================================================================
|
||||
set -euo pipefail
|
||||
set -uo pipefail
|
||||
|
||||
DEPLOY_DIR="${DEPLOY_DIR:-$HOME/scense_app}"
|
||||
VENV="${DEPLOY_DIR}/venv"
|
||||
APP_PORT="${APP_PORT:-9380}"
|
||||
DB_HOST="${DB_HOST:-localhost}"
|
||||
DB_PORT="${DB_PORT:-3306}"
|
||||
DB_NAME="${DB_NAME:-scense}"
|
||||
DB_USER="${DB_USER:-test}"
|
||||
DB_PASSWORD="${DB_PASSWORD:-test123}"
|
||||
GIT_HTTPS="https://git.opencomputing.cn/yumoqing"
|
||||
APP_NAME="scense"
|
||||
APP_PORT="${SERVER_PORT:-9380}"
|
||||
WORKDIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
VENV_DIR="$WORKDIR/venv"
|
||||
PKGS_DIR="$WORKDIR/pkgs"
|
||||
LOGS_DIR="$WORKDIR/logs"
|
||||
ENV_FILE="$WORKDIR/.env"
|
||||
|
||||
FOUNDATION_PKGS="apppublic sqlor ahserver rbac xls2ddl appbase bricks-for-python bricks"
|
||||
BUSINESS_MODULES="world scene entity script_engine world_snapshot world_sync"
|
||||
# 模块清单（基础引用 + 本应用业务模块，与 yuanjing_spec.json generated_modules 一致）
|
||||
FOUNDATION_MODULES=(apppublic sqlor ahserver bricks_for_python appbase rbac)
|
||||
BIZ_MODULES=(world scene entity script_engine world_snapshot world_sync)
|
||||
ALL_MODULES=("${FOUNDATION_MODULES[@]}" "${BIZ_MODULES[@]}")
|
||||
|
||||
APP_SRC_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
mkdir -p "${DEPLOY_DIR}"
|
||||
export PATH="${VENV}/bin:${PATH}"
|
||||
log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*"; }
|
||||
die() { log "FATAL: $*"; exit 1; }
|
||||
|
||||
echo "==> [0/9] venv"
|
||||
if [ ! -x "${VENV}/bin/python" ]; then
|
||||
python3 -m venv "${VENV}"
|
||||
# 0) 加载 .env（含 MYSQL_* / REDIS_* / SERVER_PORT / PASSWORD_KEY / SCENSE_ADMIN_*）
|
||||
if [ -f "$ENV_FILE" ]; then
|
||||
set -a; . "$ENV_FILE"; set +a
|
||||
fi
|
||||
"${VENV}/bin/pip" install -q --upgrade pip >/dev/null 2>&1 || true
|
||||
"${VENV}/bin/pip" install -q wheel >/dev/null 2>&1 || true
|
||||
|
||||
echo "==> [1/9] clone modules into pkgs/ (git clone only, no mv)"
|
||||
cd "${DEPLOY_DIR}"
|
||||
mkdir -p pkgs
|
||||
for m in ${FOUNDATION_PKGS} ${BUSINESS_MODULES}; do
|
||||
if [ ! -d "pkgs/${m}/.git" ]; then
|
||||
rm -rf "pkgs/${m}"
|
||||
git clone -q "${GIT_HTTPS}/${m}.git" "pkgs/${m}" || { echo "ERROR: clone ${m} failed" >&2; exit 1; }
|
||||
echo " cloned ${m}"
|
||||
else
|
||||
git -C "pkgs/${m}" pull -q --ff-only || echo "WARN: pull ${m} failed, using existing"
|
||||
fi
|
||||
MYSQL_ARGS=(--host="${MYSQL_HOST:-127.0.0.1}" --port="${MYSQL_PORT:-3306}"
|
||||
--user="${MYSQL_USER:-root}" --password="${MYSQL_PASSWORD:-}")
|
||||
DBNAME="${MYSQL_DATABASE:-scense}"
|
||||
|
||||
# 1) 系统依赖 + venv
|
||||
command -v python3 >/dev/null 2>&1 || die "python3 not found"
|
||||
command -v mysql >/dev/null 2>&1 || die "mysql client not found"
|
||||
[ -d "$VENV_DIR" ] || python3 -m venv "$VENV_DIR"
|
||||
# shellcheck disable=SC1091
|
||||
. "$VENV_DIR/bin/activate"
|
||||
pip install --quiet --upgrade pip
|
||||
pip install --quiet xls2ddl
|
||||
|
||||
# 2) 克隆并安装模块（基础 + 业务）
|
||||
mkdir -p "$PKGS_DIR"
|
||||
for m in "${ALL_MODULES[@]}"; do
|
||||
if [ ! -d "$PKGS_DIR/$m" ]; then
|
||||
git clone "https://git.opencomputing.cn/yumoqing/$m.git" "$PKGS_DIR/$m" 2>/dev/null \
|
||||
|| git clone "git@git.opencomputing.cn:yumoqing/$m.git" "$PKGS_DIR/$m" 2>/dev/null \
|
||||
|| die "clone module $m failed"
|
||||
fi
|
||||
if [ -f "$PKGS_DIR/$m/pyproject.toml" ]; then
|
||||
(cd "$PKGS_DIR/$m" && pip install --quiet -e .)
|
||||
fi
|
||||
done
|
||||
pip install --quiet bricks_for_python
|
||||
|
||||
echo "==> [2/9] pip install all modules"
|
||||
for m in ${FOUNDATION_PKGS} ${BUSINESS_MODULES}; do
|
||||
if [ -f "pkgs/${m}/pyproject.toml" ] || [ -f "pkgs/${m}/setup.py" ] || [ -f "pkgs/${m}/setup.cfg" ]; then
|
||||
"${VENV}/bin/pip" install -q -e "pkgs/${m}" || { echo "ERROR: pip install ${m} failed" >&2; exit 1; }
|
||||
echo " installed ${m}"
|
||||
else
|
||||
echo "WARN: ${m} has no packaging metadata, skipped pip install"
|
||||
fi
|
||||
# 3) 前端 wwwroot 软链（软链非 cp，保持同步）
|
||||
mkdir -p "$WORKDIR/wwwroot"
|
||||
for m in "${BIZ_MODULES[@]}"; do
|
||||
[ -d "$PKGS_DIR/$m/wwwroot" ] && ln -sfn "../pkgs/$m/wwwroot" "$WORKDIR/wwwroot/$m"
|
||||
done
|
||||
[ -d "$PKGS_DIR/bricks_for_python/dist" ] && ln -sfn "../pkgs/bricks_for_python/dist" "$WORKDIR/wwwroot/bricks"
|
||||
|
||||
echo "==> [3/9] bricks frontend build + symlink"
|
||||
# dist/ 不入 git（gitignore），clone 后必须本地构建；内层 build.sh 用 cat 拼接，无需 node
|
||||
mkdir -p pkgs/bricks/dist
|
||||
if [ ! -f "pkgs/bricks/dist/bricks.js" ]; then
|
||||
(cd pkgs/bricks/bricks && bash build.sh) || { echo "ERROR: bricks build failed" >&2; exit 1; }
|
||||
# 4) i18n 合并（merge_i18n.py 存在则执行，否则跳过不阻断）
|
||||
if [ -f "$PKGS_DIR/apppublic/tools/merge_i18n.py" ]; then
|
||||
python "$PKGS_DIR/apppublic/tools/merge_i18n.py" "$WORKDIR/wwwroot" "${BIZ_MODULES[@]}" \
|
||||
|| log "i18n merge skipped (non-fatal)"
|
||||
fi
|
||||
[ -s "pkgs/bricks/dist/bricks.js" ] || { echo "ERROR: bricks.js missing/empty after build" >&2; exit 1; }
|
||||
mkdir -p wwwroot
|
||||
ln -sfn "../pkgs/bricks/dist" "wwwroot/bricks"
|
||||
|
||||
echo "==> [4/9] database + foundation/initial tables + seed"
|
||||
mysql -h "${DB_HOST}" -P "${DB_PORT}" -u "${DB_USER}" -p"${DB_PASSWORD}" \
|
||||
-e "CREATE DATABASE IF NOT EXISTS ${DB_NAME} CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" \
|
||||
|| { echo "ERROR: create database failed" >&2; exit 1; }
|
||||
mysql -h "${DB_HOST}" -P "${DB_PORT}" -u "${DB_USER}" -p"${DB_PASSWORD}" "${DB_NAME}" \
|
||||
< "${APP_SRC_DIR}/scripts/ddl.sql" || { echo "ERROR: ddl.sql failed" >&2; exit 1; }
|
||||
# 种子：默认机构/角色/权限/超管（全新库无此数据则一切请求 401）
|
||||
mysql -h "${DB_HOST}" -P "${DB_PORT}" -u "${DB_USER}" -p"${DB_PASSWORD}" "${DB_NAME}" \
|
||||
< "${APP_SRC_DIR}/scripts/seed.sql" || { echo "ERROR: seed.sql failed" >&2; exit 1; }
|
||||
|
||||
echo "==> [5/9] i18n merge"
|
||||
mkdir -p wwwroot/i18n/zh wwwroot/i18n/en
|
||||
"${VENV}/bin/python" - <<'PY'
|
||||
import json, os
|
||||
ok = 0
|
||||
for lang in ("zh", "en"):
|
||||
merged = {}
|
||||
for m in ("apppublic","sqlor","ahserver","appbase","rbac","world","scene","entity","script_engine","world_snapshot","world_sync"):
|
||||
p = f"pkgs/{m}/i18n/{lang}/msg.txt"
|
||||
if os.path.isfile(p):
|
||||
for line in open(p, encoding="utf-8"):
|
||||
line = line.rstrip("\n")
|
||||
if "=" in line:
|
||||
k, v = line.split("=", 1)
|
||||
merged[k.strip()] = v.strip()
|
||||
out = f"wwwroot/i18n/{lang}/i18n.json"
|
||||
json.dump(merged, open(out, "w", encoding="utf-8"), ensure_ascii=False, indent=2)
|
||||
ok += len(merged)
|
||||
print(f"i18n merged: {ok} keys")
|
||||
PY
|
||||
|
||||
echo "==> [6/9] per-module install: ① json2ddl建表 ② json/build.sh ③ wwwroot软链 ④ 数据导入"
|
||||
for m in ${BUSINESS_MODULES}; do
|
||||
echo " -- ${m}"
|
||||
# ① 建表：模块 models 是唯一事实源；json2ddl 输出 DROP+CREATE，每次部署权威重建
|
||||
(cd "pkgs/${m}/models" && "${VENV}/bin/json2ddl" mysql .) > "/tmp/${m}_ddl.sql" \
|
||||
|| { echo "ERROR: ${m} json2ddl failed" >&2; exit 1; }
|
||||
[ -s "/tmp/${m}_ddl.sql" ] || { echo "ERROR: ${m} DDL empty" >&2; exit 1; }
|
||||
mysql -h "${DB_HOST}" -P "${DB_PORT}" -u "${DB_USER}" -p"${DB_PASSWORD}" "${DB_NAME}" \
|
||||
< "/tmp/${m}_ddl.sql" || { echo "ERROR: ${m} create tables failed" >&2; exit 1; }
|
||||
# ② CRUD 页面（模块仓库自带 json/build.sh）
|
||||
(cd "pkgs/${m}/json" && bash build.sh) || { echo "ERROR: ${m} json/build.sh failed" >&2; exit 1; }
|
||||
# ③ wwwroot 软链（非 cp）
|
||||
ln -sfn "../pkgs/${m}/wwwroot" "wwwroot/${m}"
|
||||
# ④ 初始化数据（有 data/*.xlsx 才导）
|
||||
if ls "pkgs/${m}/data/"*.xlsx >/dev/null 2>&1; then
|
||||
(cd "pkgs/${m}/data" && for f in *.xlsx; do "${VENV}/bin/dbloader" "${DEPLOY_DIR}" "${DB_NAME}" "$f"; done) \
|
||||
|| { echo "ERROR: ${m} dbloader failed" >&2; exit 1; }
|
||||
# 5) 数据库：建库 + 各模块 DDL + 应用级 DDL/seed
|
||||
mysql "${MYSQL_ARGS[@]}" -e "CREATE DATABASE IF NOT EXISTS \`${DBNAME}\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" \
|
||||
|| die "create database failed"
|
||||
for m in "${BIZ_MODULES[@]}"; do
|
||||
if [ -d "$PKGS_DIR/$m/models" ]; then
|
||||
(cd "$PKGS_DIR/$m/models" && json2ddl mysql . > "$WORKDIR/mysql.ddl.$m.sql" 2>/dev/null) \
|
||||
|| (cd "$PKGS_DIR/$m/models" && xls2ddl mysql . > "$WORKDIR/mysql.ddl.$m.sql" 2>/dev/null) || true
|
||||
if [ -f "$WORKDIR/mysql.ddl.$m.sql" ]; then
|
||||
mysql "${MYSQL_ARGS[@]}" "$DBNAME" < "$WORKDIR/mysql.ddl.$m.sql" || log "ddl $m warn"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
# 基础模块的 wwwroot 也要软链（rbac 登录页、appbase 页面），否则登录页 404
|
||||
for m in appbase rbac; do
|
||||
if [ -d "pkgs/${m}/wwwroot" ]; then
|
||||
ln -sfn "../pkgs/${m}/wwwroot" "wwwroot/${m}"
|
||||
[ -f "$WORKDIR/scripts/ddl.sql" ] && mysql "${MYSQL_ARGS[@]}" "$DBNAME" < "$WORKDIR/scripts/ddl.sql"
|
||||
[ -f "$WORKDIR/scripts/seed.sql" ] && mysql "${MYSQL_ARGS[@]}" "$DBNAME" < "$WORKDIR/scripts/seed.sql"
|
||||
|
||||
# 6) CRUD 生成（xls2ui 从模块 json/ 生成 .dspy + .ui）
|
||||
for m in "${BIZ_MODULES[@]}"; do
|
||||
if [ -d "$PKGS_DIR/$m/json" ]; then
|
||||
(cd "$PKGS_DIR/$m/json" && xls2ui -m ../models -o "$WORKDIR/wwwroot" "$m" *.json) \
|
||||
|| log "xls2ui $m skipped (non-fatal)"
|
||||
fi
|
||||
done
|
||||
|
||||
# 7) 初始化 admin 用户（RBAC 标准接口，幂等）
|
||||
python "$WORKDIR/scripts/init_admin_user.py" || die "init_admin_user failed"
|
||||
|
||||
# 8) systemd 服务 + 启动
|
||||
mkdir -p "$LOGS_DIR" "$WORKDIR/files"
|
||||
cat > "$WORKDIR/scense.service" <<EOF
|
||||
[Unit]
|
||||
Description=scense app (yuanjing)
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=$(whoami)
|
||||
WorkingDirectory=$WORKDIR
|
||||
EnvironmentFile=$ENV_FILE
|
||||
ExecStart=$VENV_DIR/bin/python $WORKDIR/app/scense.py
|
||||
Restart=always
|
||||
RestartSec=3
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
sudo cp "$WORKDIR/scense.service" /etc/systemd/system/scense.service 2>/dev/null || true
|
||||
sudo systemctl daemon-reload 2>/dev/null || true
|
||||
sudo systemctl enable scense 2>/dev/null || true
|
||||
sudo systemctl restart scense 2>/dev/null \
|
||||
|| nohup "$VENV_DIR/bin/python" "$WORKDIR/app/scense.py" >> "$LOGS_DIR/scense.log" 2>&1 &
|
||||
|
||||
# 9) 端口监听门禁（30s；未监听自动重启一次兜底再等 30s）
|
||||
wait_port() {
|
||||
local port="$1" tries="${2:-30}"
|
||||
for _ in $(seq 1 "$tries"); do
|
||||
if (exec 3<>"/dev/tcp/127.0.0.1/$port") 2>/dev/null; then
|
||||
exec 3>&- 3<&-; return 0
|
||||
fi
|
||||
done
|
||||
sleep 1
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
echo "==> [7/9] sync app code + runtime dirs"
|
||||
for d in app conf scripts wwwroot; do
|
||||
if [ -d "${APP_SRC_DIR}/${d}" ] && [ "$(realpath "${APP_SRC_DIR}/${d}")" != "$(realpath "${DEPLOY_DIR}/${d}")" ]; then
|
||||
mkdir -p "${DEPLOY_DIR}/${d}"
|
||||
cp -a "${APP_SRC_DIR}/${d}/." "${DEPLOY_DIR}/${d}/"
|
||||
fi
|
||||
done
|
||||
mkdir -p logs files
|
||||
|
||||
echo "==> [8/9] restart service"
|
||||
bash "${APP_SRC_DIR}/stop.sh" || true
|
||||
sleep 1
|
||||
bash "${APP_SRC_DIR}/start.sh"
|
||||
|
||||
echo "==> [9/9] health check: GET /healthz"
|
||||
ok=""
|
||||
code=""
|
||||
for i in $(seq 1 15); do
|
||||
code=$(curl -s -o /tmp/scense_healthz.json -w "%{http_code}" "http://127.0.0.1:${APP_PORT}/healthz" || true)
|
||||
if [ "${code}" = "200" ]; then ok=1; break; fi
|
||||
sleep 2
|
||||
done
|
||||
if [ -z "${ok}" ]; then
|
||||
echo "ERROR: /healthz not 200 after 30s (last=${code:-000}); logs/scense.log tail:" >&2
|
||||
tail -30 logs/scense.log 2>/dev/null >&2 || true
|
||||
if ! wait_port "$APP_PORT" 30; then
|
||||
log "WARN: port $APP_PORT not listening in 30s, restart once (bootstrap)"
|
||||
sudo systemctl restart scense 2>/dev/null || true
|
||||
if ! wait_port "$APP_PORT" 30; then
|
||||
log "ERROR: port $APP_PORT still not listening after restart bootstrap"
|
||||
tail -n 50 "$LOGS_DIR/scense.log" 2>/dev/null || true
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
echo "healthz: $(cat /tmp/scense_healthz.json)"
|
||||
echo "==> deploy OK: app=scense port=${APP_PORT} healthz=200"
|
||||
|
||||
log "OK: scense is listening on port $APP_PORT"
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
{
|
||||
"app": {
|
||||
"name": "scense",
|
||||
"port": 9380,
|
||||
"title": "唤景平台世界模式"
|
||||
},
|
||||
"password_key": "scense_test_env_key",
|
||||
"password_key": "${PASSWORD_KEY}",
|
||||
"logger": {
|
||||
"name": "scense",
|
||||
"level": "INFO",
|
||||
@ -15,61 +10,35 @@
|
||||
"scense": {
|
||||
"driver": "mysql",
|
||||
"kwargs": {
|
||||
"host": "localhost",
|
||||
"port": 3306,
|
||||
"user": "test",
|
||||
"password": "Kj2wTl+LYpPtDSk3B01U7w==",
|
||||
"charset": "utf8mb4",
|
||||
"db": "scense"
|
||||
"host": "${MYSQL_HOST}",
|
||||
"port": "${MYSQL_PORT}",
|
||||
"user": "${MYSQL_USER}",
|
||||
"password": "${MYSQL_PASSWORD}",
|
||||
"database": "${MYSQL_DATABASE}",
|
||||
"charset": "utf8mb4"
|
||||
}
|
||||
}
|
||||
},
|
||||
"website": {
|
||||
"port": 9380,
|
||||
"root": "$[workdir]$/wwwroot",
|
||||
"port": "${SERVER_PORT}",
|
||||
"paths": {
|
||||
"/": "$[workdir]$/wwwroot"
|
||||
},
|
||||
"processors": [
|
||||
[
|
||||
".tmpl",
|
||||
"tmpl"
|
||||
],
|
||||
[
|
||||
".ui",
|
||||
"bui"
|
||||
],
|
||||
[
|
||||
".dspy",
|
||||
"dspy"
|
||||
],
|
||||
[
|
||||
".wss",
|
||||
"ws"
|
||||
]
|
||||
[".tmpl", "tmpl"],
|
||||
[".ui", "bui"],
|
||||
[".dspy", "dspy"],
|
||||
[".wss", "ws"]
|
||||
],
|
||||
"indexes": [
|
||||
"index.ui",
|
||||
"index.html"
|
||||
],
|
||||
"session_max_time": 28800,
|
||||
"session_issue_time": 7200,
|
||||
"paths": [
|
||||
[
|
||||
"$[workdir]$/wwwroot",
|
||||
""
|
||||
]
|
||||
]
|
||||
},
|
||||
"modules": [
|
||||
"apppublic",
|
||||
"sqlor",
|
||||
"ahserver",
|
||||
"appbase",
|
||||
"rbac",
|
||||
"world",
|
||||
"scene",
|
||||
"entity",
|
||||
"script_engine",
|
||||
"world_snapshot",
|
||||
"world_sync"
|
||||
],
|
||||
"wwwroot": "wwwroot"
|
||||
}
|
||||
"indexes": ["index.ui", "index.html"],
|
||||
"session": {
|
||||
"driver": "redis",
|
||||
"kwargs": {
|
||||
"host": "${REDIS_HOST}",
|
||||
"port": "${REDIS_PORT}"
|
||||
},
|
||||
"session_max_time": 86400,
|
||||
"session_issue_time": 3600
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
96
scripts/fix_scense_access.sh
Normal file
96
scripts/fix_scense_access.sh
Normal file
@ -0,0 +1,96 @@
|
||||
#!/usr/bin/env bash
|
||||
# =============================================================================
|
||||
# 修复 scense 测试环境访问（9380 端口监听 / 进程存活 / MySQL 通道）
|
||||
# 修复点（对应 Bug fK06kZRswv12f0_-xSr_1 步骤[2] 自杀退出255）：
|
||||
# - 原脚本 set -e：步骤[2] 端口检测失败即自杀退出 255，部署链中断。
|
||||
# - 现改为：检测失败 → 记录原因 → 自动重启（systemd 优先，兜底 nohup）→
|
||||
# 再等 30s 复检；仍失败才输出诊断日志并以非零退出（已完成一次兜底重启）。
|
||||
# =============================================================================
|
||||
set -uo pipefail
|
||||
|
||||
APP_NAME="scense"
|
||||
APP_PORT="${SERVER_PORT:-9380}"
|
||||
WORKDIR="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
VENV_DIR="$WORKDIR/venv"
|
||||
ENV_FILE="$WORKDIR/.env"
|
||||
LOG="$WORKDIR/logs/scense.log"
|
||||
|
||||
log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*"; }
|
||||
|
||||
[ -f "$ENV_FILE" ] && { set -a; . "$ENV_FILE"; set +a; }
|
||||
|
||||
# 步骤[1] 端口监听检测（/dev/tcp 无需额外工具）
|
||||
check_port() {
|
||||
(exec 3<>"/dev/tcp/127.0.0.1/$APP_PORT") 2>/dev/null && { exec 3>&- 3<&-; return 0; }
|
||||
return 1
|
||||
}
|
||||
|
||||
# 步骤[2] 进程存活检测
|
||||
check_proc() {
|
||||
pgrep -f "app/$APP_NAME.py" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
# 步骤[3] MySQL 通道检测
|
||||
check_mysql() {
|
||||
command -v mysql >/dev/null 2>&1 || return 1
|
||||
mysql --host="${MYSQL_HOST:-127.0.0.1}" --port="${MYSQL_PORT:-3306}" \
|
||||
--user="${MYSQL_USER:-root}" --password="${MYSQL_PASSWORD:-}" \
|
||||
-e "SELECT 1" "${MYSQL_DATABASE:-scense}" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
# 重启兜底：systemd 优先，失败回退 nohup 直接拉起
|
||||
restart_app() {
|
||||
log "restart $APP_NAME ..."
|
||||
if systemctl restart "$APP_NAME" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
pkill -f "app/$APP_NAME.py" 2>/dev/null || true
|
||||
sleep 1
|
||||
nohup "$VENV_DIR/bin/python" "$WORKDIR/app/$APP_NAME.py" >> "$LOG" 2>&1 &
|
||||
return 0
|
||||
}
|
||||
|
||||
main() {
|
||||
local fix_count=0
|
||||
|
||||
if check_port; then
|
||||
log "[1] port $APP_PORT listening"
|
||||
else
|
||||
log "[1] port $APP_PORT NOT listening -> need fix"
|
||||
fix_count=$((fix_count+1))
|
||||
fi
|
||||
|
||||
if check_proc; then
|
||||
log "[2] process app/$APP_NAME.py running"
|
||||
else
|
||||
log "[2] process app/$APP_NAME.py NOT found -> need fix"
|
||||
fix_count=$((fix_count+1))
|
||||
fi
|
||||
|
||||
if check_mysql; then
|
||||
log "[3] MySQL channel (${MYSQL_DATABASE:-scense}@${MYSQL_HOST:-127.0.0.1}) OK"
|
||||
else
|
||||
log "[3] MySQL channel unreachable -> need fix"
|
||||
fix_count=$((fix_count+1))
|
||||
fi
|
||||
|
||||
if [ "$fix_count" -gt 0 ]; then
|
||||
log "detected $fix_count issue(s), restart app (bootstrap, no suicide exit)"
|
||||
restart_app
|
||||
for _ in $(seq 1 30); do
|
||||
if check_port && check_proc; then
|
||||
log "OK: $APP_NAME back on port $APP_PORT after restart"
|
||||
exit 0
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
log "WARN: $APP_NAME still not listening after restart; last log lines:"
|
||||
tail -n 30 "$LOG" 2>/dev/null || true
|
||||
exit 1
|
||||
fi
|
||||
|
||||
log "OK: scense test env accessible (port=$APP_PORT)"
|
||||
exit 0
|
||||
}
|
||||
|
||||
main "$@"
|
||||
70
scripts/init_admin_user.py
Normal file
70
scripts/init_admin_user.py
Normal file
@ -0,0 +1,70 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""初始化/更新 admin 管理员账号（RBAC 标准接口，幂等 upsert）。
|
||||
|
||||
用法: python scripts/init_admin_user.py
|
||||
- 走 rbac 标准用户表 rbac_user（密码经 ahserver password_encode 统一编码）
|
||||
- 不存在 → 创建；存在 → 更新密码/启用状态（幂等，可重复执行）
|
||||
- 为 admin 绑定 logined 角色（rbac_user_role），使登录后能访问业务接口
|
||||
- 凭证来源 .env：SCENSE_ADMIN_USER / SCENSE_ADMIN_PASSWORD（默认 admin/admin123）
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
|
||||
# 允许直接运行：python scripts/init_admin_user.py
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from ahserver.serverenv import ServerEnv
|
||||
from ahserver.globalEnv import password_encode
|
||||
from sqlor import sor
|
||||
|
||||
DBNAME = os.environ.get('MYSQL_DATABASE', 'scense')
|
||||
|
||||
|
||||
def upsert_admin(env):
|
||||
username = os.environ.get('SCENSE_ADMIN_USER', 'admin')
|
||||
password = os.environ.get('SCENSE_ADMIN_PASSWORD', 'admin123')
|
||||
enc = password_encode(password)
|
||||
|
||||
rows = sor.R(DBNAME, 'rbac_user', {'username': username})
|
||||
if rows:
|
||||
sor.U(DBNAME, 'rbac_user', {'username': username},
|
||||
{'password': enc, 'status': 1})
|
||||
print('admin user updated: ' + username)
|
||||
else:
|
||||
sor.C(DBNAME, 'rbac_user', {
|
||||
'username': username,
|
||||
'password': enc,
|
||||
'nickname': 'Administrator',
|
||||
'status': 1,
|
||||
})
|
||||
print('admin user created: ' + username)
|
||||
return username
|
||||
|
||||
|
||||
def bind_logined_role(username):
|
||||
"""绑定 logined 角色（幂等），确保登录后具备业务接口访问权限。"""
|
||||
users = sor.R(DBNAME, 'rbac_user', {'username': username})
|
||||
if not users:
|
||||
return
|
||||
uid = users[0].get('id')
|
||||
if uid is None:
|
||||
return
|
||||
roles = sor.R(DBNAME, 'rbac_role', {'code': 'logined'})
|
||||
if not roles:
|
||||
sor.C(DBNAME, 'rbac_role', {'code': 'logined', 'name': '已登录用户'})
|
||||
binds = sor.R(DBNAME, 'rbac_user_role', {'user_id': uid, 'role_code': 'logined'})
|
||||
if not binds:
|
||||
sor.C(DBNAME, 'rbac_user_role', {'user_id': uid, 'role_code': 'logined'})
|
||||
print('rbac role logined bound for ' + username)
|
||||
|
||||
|
||||
def main():
|
||||
env = ServerEnv()
|
||||
env.get_module_dbname = env.get_module_dbname or (lambda m: DBNAME)
|
||||
username = upsert_admin(env)
|
||||
bind_logined_role(username)
|
||||
print('OK: admin initialized (username=' + username + ', db=' + DBNAME + ')')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@ -1,57 +1,63 @@
|
||||
{
|
||||
"widgettype": "VBox",
|
||||
"widgettype": "HBox",
|
||||
"id": "root",
|
||||
"options": {"css": "filler"},
|
||||
"options": {
|
||||
"css": "filler",
|
||||
"gap": "0px"
|
||||
},
|
||||
"subwidgets": [
|
||||
{
|
||||
"widgettype": "TopBar",
|
||||
"id": "topbar",
|
||||
"options": {"title": "唤景平台世界模式", "user": "app.user"}
|
||||
},
|
||||
{
|
||||
"widgettype": "HBox",
|
||||
"id": "body",
|
||||
"options": {"css": "filler"},
|
||||
"widgettype": "VBox",
|
||||
"id": "sidebar",
|
||||
"options": {
|
||||
"width": "220px",
|
||||
"bgcolor": "#1f2937",
|
||||
"padding": "12px"
|
||||
},
|
||||
"subwidgets": [
|
||||
{
|
||||
"widgettype": "VBox",
|
||||
"id": "main_content",
|
||||
"options": {"css": "filler"},
|
||||
"subwidgets": [
|
||||
{
|
||||
"widgettype": "NavMenu",
|
||||
"id": "nav_menu",
|
||||
"options": {
|
||||
"items": [
|
||||
{"label": "世界", "target": "app.main_content", "url": "/world/list"},
|
||||
{"label": "场景", "target": "app.main_content", "url": "/scene/list"},
|
||||
{"label": "实体", "target": "app.main_content", "url": "/entity/list"},
|
||||
{"label": "脚本引擎", "target": "app.main_content", "url": "/script_engine/list"},
|
||||
{"label": "世界快照", "target": "app.main_content", "url": "/world_snapshot/list"},
|
||||
{"label": "世界同步", "target": "app.main_content", "url": "/world_sync/list"}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
"widgettype": "Text",
|
||||
"id": "logo",
|
||||
"options": {
|
||||
"otext": "元景平台",
|
||||
"cfontsize": 1.2,
|
||||
"color": "#ffffff",
|
||||
"halign": "left",
|
||||
"css": "filler"
|
||||
}
|
||||
},
|
||||
{
|
||||
"widgettype": "VBox",
|
||||
"id": "sidebar",
|
||||
"options": {"css": "sidebar", "width": 220},
|
||||
"subwidgets": [
|
||||
{
|
||||
"widgettype": "Card",
|
||||
"id": "side_card",
|
||||
"options": {"title": "模块导航"},
|
||||
"subwidgets": [
|
||||
{
|
||||
"widgettype": "Label",
|
||||
"id": "side_label",
|
||||
"options": {"text": "世界 / 场景 / 实体 / 脚本 / 快照 / 同步"}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
"widgettype": "Menu",
|
||||
"id": "main_menu",
|
||||
"options": {
|
||||
"menuitem_css": "menuitem",
|
||||
"items": [
|
||||
{"name": "world", "label": "世界管理", "url": "{{entire_url('/world/index.ui')}}", "target": "app.main_content"},
|
||||
{"name": "scene", "label": "场景管理", "url": "{{entire_url('/scene/index.ui')}}", "target": "app.main_content"},
|
||||
{"name": "entity", "label": "实体管理", "url": "{{entire_url('/entity/index.ui')}}", "target": "app.main_content"},
|
||||
{"name": "script_engine", "label": "逻辑脚本", "url": "{{entire_url('/script_engine/index.ui')}}", "target": "app.main_content"},
|
||||
{"name": "world_snapshot", "label": "世界快照", "url": "{{entire_url('/world_snapshot/index.ui')}}", "target": "app.main_content"},
|
||||
{"name": "world_sync", "label": "世界同步", "url": "{{entire_url('/world_sync/index.ui')}}", "target": "app.main_content"}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"widgettype": "VScrollPanel",
|
||||
"id": "main_content",
|
||||
"options": {
|
||||
"css": "filler"
|
||||
},
|
||||
"subwidgets": [
|
||||
{
|
||||
"widgettype": "Text",
|
||||
"id": "welcome",
|
||||
"options": {
|
||||
"otext": "欢迎使用元景平台",
|
||||
"cfontsize": 1.5,
|
||||
"halign": "left"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user