Authored by 于良

Merge branch 'local' into develop

Conflicts:
	js/common/config/config.js
module.exports = {
dev: {
baseUrl: 'http://192.168.102.31:8095/social/',
// baseUrl: 'http://testapi.yoho.cn:28078/social/',
// baseUrl: 'http://192.168.102.31:8095/social/',
baseUrl: 'http://social.yoho.cn/social/',
HTTPTimeout: 30000, //毫秒
},
prd: {
baseUrl: 'http://192.168.102.31:8095/social/',
// baseUrl: 'http://social.yoho.cn/social/',
// baseUrl: 'http://testapi.yoho.cn:28078/social/',
// baseUrl: 'http://192.168.102.31:8095/social/',
baseUrl: 'http://social.yoho.cn/social/',
HTTPTimeout: 30000, //毫秒
},
... ...