@dazhicheng/common 1.0.18 → 1.0.20

package/.gitlab-ci.yml

@@ -12,10 +12,12 @@ variables:
   image: node:24-alpine
   tags:
     - build
+  resource_group: build
   script:
-    - npm install -g pnpm
-    - pnpm up:dzc
+    - npm install -g pnpm@latest
+    - pnpm config set registry https://registry.npmmirror.com
     - pnpm install --no-frozen-lockfile
+    - pnpm up:dzc
     - pnpm "build:${NODE_ENV}"
   artifacts:
     paths:

package/nginx_dev.conf

@@ -1,26 +1,34 @@
-# HTTP 服务器 - 保持原有配置
-server {
-  <<<listen>>>
-  server_name localhost;
-  charset utf-8;
-
-  root /usr/share/nginx/html;
-  index index.html;
-
-  location / {
-    try_files $uri $uri/ /index.html;
-    <<<CORS配置>>>
-  }
-
-  location /dev-api/ {
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-Ip $remote_addr;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_pass http://fulfillment-dev.tiantai-jp.com:11000/;
-  }
-
-  error_page   500 502 503 504  /50x.html;
-  location = /50x.html {
-    root   html;
-  }
-}
+# 根据请求Host分配后端地址（公网Host走公网，默认走内网）
+map $http_host $dev_backend_addr {
+  default                   192.168.128.215:11000;   # 默认走内网
+  120.76.61.203:13000       14.220.235.21:11000;     # 公网Host走公网
+}
+
+# HTTP 服务器 - 保持原有配置
+server {
+  <<<listen>>>
+  server_name localhost;
+  charset utf-8;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+    <<<CORS配置>>>
+  }
+
+  location /dev-api/ {
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-Ip $remote_addr;
+    proxy_set_header X-Forwarded-For $remote_addr;
+
+    rewrite ^/dev-api/(.*) /$1 break;
+    proxy_pass http://$dev_backend_addr/;
+  }
+
+  error_page   500 502 503 504  /50x.html;
+  location = /50x.html {
+    root   html;
+  }
+}

package/nginx_test.conf

@@ -1,26 +1,34 @@
-# HTTP 服务器 - 保持原有配置
-server {
-  <<<listen>>>
-  server_name localhost;
-  charset utf-8;
-
-  root /usr/share/nginx/html;
-  index index.html;
-
-  location / {
-    try_files $uri $uri/ /index.html;
-    <<<CORS配置>>>
-  }
-
-  location /test-api/ {
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-Ip $remote_addr;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_pass http://fulfillment-test.tiantai-jp.com:11000/;
-  }
-
-  error_page   500 502 503 504  /50x.html;
-  location = /50x.html {
-    root   html;
-  }
-}
+# 根据请求Host分配后端地址（公网Host走公网，默认走内网）
+map $http_host $test_backend_addr {
+  default                   192.168.127.72:11000;    # 默认走内网
+  120.76.61.203:13000       116.6.49.180:11001;     # 公网Host走公网
+}
+
+# HTTP 服务器 - 保持原有配置
+server {
+  <<<listen>>>
+  server_name localhost;
+  charset utf-8;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+    <<<CORS配置>>>
+  }
+
+  location /test-api/ {
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-Ip $remote_addr;
+    proxy_set_header X-Forwarded-For $remote_addr;
+
+    rewrite ^/test-api/(.*) /$1 break;
+    proxy_pass http://$test_backend_addr;
+  }
+
+  error_page   500 502 503 504  /50x.html;
+  location = /50x.html {
+    root   html;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/common",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "共享配置文件",
   "type": "module",
   "types": "./src/types/index.d.ts",