Merge remote-tracking branch 'origin/master' into feature/platform-admin

+## this is docker file
\ No newline at end of file

@@ -40,9 +40,9 @@ const userController = {
                         message: GET_USER_INFO_SUCCESS
                     });
                 } else {
-                    let name = mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+                    let name = '用户' + mobile.substr(7);
                     let avatar = 'http://img12.static.yhbimg.com/' +
-                        'imserver/2016/11/17/11/02bc3c3de856432175c01d937342a1f2ce.jpg'; // TODO TO BE REPLACED
+                        'imserver/2016/11/17/11/02bc3c3de856432175c01d937342a1f2ce.jpg';
 
                     userInfo = {
                         name,

@@ -84,7 +84,12 @@ if (isProduction) {
             singleApi: 'http://single.yoho.cn/',
             platformApi: 'http://api.platform.yohoops.org'
         },
-        corsAllowOrigin: ['http://ad.yoho.cn', 'https://ad.yoho.cn'],
+        corsAllowOrigin: [
+            'http://ad.yoho.cn',
+            'https://ad.yoho.cn',
+            'http://feature.yoho.cn',
+            'https://feature.yoho.cn'
+        ],
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
@@ -94,7 +99,16 @@ if (isProduction) {
             timeout: 1000,
             retries: 0
         },
-        useCache: true
+        useCache: true,
+        mysql: {
+            connect: {
+                host: '10.67.2.144',
+                port: '3307',
+                user: 'yh_vpc_bak',
+                password: 'yoho@2Y$^YpNb7hp'
+            },
+            database: 'yoho_activity_platform',
+        }
     });
 } else if (isTest) {
     Object.assign(module.exports, {
@@ -117,6 +131,15 @@ if (isProduction) {
             reconnect: 5000,
             retries: 0
         },
-        useCache: true
+        useCache: true,
+        mysql: {
+            connect: {
+                host: 'localhost',
+                port: '3306',
+                user: 'root',
+                password: ''
+            },
+            database: 'yoho_activity_platform',
+        }
     });
 }