Merge branch 'feat-ng' into 'staging'

feat: nginx文件修改

See merge request sunyihao/bkunyun!7

nginx/nginx_test_10005.conf

@@ -17,8 +17,8 @@ http {
 		index index.html index.htm;
 		resolver 127.0.0.11 valid=10s;
 		location / {
-			try_files $uri /v3/index.html;
-			index  /v3/index.html;
+			try_files $uri /wap/index.html;
+			index  /wap/index.html;
 			#add_header Access-Control-Allow-Origin *;
             add_header Access-Control-Allow-Origin *;
             add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
@@ -66,6 +66,15 @@ http {
         	proxy_set_header Host $host;
         	proxy_set_header X-Real-IP $remote_addr;
         }
+        location ^~ /cpp/ {
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_connect_timeout 300s;
+            proxy_send_timeout 300s;
+            proxy_read_timeout 300s;
+            set $cpp "http://cp-project-app:8801";
+            proxy_pass $cpp;
+        }
         location ^~ /ip/ {
             set $c3ip "http://c3-ip-app:6800";
             proxy_pass $c3ip;
@@ -138,16 +147,6 @@ http {
             proxy_pass $imapp;
         }
 
-        location ^~ /cpp/ {
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_connect_timeout 300s;
-            proxy_send_timeout 300s;
-            proxy_read_timeout 300s;
-            set $cpp "http://cp-project-app:8801";
-            proxy_pass $cpp;
-        }
-
         location ^~ /dataset/ {
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;