sync

nginx/prod-192.168.1.60/nginx.conf

@@ -10,6 +10,8 @@ events {
 }
 
 http {
+  etag off;
+   add_header    Cache-Control  max-age=3600;
   include mime.types;
   default_type application/octet-stream;
   sendfile on;
@@ -104,7 +106,7 @@ http {
   }
 
   #upstream reports {
-  #  server 192.168.1.84:8015;
+  #  server 192.168.1.71:8015;
   #}
 
   # =====================================================================
@@ -119,6 +121,7 @@ http {
   include sites/https8878.conf;
   # include sites/https443.conf;
   include sites/block_ips.conf;
+  include sites/n.conf;
 
 }
 

nginx/prod-192.168.1.60/sites/http80.conf

@@ -1,23 +1,86 @@
 server {
 	listen 80;
 	charset utf-8;
+	error_page 404 /40x.html;
 
-	location /nginx_status {
-		stub_status on;
-		access_log off;
+
+
+	location = / {
+		rewrite / /admin/ last;
 	}
 
-	location / {
-		alias /home/admin/project/examcloud/static/examcloud-admin-web/dist/;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	location = /admin {
+		rewrite /admin /admin/ last;
 	}
 
 	location ^~ /admin/ {
-		rewrite ^/(.*) /index.html break;
-		root /home/admin/project/examcloud/static/examcloud-admin-web/dist/;
+		alias /home/admin/project/examcloud/static-new/admin/dist/;
+		try_files $uri $uri/ /admin/index.html;
+	}
+
+	location ^~ /admin/js/ {
+		alias /home/admin/project/examcloud/static-new/admin/dist/js/;
+		try_files $uri $uri/ =404;
+	}
+
+	location = /oe-web {
+		rewrite /oe-web /oe-web/ last;
+	}
+
+	location ^~ /oe-web/ {
+		alias /home/admin/project/examcloud/static-new/oe-web/dist/;
+		try_files $uri $uri/ /oe-web/index.html;
+	}
+
+	location ^~ /oe-web/js/ {
+		alias /home/admin/project/examcloud/static-new/oe-web/dist/js/;
+		try_files $uri $uri/ =404;
+	}
+
+	# location ~* (js|css|img|fonts|models) {
+	#	root /home/admin/project/examcloud/static-new/oe-web/dist/;
+	# }
+
+	location = /oe-wap {
+		rewrite /oe-wap /oe-wap/ last;
+	}
+
+	location ^~ /oe-wap/ {
+		alias /home/admin/project/examcloud/static-new/oe-wap/dist/;
+		try_files $uri $uri/ /oe-wap/index.html;
 	}
 
+	location = /photo-upload {
+		rewrite /photo-upload /photo-upload/ last;
+	}
+
+	location ^~ /photo-upload/ {
+		alias /home/admin/project/examcloud/static-new/photo-upload/dist/;
+		try_files $uri $uri/ /photo-upload/index.html;
+	}
+
+	location ^~ /electron-config/ {
+		alias /home/admin/project/examcloud/static-new/electron-config/;
+	}
+
+	location ^~ /downloads/ {
+		alias /home/admin/project/examcloud/static-new/downloads/;
+	}
+
+	location ^~ /oe/facepp_api {
+		proxy_pass https://api-cn.faceplusplus.com/facepp/v3;
+	}
+
+	location ^~ /jenkins {
+		proxy_pass http://localhost:9000/jenkins;
+	}
+
+	location ^~ /resource.js {
+		proxy_pass http://basic/resource.js;
+	}
+
+
+
 	location ^~ /api/ecs_core/ {
 		proxy_pass http://basic;
 			proxy_set_header X-Real-IP $remote_addr;

nginx/prod-192.168.1.60/sites/http8007.conf

@@ -4,6 +4,7 @@ server {
 
 	location ^~ / {
 		proxy_pass http://exchange;
+		#proxy_pass https://www.exam-cloud.cn/api/exchange;
 	}
 
 }

nginx/prod-192.168.1.60/sites/http8700.conf

@@ -48,3 +48,4 @@ server {
 
 }
 
+

nginx/prod-192.168.1.60/sites/https443.conf

@@ -63,10 +63,6 @@ server {
 		proxy_pass https://api-cn.faceplusplus.com/facepp/v3;
 	}
 
-	#location ^~ /jenkins {
-	#	proxy_pass http://localhost:9000/jenkins;
-	#}
-
 	location ^~ /resource.js {
 		proxy_pass http://basic/resource.js;
 	}

nginx/prod-192.168.1.60/sites/https8878.conf

@@ -9,6 +9,13 @@ server {
 	ssl_session_timeout	5m;
 	ssl_ciphers	HIGH:!aNULL:!MD5;
 	ssl_prefer_server_ciphers on;
+	
+ 	location  /oe/login/
+          {
+            rewrite ^/oe/login/(.*)\.ecs\.qmth\.com\.cn$ https://$1.exam-cloud.cn/oe-web permanent;
+          }
+
+        #rewrite ".*"   https://ccnu.exam-cloud.cn/oe-web;
 
 	location ^~ /resource.js {
 		proxy_pass http://basic/resource.js;

nginx/prod-192.168.1.60/sites/n.conf

@@ -0,0 +1,14 @@
+server {
+	listen 80;
+	server_name ecs.qmth.com.cn  *.ecs.qmth.com.cn;
+	add_header Cache-Control no-cache;
+        add_header Cache-Control private;
+
+    if ($host ~* "^([^.]+(\.[^.]+)*)\.ecs.qmth.com.cn$"){
+        set $subd $1;
+        rewrite ^(.*)$ https://$subd.exam-cloud.cn$1 permanent;
+        break;
+    }
+
+
+}