hy/hy-app-monitor
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: target yumiadmin admin frontend site

Browse Source
This commit is contained in:
zhx 2026-06-26 14:37:28 +08:00
parent 1aa3365ecb
commit c493d335e6
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@ -54,13 +54,13 @@ ADMIN_FRONTEND_SSH_USER=root
ADMIN_FRONTEND_SSH_PORT=22 ADMIN_FRONTEND_SSH_PORT=22
ADMIN_FRONTEND_SSH_USE_SUDO=0 ADMIN_FRONTEND_SSH_USE_SUDO=0
ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin
ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site/yumiadmin-acc
ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml
ADMIN_FRONTEND_COMPOSE_SERVICE=caddy ADMIN_FRONTEND_COMPOSE_SERVICE=caddy
ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json
ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next
ADMIN_FRONTEND_DIST_DIR=apps/dist ADMIN_FRONTEND_DIST_DIR=apps/dist
ADMIN_FRONTEND_PUBLIC_URL=https://yumi-admin.haiyihy.com ADMIN_FRONTEND_PUBLIC_URL=https://yumiadmin-acc.global-interaction.com
CHATAPP_CRON_ENABLED=1 CHATAPP_CRON_ENABLED=1
CHATAPP_CRON_REPO_URL=git@gitea.haiyihy.com:hy/chatapp-cron.git CHATAPP_CRON_REPO_URL=git@gitea.haiyihy.com:hy/chatapp-cron.git
CHATAPP_CRON_REPO_ROOT=/opt/deploy/sources/chatapp-cron CHATAPP_CRON_REPO_ROOT=/opt/deploy/sources/chatapp-cron

4
.env.example
View File

@ -67,13 +67,13 @@ ADMIN_FRONTEND_SSH_USER=root
ADMIN_FRONTEND_SSH_PORT=22 ADMIN_FRONTEND_SSH_PORT=22
ADMIN_FRONTEND_SSH_USE_SUDO=0 ADMIN_FRONTEND_SSH_USE_SUDO=0
ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin
ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site/yumiadmin-acc
ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml
ADMIN_FRONTEND_COMPOSE_SERVICE=caddy ADMIN_FRONTEND_COMPOSE_SERVICE=caddy
ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json
ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next
ADMIN_FRONTEND_DIST_DIR=apps/dist ADMIN_FRONTEND_DIST_DIR=apps/dist
ADMIN_FRONTEND_PUBLIC_URL=https://yumi-admin.haiyihy.com ADMIN_FRONTEND_PUBLIC_URL=https://yumiadmin-acc.global-interaction.com
CHATAPP_CRON_ENABLED=1 CHATAPP_CRON_ENABLED=1
CHATAPP_CRON_REPO_URL=git@gitea.haiyihy.com:hy/chatapp-cron.git CHATAPP_CRON_REPO_URL=git@gitea.haiyihy.com:hy/chatapp-cron.git
CHATAPP_CRON_REPO_ROOT=/opt/deploy/sources/chatapp-cron CHATAPP_CRON_REPO_ROOT=/opt/deploy/sources/chatapp-cron

4
README.md
View File

@ -111,13 +111,13 @@ ADMIN_FRONTEND_SSH_HOST=10.2.1.2
ADMIN_FRONTEND_SSH_USER=root ADMIN_FRONTEND_SSH_USER=root
ADMIN_FRONTEND_SSH_PORT=22 ADMIN_FRONTEND_SSH_PORT=22
ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin
ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site/yumiadmin-acc
ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml
ADMIN_FRONTEND_COMPOSE_SERVICE=caddy ADMIN_FRONTEND_COMPOSE_SERVICE=caddy
ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json
ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next
ADMIN_FRONTEND_DIST_DIR=apps/dist ADMIN_FRONTEND_DIST_DIR=apps/dist
ADMIN_FRONTEND_PUBLIC_URL=https://yumi-admin.haiyihy.com ADMIN_FRONTEND_PUBLIC_URL=https://yumiadmin-acc.global-interaction.com
``` ```
通用模块里的 `Cron 部署` 用于发布 `chatapp-cron`，需要目标机已有 `docker-compose.yml` 和 `service.env`。部署流程会构建 `week-star-job` 二进制，上传到目标机，再执行 compose 重建： 通用模块里的 `Cron 部署` 用于发布 `chatapp-cron`，需要目标机已有 `docker-compose.yml` 和 `service.env`。部署流程会构建 `week-star-job` 二进制，上传到目标机，再执行 compose 重建：

6
core/config.py
View File

