fixed:配置添加

@@ -9,8 +9,8 @@
 
 
 let config = require('../../../config/common');
 let config = require('../../../config/common');
 
 
-let api = new global.yoho.ApiBase(config.domains.bjIm, {
-    name: 'bjIm',
+let api = new global.yoho.ApiBase(config.domains.imCs, {
+    name: 'imCs',
     cache: global.yoho.cache,
     cache: global.yoho.cache,
     useCache: false
     useCache: false
 });
 });

@@ -28,9 +28,9 @@ module.exports = {
         // service: 'http://dev-service.yohops.com:9999/',
         // service: 'http://dev-service.yohops.com:9999/',
 
 
         search: 'http://192.168.102.216:8080/yohosearch/',
         search: 'http://192.168.102.216:8080/yohosearch/',
-        bjSocket: 'ws://socket.yohobuy.com:10240',
-        bjIm: 'http://im.yohobuy.com/api',
-        bjImUploadImg: 'http://im.yohobuy.com/server'
+        imSocket: 'ws://socket.yohobuy.com:10240',
+        imCs: 'http://im.yohobuy.com/api',
+        imServer: 'http://im.yohobuy.com/server'
     },
     },
     subDomains: {
     subDomains: {
         host: '.yohobuy.com',
         host: '.yohobuy.com',
@@ -119,7 +119,10 @@ if (isProduction) {
         domains: {
         domains: {
             api: 'http://api.yoho.yohoops.org/',
             api: 'http://api.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
-            search: 'http://search.yohoops.org/yohosearch/'
+            search: 'http://search.yohoops.org/yohosearch/',
+            imSocket: 'ws://imsocket.yohobuy.com',
+            imCs: 'http://imhttp.yohobuy.com/api',
+            imServer: 'http://imhttp.yohobuy.com/server'
         },
         },
         memcache: {
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
@@ -147,9 +150,9 @@ if (isProduction) {
             api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
             api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
             service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
             service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
             search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/',
             search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/',
-            bjSocket: 'ws://socket.yohobuy.com:10240',
-            bjIm: 'http://im.yohobuy.com/api',
-            bjImUploadImg: 'http://im.yohobuy.com/server'
+            imSocket: 'ws://socket.yohobuy.com:10240',
+            imCs: 'http://im.yohobuy.com/api',
+            imServer: 'http://im.yohobuy.com/server'
         },
         },
         useOneapm: true,
         useOneapm: true,
         useCache: true,
         useCache: true,

@@ -74,7 +74,7 @@ originConf = JSON.parse(JSON.stringify(socketConf));
 // url前缀添加
 // url前缀添加
 for (key in urls) {
 for (key in urls) {
     if (urls.hasOwnProperty(key)) {
     if (urls.hasOwnProperty(key)) {
-        urls[key] = common.domains.bjIm + urls[key];
+        urls[key] = common.domains.imCs + urls[key];
     }
     }
 }
 }
 
 
@@ -913,7 +913,7 @@ $sendImgInput.fileupload({
     dataType: 'json',
     dataType: 'json',
     acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
     acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
     maxFileSize: 5000000, // 5M
     maxFileSize: 5000000, // 5M
-    url: common.domains.bjImUploadImg + '/fileManage/uploadFile',
+    url: common.domains.imServer + '/fileManage/uploadFile',
     progressall: function(e, data) {
     progressall: function(e, data) {
         var progress = parseInt(data.loaded / data.total * 100, 10);
         var progress = parseInt(data.loaded / data.total * 100, 10);
 
 
@@ -1149,7 +1149,7 @@ $panelMainBody.scroll(function() {
 //     onMessage: function(e) {
 //     onMessage: function(e) {
 //         var received = JSON.parse(e.data);
 //         var received = JSON.parse(e.data);
 //
 //
-//         cmEntity.conversationId = received.newConversationId !== 0 ?
+//         socketConfCM.conversationId = received.newConversationId !== 0 ?
 //             received.newConversationId :
 //             received.newConversationId :
 //             received.conversationId;
 //             received.conversationId;
 //
 //

@@ -8,7 +8,7 @@
 var common = require('../../../config/common');
 var common = require('../../../config/common');
 
 
 var config = {
 var config = {
-    servers: [common.domains.bjSocket],
+    servers: [common.domains.imSocket],
     defaultUserHead: '/img/service/default-thumb.png',
     defaultUserHead: '/img/service/default-thumb.png',
     recType: {
     recType: {
         ENTER: 1,                 // 用户进入
         ENTER: 1,                 // 用户进入