Merge branch 'master' of http://git.hiwavo.com/Fohow/statement_web

statement-pc/nginx/prod.conf

@@ -1,82 +1,20 @@
 server {
-    listen       8079;
-    server_name  lfwx.hiwavo.com;
-    #access_log  /opt/apps/rabbit/wx/logs/ngx_access.log  main;# buffer=16k;
-    #error_log   /opt/apps/rabbit/wx/logs/ngx_error.log;
+    listen       80;
+    server_name  static.hiwavo.com;
 
     set $platform pc;
-    if ($http_user_agent ~* "(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|MicroMessenger|WindowsWechat") {
-      set $platform mobile;
-    }
-
-    root /opt/apps/rabbit/dist/lfwx.hiwavo.com/;
-
-
-    location /.well-known/pki-validation/ {
-      alias /opt/apps/rabbit/wx/static/;
-    }
-
-    location =/MP_verify_2T3baURk4a7z6l8x.txt {
-      root /opt/apps/rabbit/api/go/gopath/src/rabbit.com/static/api/;
-      #expires  30d;
-    }
-
-    location =/3lojqxxPvq.txt {
-      root /opt/apps/rabbit/api/go/gopath/src/rabbit.com/static/api/;
-    }
 
-    location =/jd_root.txt {
-      root /opt/apps/rabbit/api/go/gopath/src/rabbit.com/static/api/;
-    }
+    root /home/www/dist/statement.hiwavo.com/;
 
     location =/favicon.ico {
-      root /opt/apps/rabbit/wx/static/;
-      expires  30d;
-    }
-    location /static/js {
-      root /opt/apps/rabbit/dist/lfwx.hiwavo.com;
-      expires  30d;
-    }
-    location /static/css {
-      root /opt/apps/rabbit/dist/lfwx.hiwavo.com;
-      expires  30d;
-    }
-    location /static/img {
-      root /opt/apps/rabbit/dist/lfwx.hiwavo.com;
+      root /home/www/dist/statement.hiwavo.com;
       expires  30d;
     }
 
     location / {
       try_files $uri $uri/ /index.html;
       expires  30d;
-      #rewrite ^(.*)$ /static/maintain.html break;
-    }
-
-}
-
-# HTTPS server
-server {
-    listen       443;
-    server_name  lfwx.hiwavo.com;
-    charset utf-8;
-    ssl on;
-    ssl_certificate      /opt/apps/rabbit/wx/static/275452820190901.pem;
-    ssl_certificate_key  /opt/apps/rabbit/wx/static/275452820190901.key;
+      #rewrite ^(.*)$ /static/authpay.htm break;
 
-    ssl_session_cache    shared:SSL:1m;
-    ssl_session_timeout  5m;
-
-    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    ssl_prefer_server_ciphers  on;
-
-    location / {
-        #proxy_next_upstream off;
-        #proxy_set_header    X-Real-IP           $remote_addr;
-        #proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-        #proxy_set_header    Host                $host;
-        #proxy_http_version  1.1;
-        #proxy_set_header    Connection  "";
-        proxy_pass           http://lfwx.hiwavo.com;
     }
 }

statement-pc/nginx/prod.conf.bak

@@ -0,0 +1,82 @@
+server {
+    listen       80;
+    server_name  lfwx.hiwavo.com;
+    #access_log  /opt/apps/rabbit/wx/logs/ngx_access.log  main;# buffer=16k;
+    #error_log   /opt/apps/rabbit/wx/logs/ngx_error.log;
+
+    set $platform pc;
+    if ($http_user_agent ~* "(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|MicroMessenger|WindowsWechat") {
+      set $platform mobile;
+    }
+
+    root /opt/apps/rabbit/dist/lfwx.hiwavo.com/;
+
+
+    location /.well-known/pki-validation/ {
+      alias /opt/apps/rabbit/wx/static/;
+    }
+
+    location =/MP_verify_2T3baURk4a7z6l8x.txt {
+      root /opt/apps/rabbit/api/go/gopath/src/rabbit.com/static/api/;
+      #expires  30d;
+    }
+
+    location =/3lojqxxPvq.txt {
+      root /opt/apps/rabbit/api/go/gopath/src/rabbit.com/static/api/;
+    }
+
+    location =/jd_root.txt {
+      root /opt/apps/rabbit/api/go/gopath/src/rabbit.com/static/api/;
+    }
+
+    location =/favicon.ico {
+      root /opt/apps/rabbit/wx/static/;
+      expires  30d;
+    }
+    location /static/js {
+      root /opt/apps/rabbit/dist/lfwx.hiwavo.com;
+      expires  30d;
+    }
+    location /static/css {
+      root /opt/apps/rabbit/dist/lfwx.hiwavo.com;
+      expires  30d;
+    }
+    location /static/img {
+      root /opt/apps/rabbit/dist/lfwx.hiwavo.com;
+      expires  30d;
+    }
+
+    location / {
+      try_files $uri $uri/ /index.html;
+      expires  30d;
+      #rewrite ^(.*)$ /static/maintain.html break;
+    }
+
+}
+
+# HTTPS server
+server {
+    listen       443;
+    server_name  lfwx.hiwavo.com;
+    charset utf-8;
+    ssl on;
+    ssl_certificate      /opt/apps/rabbit/wx/static/275452820190901.pem;
+    ssl_certificate_key  /opt/apps/rabbit/wx/static/275452820190901.key;
+
+    ssl_session_cache    shared:SSL:1m;
+    ssl_session_timeout  5m;
+
+    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers  on;
+
+    location / {
+        #proxy_next_upstream off;
+        #proxy_set_header    X-Real-IP           $remote_addr;
+        #proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+        #proxy_set_header    Host                $host;
+        #proxy_http_version  1.1;
+        #proxy_set_header    Connection  "";
+        proxy_pass           http://lfwx.hiwavo.com;
+    }
+}