From c8bd617ae015a29926184ed591866ad755026ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Mon, 27 Jul 2026 13:05:00 +0800 Subject: [PATCH] refactor: remove license migration steps --- scripts/deploy.sh | 34 ---------------------------------- scripts/migrate-tenant.sh | 33 --------------------------------- 2 files changed, 67 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 150fee2..0fc07ed 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -776,23 +776,6 @@ if [ "$DEPLOY_MODE" = "new" ]; then warn "租户记录暂未就绪(tenant-service 可能仍在初始化),继续部署" fi - # 为 bootstrap 创建的 app 补写 app_licenses(license-service 独立 DB 写入) - _LIC_SQL_NEW="$(mktemp /tmp/xuqm-lic-new-XXXXXX.sql)" - cat > "$_LIC_SQL_NEW" <<'LIC_SQL_NEW' -INSERT INTO app_licenses (app_key, name, max_devices, registered_devices, - expires_at, is_active, remark, created_at, updated_at) -SELECT a.app_key, a.name, 1000, 0, NULL, 1, '私有化新建', NOW(), NOW() -FROM t_app a -WHERE a.app_key != 'ak_409e217e4aa14254ad73ad3c' -ON DUPLICATE KEY UPDATE updated_at = updated_at; -LIC_SQL_NEW - docker exec -i "$MYSQL_CTR" \ - mysql -u "$MYSQL_USERNAME" -p"${MYSQL_PASSWORD}" "$MYSQL_DATABASE" \ - --default-character-set=utf8mb4 < "$_LIC_SQL_NEW" 2>/dev/null \ - && ok "app_licenses 记录已为所有应用创建" \ - || warn "app_licenses 写入遇到警告,继续" - rm -f "$_LIC_SQL_NEW" - else # ── 迁移租户:调用公有平台 export API → 私有平台 import API ── @@ -849,23 +832,6 @@ print(t.get('email', ''), t.get('username', '')) DEPLOY_TENANT_USERNAME=$(printf '%s' "$_TENANT_INFO" | awk '{print $2}') ok "租户 ${DEPLOY_TENANT_EMAIL} 数据已成功导入" - # 为迁移的所有 app 在 app_licenses 表创建 license 记录(license-service 独立 DB 写入) - _LIC_SQL="$(mktemp /tmp/xuqm-lic-XXXXXX.sql)" - cat > "$_LIC_SQL" <<'LIC_SQL' -INSERT INTO app_licenses (app_key, name, max_devices, registered_devices, - expires_at, is_active, remark, created_at, updated_at) -SELECT a.app_key, a.name, 1000, 0, NULL, 1, '私有化迁移', NOW(), NOW() -FROM t_app a -WHERE a.app_key != 'ak_409e217e4aa14254ad73ad3c' -ON DUPLICATE KEY UPDATE updated_at = updated_at; -LIC_SQL - docker exec -i "$MYSQL_CTR" \ - mysql -u "$MYSQL_USERNAME" -p"${MYSQL_PASSWORD}" "$MYSQL_DATABASE" \ - --default-character-set=utf8mb4 < "$_LIC_SQL" 2>/dev/null \ - && ok "app_licenses 记录已为所有迁移应用创建" \ - || warn "app_licenses 写入遇到警告,继续" - rm -f "$_LIC_SQL" - # 更新 bootstrap.env,防止重启时重新创建占位租户 cat > "$ROOT_DIR/config/tenant/bootstrap.env" < "$_LICENSE_SQL" - - if dst_mysql < "$_LICENSE_SQL" 2>/dev/null; then - printf ' app_licenses 记录已创建(共 %s 个应用,max_devices=1000,永不过期)\n' "$APP_COUNT" - else - warn "app_licenses 写入遇到警告,请手动检查" - fi - rm -f "$_LICENSE_SQL" - - # 验证写入结果 - _LICENSE_COUNT="$(dst_mysql -N -e "SELECT COUNT(*) FROM app_licenses WHERE app_key IN (${APP_KEYS_SQL})" 2>/dev/null || echo 0)" - printf ' DB check: %s/%s 个 app_licenses 记录就绪\n' "${_LICENSE_COUNT:-0}" "$APP_COUNT" -fi - -audit "migrate-tenant" "LICENSE_SYNCED" "tenant=$TENANT_ID apps=$APP_COUNT" - # --------------------------------------------------------------------------- # Step 5 — Restart tenant-service to flush any cached state # ---------------------------------------------------------------------------