lushuncheng 5 роки тому
батько
коміт
705ce5a95b
1 змінених файлів з 28 додано та 14 видалено
  1. 28 14
      config/nginx/template/proginn.nginx.conf

+ 28 - 14
config/nginx/template/proginn.nginx.conf

@@ -4,8 +4,10 @@ server {
     server_name {{domain}}.test-jishuin.proginn.com;
     root /code/web/phphub/public;
     index index.php;
-    rewrite ^/u/(\d+)$ /user/$1 last;
-    rewrite ^/c/([a-z0-9]+)$ /user/collect_article/$1 last;
+    rewrite ^/u/(\d+)$ /jishuin/u/$1 last;
+    rewrite ^/user/(\d+)$ /u/$1 permanent;
+    rewrite ^/user/collect_article/(\d+)$ /jishuin/c/$1 permanent;
+    rewrite ^/c/([a-z0-9]+)$ /jishuin/c/$1 last;
     location / {
         if (!-e $request_filename) {
             rewrite  ^(.*)$  /index.php?s=$1  last;
@@ -20,9 +22,21 @@ server {
     location ~ ^/(composer.json|composer.lock|ThinkPHP/|vendor/|src/|bin/|App/|.git) {
         deny all;
     }
+    location ^~ /c/ {
+        proxy_pass http://127.0.0.1:3000;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
+    }
+    location ^~ /u/ {
+        proxy_pass http://127.0.0.1:3000;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
+    }
+    location ^~ /jishuin/ {
+        proxy_pass http://127.0.0.1:3000;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
+    }
     location ^~ /user/ {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
     }
     location ^~ /user/quit {
         proxy_pass http://127.0.0.1;
@@ -31,12 +45,12 @@ server {
 
     location ^~ /topics/create {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
     }
 
     location ~ /topics/\d+/edit {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
     }
 
     location ^~ /file/proxyUpload {
@@ -54,11 +68,11 @@ server {
     }
     location ^~ /.nuxt {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
     }
     location ^~ /_nuxt {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
     }
 
     location ~ \.php$ {
@@ -92,9 +106,9 @@ server {
     location ~ ^/(composer.json|composer.lock|ThinkPHP/|vendor/|src/|bin/|App/|.git) {
         deny all;
     }
-    location ^~ /user/ {
+    location ^~ /kaifain {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-kaifain.proginn.com;
     }
     location ^~ /user/quit {
         proxy_pass http://127.0.0.1;
@@ -116,11 +130,11 @@ server {
     }
     location ^~ /.nuxt {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-kaifain.proginn.com;
     }
     location ^~ /_nuxt {
         proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host {{domain}}.test.proginn.com;
+        proxy_set_header Host {{domain}}.test-kaifain.proginn.com;
     }
 
     location ~ \.php$ {
@@ -131,7 +145,7 @@ server {
     }
     access_log /data/log/kafain.log proginn-logid;
 }
-
+# proginn
 server {
     listen 80;
     server_name {{domain}}.test.proginn.com;
@@ -327,7 +341,7 @@ server {
     }
     location ^~ /upload_image {
         proxy_pass http://127.0.0.1;
-        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
+        proxy_set_header Host {{domain}}.test.proginn.com;
     }
     access_log /data/log/boss.log proginn-logid;
 }
@@ -351,7 +365,7 @@ server {
     }
     location ^~ /upload_image {
         proxy_pass http://127.0.0.1;
-        proxy_set_header Host {{domain}}.test-jishuin.proginn.com;
+        proxy_set_header Host {{domain}}.test.proginn.com;
     }
     access_log /data/log/festival.log proginn-logid;
 }