From 60992cb3d99c0654518fff6fee58f6c3e36849ad Mon Sep 17 00:00:00 2001 From: yeuimu <2197651308@qq.com> Date: Tue, 1 Sep 2026 16:21:45 +0800 Subject: [PATCH] deploy: new h5 build, /v2/h5 route, restore /v2-api & /public proxy - replace deploy/h5 with latest h5 build (base /h5/) - nginx: add /v2/h5/ passthrough to v2-admin - nginx: restore lost /v2-api/ and /public/ proxy locations - compose: join inkreach-shared network so v1 admin can resolve v2-admin --- deploy/docker-compose.yml | 11 ++++++ deploy/h5/index.html | 2 +- deploy/h5/static/icons/home/logo_cn.svg | 8 ---- deploy/h5/static/icons/home/logo_en.svg | 14 ------- .../h5/static/icons/products/icon_filter.png | Bin 0 -> 268 bytes .../h5/static/icons/products/icon_search.png | Bin 0 -> 661 bytes .../static/icons/tabbar/tab_product_gray.png | Bin 946 -> 1502 bytes .../icons/tabbar/tab_product_orange.png | Bin 1019 -> 2659 bytes .../images/home/Rectangle_178_1426_1248.png | Bin 176900 -> 0 bytes .../images/home/Rectangle_181_1455_1450.jpg | Bin 8427 -> 7942 bytes .../images/home/Rectangle_181_1455_1456.jpg | Bin 8427 -> 7942 bytes .../images/home/Rectangle_187_1470_1653.jpg | Bin 52150 -> 51110 bytes .../images/home/Rectangle_63_1446_1437.jpg | Bin 8427 -> 7942 bytes .../images/home/Rectangle_63_1455_1461.jpg | Bin 8427 -> 7942 bytes deploy/h5/static/images/home/contact_us.png | Bin 9062 -> 7345 bytes deploy/h5/static/images/home/feat_auto.jpg | Bin 27466 -> 0 bytes deploy/h5/static/images/home/feat_design.jpg | Bin 46053 -> 0 bytes deploy/h5/static/images/home/feat_global.jpg | Bin 42721 -> 0 bytes deploy/h5/static/images/home/feat_store.jpg | Bin 30470 -> 0 bytes .../static/images/home/image_26_1496_1761.jpg | Bin 290836 -> 92056 bytes .../static/images/home/image_28_1498_1767.png | Bin 72791 -> 15846 bytes .../h5/static/images/home/step_01_select.jpg | Bin 26928 -> 0 bytes .../h5/static/images/home/step_02_upload.jpg | Bin 36246 -> 0 bytes deploy/h5/static/images/home/step_03_sell.jpg | Bin 18501 -> 0 bytes .../h5/static/images/home/step_04_produce.jpg | Bin 34697 -> 0 bytes .../images/home/公司简介背景_1461_1606.png | Bin 41922 -> 0 bytes ....9aacc1b6.js => chunk-vendors.6234e216.js} | 4 +- deploy/h5/static/js/index.a2163514.js | 1 - deploy/h5/static/js/index.c5073ea1.js | 1 + .../static/js/pages-index-index.606bd6e8.js | 3 -- .../static/js/pages-index-index.914edb43.js | 3 ++ ...-product-detail-product-detail.5a72d0cd.js | 3 ++ ...-product-detail-product-detail.6c7220bb.js | 3 -- .../js/pages-products-products.bf1de6d2.js | 3 ++ .../js/pages-products-products.d8e521ec.js | 3 -- deploy/nginx/admin.conf | 35 ++++++++++++++++-- 36 files changed, 56 insertions(+), 38 deletions(-) delete mode 100644 deploy/h5/static/icons/home/logo_cn.svg delete mode 100644 deploy/h5/static/icons/home/logo_en.svg create mode 100644 deploy/h5/static/icons/products/icon_filter.png create mode 100644 deploy/h5/static/icons/products/icon_search.png delete mode 100644 deploy/h5/static/images/home/Rectangle_178_1426_1248.png delete mode 100644 deploy/h5/static/images/home/feat_auto.jpg delete mode 100644 deploy/h5/static/images/home/feat_design.jpg delete mode 100644 deploy/h5/static/images/home/feat_global.jpg delete mode 100644 deploy/h5/static/images/home/feat_store.jpg delete mode 100644 deploy/h5/static/images/home/step_01_select.jpg delete mode 100644 deploy/h5/static/images/home/step_02_upload.jpg delete mode 100644 deploy/h5/static/images/home/step_03_sell.jpg delete mode 100644 deploy/h5/static/images/home/step_04_produce.jpg delete mode 100644 deploy/h5/static/images/home/公司简介背景_1461_1606.png rename deploy/h5/static/js/{chunk-vendors.9aacc1b6.js => chunk-vendors.6234e216.js} (61%) delete mode 100644 deploy/h5/static/js/index.a2163514.js create mode 100644 deploy/h5/static/js/index.c5073ea1.js delete mode 100644 deploy/h5/static/js/pages-index-index.606bd6e8.js create mode 100644 deploy/h5/static/js/pages-index-index.914edb43.js create mode 100644 deploy/h5/static/js/pages-product-detail-product-detail.5a72d0cd.js delete mode 100644 deploy/h5/static/js/pages-product-detail-product-detail.6c7220bb.js create mode 100644 deploy/h5/static/js/pages-products-products.bf1de6d2.js delete mode 100644 deploy/h5/static/js/pages-products-products.d8e521ec.js diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index fd10952..a719afe 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -50,7 +50,18 @@ services: - ./certbot/acme:/etc/nginx/certs:ro extra_hosts: - "host.docker.internal:host-gateway" + networks: + default: + shared: + # 接入 v2 栈的共享网络,使 /v2/* 的 proxy_pass 能解析 v2-admin / v2-api + aliases: + - v1-admin volumes: pgdata: uploads: + +networks: + shared: + external: true + name: inkreach-shared diff --git a/deploy/h5/index.html b/deploy/h5/index.html index e97ad32..82a27b6 100644 --- a/deploy/h5/index.html +++ b/deploy/h5/index.html @@ -1,2 +1,2 @@