diff --git a/script/nginx/conf/vhosts/nginx.pre.yohobuy.conf.conf b/script/nginx/conf/vhosts/nginx.pre.yohobuy.conf.conf
index 1fe285d..61391fb 100644
--- a/script/nginx/conf/vhosts/nginx.pre.yohobuy.conf.conf
+++ b/script/nginx/conf/vhosts/nginx.pre.yohobuy.conf.conf
@@ -23,44 +23,54 @@ server
}
location = /reg.html {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location = /signin.html {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location = /login.html {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location = /emailback.html {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location = /phoneback.html {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location = /help/shareorder.html {
root /Data/code/git/yohobuy/yohobuy/assets;
@@ -70,28 +80,34 @@ server
expires 7d;
}
location ^~ /passport/reg {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location ^~ /passport/login {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location ^~ /passport/back {
- proxy_redirect off;
- proxy_pass http://yohobuy;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Accept-Encoding "gzip";
+ return 301 https://$server_name$request_uri;
+
+# proxy_redirect off;
+# proxy_pass http://yohobuy;
+# proxy_set_header Host $host;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header Accept-Encoding "gzip";
}
location = / {
@@ -364,4 +380,78 @@ server
}
+server
+{
+ listen 80;
+ server_name huodong.m.yohobuy.com;
+ root /Data/PE/yohobuy/yohobuy/huodong.m.yohobuy.com/public;
+ location / {
+ proxy_redirect off;
+ proxy_pass http://yohobuy;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Accept-Encoding "gzip";
+ }
+
+ location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+ expires 30d;
+ }
+ location =/crossdomain.xml {
+ expires 30d;
+ }
+ location =/sitemap.xml {
+ expires 1d;
+ }
+ location =/robots.txt {
+ expires 1d;
+ }
+}
+
+server
+{
+ listen 443 ssl;
+ server_name login.m.yohobuy.com;
+ root /Data/PE/yohobuy/yohobuy/m.yohobuy.com/public;
+
+ ssl_certificate /home/hf/ssl/server.crt;
+ ssl_certificate_key /home/hf/ssl/server.key;
+ ssl_dhparam /home/hf/ssl/dhparams.pem;
+
+ ssl_prefer_server_ciphers on;
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ ssl_ciphers "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:DES-CBC3-SHA";
+ ssl_session_tickets off;
+ ssl_session_cache shared:SSL:10m;
+# add_header Strict-Transport-Security "max-age=31536000";
+# add_header X-Frame-Options deny;
+# add_header X-Content-Type-Options nosniff;
+
+ location / {
+ proxy_redirect off;
+ proxy_pass http://yohobuy;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Accept-Encoding "gzip";
+ }
+
+ location ^~ /dist/ {
+ root /Data/PE/yohobuy/yohobuy/static;
+ expires 30d;
+ }
+
+ location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
+ expires 30d;
+ }
+ location =/crossdomain.xml {
+ expires 30d;
+ }
+ location =/sitemap.xml {
+ expires 1d;
+ }
+ location =/robots.txt {
+ expires 1d;
+ }
+}
diff --git a/template/m.yohobuy.com/actions/passport/login/index.phtml b/template/m.yohobuy.com/actions/passport/login/index.phtml
index c63b157..de907bc 100644
--- a/template/m.yohobuy.com/actions/passport/login/index.phtml
+++ b/template/m.yohobuy.com/actions/passport/login/index.phtml
@@ -1,4 +1,4 @@
-{{> layout/header}}
+{{> layout/header_passport}}
<div class="login-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
@@ -41,4 +41,4 @@
</ul>
</div>
</div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_passport}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/actions/passport/login/international.phtml b/template/m.yohobuy.com/actions/passport/login/international.phtml
index f4d76de..c5ba6ae 100644
--- a/template/m.yohobuy.com/actions/passport/login/international.phtml
+++ b/template/m.yohobuy.com/actions/passport/login/international.phtml
@@ -1,4 +1,4 @@
-{{> layout/header}}
+{{> layout/header_passport}}
<div class="login-international-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
@@ -13,4 +13,4 @@
<span id="btn-login" class="btn btn-login disble row">登录</span>
</div>
</div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_passport}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/actions/passport/reg/code.phtml b/template/m.yohobuy.com/actions/passport/reg/code.phtml
index d07bfd5..b3a855d 100644
--- a/template/m.yohobuy.com/actions/passport/reg/code.phtml
+++ b/template/m.yohobuy.com/actions/passport/reg/code.phtml
@@ -1,5 +1,5 @@
-{{> layout/header}}
+{{> layout/header_passport}}
<div class="reg-code-page passport-page yoho-page">
{{> passport/code}}
</div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_passport}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/actions/passport/reg/index.phtml b/template/m.yohobuy.com/actions/passport/reg/index.phtml
index 350f2d7..040ce60 100644
--- a/template/m.yohobuy.com/actions/passport/reg/index.phtml
+++ b/template/m.yohobuy.com/actions/passport/reg/index.phtml
@@ -1,4 +1,4 @@
-{{> layout/header}}
+{{> layout/header_passport}}
<div class="reg-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
@@ -11,4 +11,4 @@
<p class="register-tip">YOHO!Family账号可登录Yoho!Buy有货、YOHO!Boys、YOHO!Girls及SHOW</p>
</div>
</div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_passport}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/actions/passport/reg/password.phtml b/template/m.yohobuy.com/actions/passport/reg/password.phtml
index 7fb1b9c..a695886 100644
--- a/template/m.yohobuy.com/actions/passport/reg/password.phtml
+++ b/template/m.yohobuy.com/actions/passport/reg/password.phtml
@@ -1,4 +1,4 @@
-{{> layout/header}}
+{{> layout/header_passport}}
<div class="reg-password-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
@@ -20,4 +20,4 @@ var r=b.getElementsByTagName('script')[0];r.parentNode.insertBefore(s,r);
_agtjs('init','AG_052186_PHCW','yohobuy.com');
_agtjs('loadEvent',{atsev:101,'atsrmv':""});
</script>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_passport}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/partials/layout/analysis_passport.phtml b/template/m.yohobuy.com/partials/layout/analysis_passport.phtml
index 681ca3a..03819e4 100644
--- a/template/m.yohobuy.com/partials/layout/analysis_passport.phtml
+++ b/template/m.yohobuy.com/partials/layout/analysis_passport.phtml
@@ -26,5 +26,4 @@
s.parentNode.insertBefore(hm, s);
})();
</script>
-<script src="http://static.yohobuy.com/js/analytics/analysis.js"></script>
-<script src="http://static.yohobuy.com/m/v1/js/om_code.js"></script>
+<script src="/dist/analysis/v1/js/om_code.js"></script>
diff --git a/template/m.yohobuy.com/partials/layout/footer_passport.phtml b/template/m.yohobuy.com/partials/layout/footer_passport.phtml
index 2183f8a..ef72299 100644
--- a/template/m.yohobuy.com/partials/layout/footer_passport.phtml
+++ b/template/m.yohobuy.com/partials/layout/footer_passport.phtml
@@ -1,7 +1,7 @@
{{> layout/page_footer}}
{{> layout/download_app}}
{{#if hasWxShare}}
-<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script type="text/javascript" charset="utf-8" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
{{/if}}
{{#if rlsEnv}}
<script src="/dist/myohobuy/{{version}}/lib.js"></script>
@@ -19,17 +19,6 @@
<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: 'http://localhost:8000/'});</script>
{{/if}}
-<script type="text/javascript">
- (function(w,d,s,j,f){
- w['YohoAcquisitionObject']=f;
- w[f]=function(){w[f].p=arguments;};
- var a=d.createElement(s);
- var m=d.getElementsByTagName(s)[0];
- a.async=1;
- a.src=j;
- m.parentNode.insertBefore(a,m);
- })(window,document,'script','/dist/yas-jssdk/{{yas_version}}/yas.js','_yas');
-</script>
{{> layout/use}}
{{> layout/analysis_passport}}
</body>