revert: 撤掉单仓内的门户骨架,门户以独立仓 iotlcm-public/website 为唯一来源
mirror-to-gitee / mirror (push) Successful in 58s
mirror-to-gitee / mirror (push) Successful in 58s
原因 门户已拆分为独立仓 iotlcm-public/website(11:28 建仓,13:13 完成 fafc743「并入旧骨架独有价值内容,修 favicon 落地路径与过渡形态绑定」), 是门户的唯一事实来源。本仓6c8314a合并进来的 website/ 是拆分前的 旧骨架,继续保留会导致: - 两份门户代码持续漂移,同一问题要在两个仓各修一遍 - 单仓 compose / gateway / Makefile 里残留 with-website profile 与 /www/ 路由,与独立仓「门户自起容器、独立端口」的既定方案冲突 本提交 = revert -m 1 6c8314a,效果等同回到e98f856(git diffe98f856HEAD 为空)。回退点: tag backup/before-revert-portal-20261104 ->6c8314a门户部署改为(164 上,独立目录,不动 iotlcm-deploy): git clone https://git.5iot.com/iotlcm-public/website.git ~/iotlcm/website cd ~/iotlcm/website PORTAL_BIND_ADDR=0.0.0.0 docker compose -f deploy/docker-compose.yml up -d --build
This commit is contained in:
@@ -10,7 +10,6 @@
|
||||
# 路由:
|
||||
# / -> 管理端(admin-ui,内部已代理 /api/ 到 admin-svr)
|
||||
# /docs/ -> 文档站(docs)
|
||||
# /www/ -> 官网(website,需启用 with-website profile)
|
||||
# /openapi/ -> 对外 API(openapi)
|
||||
# /route/open/ -> 运营商能力代理(openapi)
|
||||
#
|
||||
@@ -25,9 +24,6 @@ resolver 127.0.0.11 valid=10s ipv6=off;
|
||||
upstream gw_admin_ui { zone gw_admin_ui 64k; server admin-ui:80 resolve; }
|
||||
upstream gw_openapi { zone gw_openapi 64k; server openapi:8000 resolve; }
|
||||
upstream gw_docs { zone gw_docs 64k; server docs:80 resolve; }
|
||||
# 官网(可选组件,profile with-website)。容器未启动时该路径返回 502,
|
||||
# 不影响其它路径;resolve 让容器 IP 变化后自动跟随。
|
||||
upstream gw_website { zone gw_website 64k; server website:80 resolve; }
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
@@ -55,18 +51,6 @@ server {
|
||||
proxy_pass http://gw_docs;
|
||||
}
|
||||
|
||||
# ---------- 官网(子路径形态) ----------
|
||||
# 官网以 SITE_BASE=/www/ 构建时,资源引用是 /www/assets/...,
|
||||
# 所以这里不能剥前缀(proxy_pass 不带尾斜杠),由官网容器内的
|
||||
# alias 规则自己剥。域名定下来后改用独立 vhost,这段可删。
|
||||
location = /www {
|
||||
return 301 /www/;
|
||||
}
|
||||
|
||||
location ^~ /www/ {
|
||||
proxy_pass http://gw_website;
|
||||
}
|
||||
|
||||
# ---------- 对外 API:版本化接口 ----------
|
||||
location ^~ /openapi/ {
|
||||
proxy_pass http://gw_openapi;
|
||||
|
||||
Reference in New Issue
Block a user