改回 user.runxian.top

deploy/nginx-runxian-dukang.conf

@@ -1,14 +1,13 @@
 # 杜康好客 — runxian.top（HTTP）
-# 三端 H5 统一入口 m.runxian.top/{user,shop,partner}/（微信网页授权单域名）
-# 旧子域名 user/shop/partner 301 到统一入口；webadmin → 8094；dkapi → 8090
+# 三端 H5 统一入口 user.runxian.top/{user,shop,partner}/（微信网页授权单域名）
+# shop/partner 子域名 301 到 user.runxian.top 路径；webadmin → 8094；dkapi → 8090
 
-# --- 统一 H5 入口（证书就绪前 HTTP；HTTPS 见 dukang-runxian-ssl.conf）---
 server {
     listen 80;
-    server_name m.runxian.top;
+    server_name user.runxian.top;
 
-    access_log /var/log/nginx/dukang/runxian-m.access.log main;
-    error_log  /var/log/nginx/dukang/runxian-m.error.log warn;
+    access_log /var/log/nginx/dukang/runxian-h5.access.log main;
+    error_log  /var/log/nginx/dukang/runxian-h5.error.log warn;
 
     client_max_body_size 20m;
 
@@ -51,28 +50,30 @@ server {
         alias /opt/dukang-haoke/apps/h5-partner/dist/;
         try_files $uri $uri/ index.html;
     }
-}
 
-# --- 旧 H5 子域名 → 统一入口（保留书签/推广链接）---
-server {
-    listen 80;
-    server_name user.runxian.top;
-    return 301 http://m.runxian.top/user$request_uri;
+    location / {
+        return 302 /user$request_uri;
+    }
 }
 
 server {
     listen 80;
     server_name shop.runxian.top;
-    return 301 http://m.runxian.top/shop$request_uri;
+    return 301 http://user.runxian.top/shop$request_uri;
 }
 
 server {
     listen 80;
     server_name partner.runxian.top;
-    return 301 http://m.runxian.top/partner$request_uri;
+    return 301 http://user.runxian.top/partner$request_uri;
+}
+
+server {
+    listen 80;
+    server_name m.runxian.top;
+    return 301 http://user.runxian.top$request_uri;
 }
 
-# --- HTTP: API ---
 server {
     listen 80;
     server_name dkapi.runxian.top;
@@ -98,7 +99,6 @@ server {
     }
 }
 
-# --- HTTP: admin-web ---
 server {
     listen 80;
     server_name webadmin.runxian.top;