@ -265,10 +265,10 @@ ADMIN_FRONTEND_SSH_PORT = env_int("ADMIN_FRONTEND_SSH_PORT", SSH_PORT)
ADMIN_FRONTEND_SSH_USE_SUDO = env_str("ADMIN_FRONTEND_SSH_USE_SUDO", "0").lower() in {"1", "true", "yes", "on"} ADMIN_FRONTEND_SSH_USE_SUDO = env_str("ADMIN_FRONTEND_SSH_USE_SUDO", "0").lower() in {"1", "true", "yes", "on"}
# Admin 前端远端运行目录。 # Admin 前端远端运行目录。
ADMIN_FRONTEND_REMOTE_DIR = env_str("ADMIN_FRONTEND_REMOTE_DIR", "/opt/yumi-admin/frontend-admin").strip() or "/opt/yumi-admin/frontend-admin" ADMIN_FRONTEND_REMOTE_DIR = env_str("ADMIN_FRONTEND_REMOTE_DIR", "/opt/yumi-admin/frontend-admin").strip() or "/opt/yumi-admin/frontend-admin"
# Admin 前端静态站点目录。 # Admin 前端静态站点目录；chatapp3 admin 只发布到 yumiadmin-acc 子站，不占用 Caddy 根目录。
ADMIN_FRONTEND_SITE_DIR = ( ADMIN_FRONTEND_SITE_DIR = (
env_str("ADMIN_FRONTEND_SITE_DIR", f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site").strip() env_str("ADMIN_FRONTEND_SITE_DIR", f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site/yumiadmin-acc").strip()
or f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site" or f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site/yumiadmin-acc"
) )
# Admin 前端 compose 文件路径。 # Admin 前端 compose 文件路径。
ADMIN_FRONTEND_COMPOSE_FILE = ( ADMIN_FRONTEND_COMPOSE_FILE = (

2
localbox/.env.local
View File

@ -156,7 +156,7 @@ LIKEI_EXTERNAL_LOCAL_DISK_READ_COMPAT=false
LIKEI_EXTERNAL_OSS_MODE=tencent-cos LIKEI_EXTERNAL_OSS_MODE=tencent-cos
LIKEI_FRAMEWORK_NACOS_STOP_KEY=CxILm9hA1b9hF3Hl LIKEI_FRAMEWORK_NACOS_STOP_KEY=CxILm9hA1b9hF3Hl
LIKEI_FRONTEND_ADMIN_CONSOLE_UPSTREAM=10.2.1.16:2700 LIKEI_FRONTEND_ADMIN_CONSOLE_UPSTREAM=10.2.1.16:2700
LIKEI_FRONTEND_ADMIN_DOMAIN=yumi-admin.haiyihy.com LIKEI_FRONTEND_ADMIN_DOMAIN=yumiadmin-acc.global-interaction.com
LIKEI_FRONTEND_ADMIN_GOLANG_UPSTREAM=10.2.1.16:2900 LIKEI_FRONTEND_ADMIN_GOLANG_UPSTREAM=10.2.1.16:2900
LIKEI_FRONTEND_ADMIN_INSTANCE_ID=ins-p11begwe LIKEI_FRONTEND_ADMIN_INSTANCE_ID=ins-p11begwe
LIKEI_GAME_BAISHUN2FUN_APP_CHANNEL=lotfun LIKEI_GAME_BAISHUN2FUN_APP_CHANNEL=lotfun

2
tests/test_service_release.py
View File

@ -180,7 +180,7 @@ class ServiceReleaseTargetsTests(unittest.TestCase):
@patch("monitors.yumi.service_release.ADMIN_FRONTEND_IP", "10.2.1.2") @patch("monitors.yumi.service_release.ADMIN_FRONTEND_IP", "10.2.1.2")
@patch("monitors.yumi.service_release.ADMIN_FRONTEND_HOST", "admin-platform") @patch("monitors.yumi.service_release.ADMIN_FRONTEND_HOST", "admin-platform")
@patch("monitors.yumi.service_release.ADMIN_FRONTEND_REPO_URL", "git@example.com:hy/chatapp3-admin.git") @patch("monitors.yumi.service_release.ADMIN_FRONTEND_REPO_URL", "git@example.com:hy/chatapp3-admin.git")
@patch("monitors.yumi.service_release.ADMIN_FRONTEND_SITE_DIR", "/opt/yumi-admin/frontend-admin/site") @patch("monitors.yumi.service_release.ADMIN_FRONTEND_SITE_DIR", "/opt/yumi-admin/frontend-admin/site/yumiadmin-acc")
@patch("monitors.yumi.service_release.frontend_release_enabled", return_value=True) @patch("monitors.yumi.service_release.frontend_release_enabled", return_value=True)
@patch( @patch(
"monitors.yumi.service_release.frontend_release_display", "monitors.yumi.service_release.frontend_release_display",