Merge branch 'master' of http://39.105.160.25:10880/wuheng/eas_webadmin

default.conf

@@ -8,8 +8,8 @@ server {
         index  index.html index.htm;
     }
 
-    location /api/ {
-        proxy_pass http://192.168.18.13:8182/;
+    location /proxy-pattern/ {
+        proxy_pass http://172.18.0.19:8080/;
     }
 
 }