fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit c0250db88cdde25c5f00a19194646ba6e534b91e 2 parents 6af1773a d9506285

Merge branch 'feature/remove-aes' into release/6.0.2

Inline Side-by-side
Showing 8 changed files with 41 additions and 41 deletions
... ... @@ -10,7 +10,7 @@ const logger = global.yoho.logger;
const signinByPasswordWithAes = (area, profile, password, shoppingKey, clientIp) => {
let param = {
method: 'app.passport.signinAES',
method: 'sesame.flowering.higher',
area: area,
profile: profile,
password: aes.aesPwd(password)
... ...
... ... @@ -27,62 +27,57 @@ const channelMap = {
const sortMap = {
boys: [
{misort: 11, viewNum: 5},
{misort: 12, viewNum: 5},
{misort: 16, viewNum: 5},
{misort: 21, viewNum: 5},
{misort: 13, viewNum: 5},
{misort: 12, viewNum: 5},
{misort: 26, viewNum: 5},
{misort: 27, viewNum: 5},
{misort: 228, viewNum: 5},
{misort: 1904, viewNum: 5},
{misort: 1896, viewNum: 5},
{misort: 1900, viewNum: 5},
{misort: 45, viewNum: 5},
{misort: 226, viewNum: 5},
{misort: 44, viewNum: 5},
{misort: 49, viewNum: 5},
{misort: 27, viewNum: 5},
{misort: 60, viewNum: 5},
{misort: 61, viewNum: 5},
{misort: 59, viewNum: 5},
{misort: 65, viewNum: 5},
{misort: 39, viewNum: 5}
{misort: 50, viewNum: 5},
{misort: 237, viewNum: 5},
{misort: 45, viewNum: 5},
{misort: 345, viewNum: 5},
{misort: 226, viewNum: 5},
{misort: 39, viewNum: 5},
{misort: 66, viewNum: 5}
],
girls: [
{misort: 11, viewNum: 4},
{misort: 12, viewNum: 4},
{misort: 16, viewNum: 4},
{misort: 21, viewNum: 4},
{misort: 31, viewNum: 4},
{misort: 32, viewNum: 4},
{misort: 26, viewNum: 4},
{misort: 12, viewNum: 4},
{misort: 27, viewNum: 4},
{misort: 228, viewNum: 4},
{misort: 48, viewNum: 4},
{misort: 1904, viewNum: 4},
{misort: 1896, viewNum: 4},
{misort: 1892, viewNum: 4},
{misort: 45, viewNum: 4},
{misort: 26, viewNum: 4},
{misort: 44, viewNum: 4},
{misort: 1900, viewNum: 4},
{misort: 31, viewNum: 4},
{misort: 49, viewNum: 4},
{misort: 51, viewNum: 4},
{misort: 50, viewNum: 4},
{misort: 65, viewNum: 4},
{misort: 60, viewNum: 4}
{misort: 60, viewNum: 4},
{misort: 48, viewNum: 4},
{misort: 1896, viewNum: 4},
{misort: 32, viewNum: 4},
{misort: 66, viewNum: 4},
{misort: 39, viewNum: 4},
{misort: 1180, viewNum: 4}
],
kids: [
{misort: 366, viewNum: 4},
{misort: 371, viewNum: 4},
{misort: 405, viewNum: 4},
{misort: 396, viewNum: 4},
{misort: 72, viewNum: 4},
{misort: 369, viewNum: 4},
{misort: 386, viewNum: 4},
{misort: 384, viewNum: 4},
{misort: 367, viewNum: 4}
],
lifestyle: [
{msort: 1172, viewNum: 5},
{msort: 1178, viewNum: 5},
{msort: 1174, viewNum: 5},
{msort: 1170, viewNum: 5},
{msort: 1182, viewNum: 5}
]
};
... ...
... ... @@ -7,7 +7,7 @@
const helpers = global.yoho.helpers;
const TYPE = require('../type');
const MOBILE_DOMAIN = '//item.m.yohobuy.com';
const MOBILE_DOMAIN = '//m.yohobuy.com';
module.exports = [
// 商品详情页老链接，形式一
... ...
... ... @@ -32,7 +32,7 @@ const ptm = {
module.exports = () => {
return (req, res, next) => {
let domain = 'm.yohobuy.com';
let proRegNew = /^\/product\/p([\d]+).html(.*)/,
let proRegNew = /^\/product\/([\d]+).html(.*)/,
guangReg = /^\/guang/,
guangDetailReg = /\/guang\/info\/index/,
qsReg = /\?/;
... ... @@ -58,7 +58,7 @@ module.exports = () => {
data.mobileRefer += `/author-${req.yoho.channel}-${req.query.author_id}/`;
}
} else if (proRegNew.test(url)) {
data.mobileRefer = url.replace(proRegNew, `//${domain}/product/pro_$1_1/1.html$2`);
data.mobileRefer = url.replace(proRegNew, `//${domain}/product/$1.html$2`);
} else {
data.mobileRefer = `//${domain}${req.originalUrl}`;
}
... ...
... ... @@ -38,11 +38,16 @@ var _gaq = _gaq || [];
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
if (getUid() !== 0) {
_hmt.push(['_setCustomVar', 1, 'login', true, 2]);
}
})();
</script>
<!-- 百度站长统计 -->
... ...
... ... @@ -310,7 +310,7 @@
</div>
<div class="right-floating-layer hide">
<div class="qrcode-hover-box">
<a class="layer-box qrcode-download-right" href="//www.yoho.cn/product#home" target="_blank">
<a class="layer-box qrcode-download-right" href="http://www.yoho.cn/product#home" target="_blank">
<span class="qrcode-img">&nbsp;</span>
</a>
<div class="download-app-box">
... ...
{
"name": "yohobuy-node",
"version": "6.0.2",
"version": "6.0.4",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -114,7 +114,7 @@ function getShoppingKey() {
a.src = j;
m.parentNode.insertBefore(a, m);
}(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//' + // eslint-disable-line
'cdn.yoho.cn/yas-jssdk/2.4.2/yas.js', '_yas')); // eslint-disable-line
'cdn.yoho.cn/yas-jssdk/2.4.3/yas.js', '_yas')); // eslint-disable-line
(function() {
var uid = getUid();
... ... @@ -124,7 +124,7 @@ function getShoppingKey() {
window._ozuid = uid; // 暴露ozuid
if (window._yas) {
window._yas(1 * new Date(), '2.4.2', 'yohobuy_web', uid, '', '');
window._yas(1 * new Date(), '2.4.3', 'yohobuy_web', uid, '', '');
}
}());
... ...