fe / yoho-activity-platform · Commits

Go to a project

Authored by 李奇
Commit 4b1b2bee487e83949b2c479a9aeb79070a700d03 1 parent 78bc4076

跨域域名增加

Inline Side-by-side
Showing 2 changed files with 8 additions and 3 deletions
@@ -40,9 +40,9 @@ const userController = { @@ -40,9 +40,9 @@ const userController = {
40 message: GET_USER_INFO_SUCCESS 40 message: GET_USER_INFO_SUCCESS
41 }); 41 });
42 } else { 42 } else {
43 - let name = mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); 43 + let name = '用户' + mobile.substr(7);
44 let avatar = 'http://img12.static.yhbimg.com/' + 44 let avatar = 'http://img12.static.yhbimg.com/' +
45 - 'imserver/2016/11/17/11/02bc3c3de856432175c01d937342a1f2ce.jpg'; // TODO TO BE REPLACED 45 + 'imserver/2016/11/17/11/02bc3c3de856432175c01d937342a1f2ce.jpg';
46 46
47 userInfo = { 47 userInfo = {
48 name, 48 name,
@@ -83,7 +83,12 @@ if (isProduction) { @@ -83,7 +83,12 @@ if (isProduction) {
83 singleApi: 'http://single.yoho.cn/', 83 singleApi: 'http://single.yoho.cn/',
84 platformApi: 'http://api.platform.yohoops.org' 84 platformApi: 'http://api.platform.yohoops.org'
85 }, 85 },
86 - corsAllowOrigin: ['http://ad.yoho.cn', 'https://ad.yoho.cn'], 86 + corsAllowOrigin: [
  87 + 'http://ad.yoho.cn',
  88 + 'https://ad.yoho.cn',
  89 + 'http://feature.yoho.cn',
  90 + 'https://feature.yoho.cn'
  91 + ],
87 memcache: { 92 memcache: {
88 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 93 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
89 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'], 94 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],