YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by ping
Commit 529defb37e11958cc1b64cc92ca17fc15a08fdc7 1 parent 5e94c3a8

增加联盟 

点击页面增加异常捕获块
Inline Side-by-side
Showing 5 changed files with 111 additions and 79 deletions
... ... @@ -787,6 +787,22 @@ union_types:
- value: 361
name: ZM-cpa
- value: 362
name: mobvista6
- value: 363
name: mobvista7
- value: 364
name: mobvista8
- value: 365
name: mobvista9
- value: 366
name: mobvista10
- value: 2891
name: 百度wap
... ...
#memcached
cache.servers.memcached.address=192.168.102.12:11211
cache.servers.memcached.address=192.168.102.211:11211
####暂时不使用,待到订单上线的时候恢复使用#########
#MQ
... ... @@ -45,7 +45,7 @@ rabbit_common_qq_user=yoho
rabbit_common_qq_password=yoho
##########common rabbitmq ##########
zkAddress=127.0.0.1:2181
zkAddress=192.168.102.211:2181
# web context
web.context=union
... ...
... ... @@ -60,33 +60,39 @@
td = window.screen.width + '_' + window.screen.height + '_' + type + '_' + version;
} else if (agent.indexOf('android') > -1 || agent.indexOf('linux') > -1) {
var indextd = agent.indexOf('_td');
var index = agent.indexOf(' build');
var preString = '';
var deviceType = '';
//alert(agent);
if (indextd > -1) {
preString = agent.substr(0, indextd);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
type = 'android';
appid = 'com.yoho';
try {
var indextd = agent.indexOf('_td');
var index = agent.indexOf(' build');
var preString = '';
var deviceType = '';
//alert(agent);
if (indextd > -1) {
preString = agent.substr(0, indextd);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
var sansungIndex = preString.indexOf('samsung-');
if (sansungIndex > -1) {
preString = preString.substr(8);
var sansungIndex = preString.indexOf('samsung-');
if (sansungIndex > -1) {
preString = preString.substr(8);
}
} else if (index > -1) {
preString = agent.substr(0, index);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
//alert(preString);
}
} else if (index > -1) {
preString = agent.substr(0, index);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
//alert(preString);
deviceType = preString;
version = agent.substr(agent.indexOf('android') + 8, 3);
td = deviceType + '_' + type + '_' + version;
} catch(e) {
}
deviceType = preString;
version = agent.substr(agent.indexOf('android') + 8, 3);
type = 'android';
appid = 'com.yoho';
td = deviceType + '_' + type + '_' + version;
//downUrl = 'http://cdn.yoho.cn/app-downfiles/yohoBuy_YOHO_2953.apk';
}
... ... @@ -94,7 +100,7 @@
$.ajax({
method: 'POST',
url: 'http://union.yoho.cn/union/ClickUnionRest/addUnion',
url: '/union/ClickUnionRest/addUnion',
// url: 'http://192.168.102.205:8088/union/ClickUnionRest/addUnion',
data: {
union_type: queryString.union_type,
... ... @@ -105,7 +111,7 @@
appid: queryString.appid ? queryString.appid : appid,
appkey: queryString.appkey,
idfa : queryString.idfa ? queryString.idfa : queryString.IDFA,
imei:queryString.imei?queryString.imei:queryString.IMEI,
imei:queryString.imei?queryString.imei:queryString.IMEI
},
complete: function() {
... ...
... ... @@ -57,40 +57,44 @@
td = window.screen.width + '_' + window.screen.height + '_' + type + '_' + version;
downUrl = 'https://itunes.apple.com/cn/app/yoho!-you-huo/id490655927?mt=8';
} else if (agent.indexOf('android') > -1 || agent.indexOf('linux') > -1) {
var indextd = agent.indexOf('_td');
var index = agent.indexOf(' build');
var preString = '';
var deviceType = '';
//alert(agent);
if (indextd > -1) {
preString = agent.substr(0, indextd);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
var sansungIndex = preString.indexOf('samsung-');
if (sansungIndex > -1) {
preString = preString.substr(8);
}
} else if (index > -1) {
preString = agent.substr(0, index);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
//alert(preString);
}
deviceType = preString;
version = agent.substr(agent.indexOf('android') + 8, 3);
type = 'android';
type = 'android';
appid = 'com.yoho';
td = deviceType + '_' + type + '_' + version;
downUrl = 'http://cdn.yoho.cn/app-downfiles/yohoBuy_YOHO_2953.apk';
try {
var indextd = agent.indexOf('_td');
var index = agent.indexOf(' build');
var preString = '';
var deviceType = '';
//alert(agent);
if (indextd > -1) {
preString = agent.substr(0, indextd);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
var sansungIndex = preString.indexOf('samsung-');
if (sansungIndex > -1) {
preString = preString.substr(8);
}
} else if (index > -1) {
preString = agent.substr(0, index);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
//alert(preString);
}
deviceType = preString;
version = agent.substr(agent.indexOf('android') + 8, 3);
td = deviceType + '_' + type + '_' + version;
} catch(e) {
}
}
$.ajax({
method: 'POST',
url: 'http://union.yoho.cn/union/ClickUnionRest/addUnion',
url: '/union/ClickUnionRest/addUnion',
// url: 'http://192.168.102.205:8088/union/ClickUnionRest/addUnion',
data: {
union_type: queryString.union_type,
... ...
... ... @@ -58,38 +58,44 @@
td = window.screen.width + '_' + window.screen.height + '_' + type + '_' + version;
} else if (agent.indexOf('android') > -1 || agent.indexOf('linux') > -1) {
var indextd = agent.indexOf('_td');
var index = agent.indexOf(' build');
var preString = '';
var deviceType = '';
//alert(agent);
if (indextd > -1) {
preString = agent.substr(0, indextd);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
var sansungIndex = preString.indexOf('samsung-');
if (sansungIndex > -1) {
preString = preString.substr(8);
type = 'android';
appid = 'com.yoho';
try {
var indextd = agent.indexOf('_td');
var index = agent.indexOf(' build');
var preString = '';
var deviceType = '';
//alert(agent);
if (indextd > -1) {
preString = agent.substr(0, indextd);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
var sansungIndex = preString.indexOf('samsung-');
if (sansungIndex > -1) {
preString = preString.substr(8);
}
} else if (index > -1) {
preString = agent.substr(0, index);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
//alert(preString);
}
} else if (index > -1) {
preString = agent.substr(0, index);
preString = preString.substr(preString.lastIndexOf(";") + 1);
preString = preString.replace(/\s+/g,'').replace(/_/ig, '');
//alert(preString);
deviceType = preString;
version = agent.substr(agent.indexOf('android') + 8, 3);
td = deviceType + '_' + type + '_' + version;
} catch(e) {
}
deviceType = preString;
version = agent.substr(agent.indexOf('android') + 8, 3);
type = 'android';
appid = 'com.yoho';
td = deviceType + '_' + type + '_' + version;
//downUrl = 'http://cdn.yoho.cn/app-downfiles/yohoBuy_YOHO_2953.apk';
}
var url = "http://192.168.102.205:8088/union/ClickUnionRest/addCommonUnion?client_type=" + type + "&td=" + td + "&appid=" + appid + "&" + window.location.href.substring(window.location.href.indexOf("?") + 1);
var url = "/union/ClickUnionRest/addCommonUnion?client_type=" + type + "&td=" + td + "&appid=" + appid + "&" + window.location.href.substring(window.location.href.indexOf("?") + 1);
$.ajax({
method: 'POST',
... ...