Merge branch 'master' of http://192.168.1.220:10080/raolu/iHealth-app-demo

js/common_http.js

@@ -1,6 +1,6 @@
//切换发布版本 true：正式版，连接生产环境；false：测试版，连接测试环境。
//var publish_version = true;
var publish_version = false;
var publish_version = true;
//var publish_version = false;
//是否是在公司总部的演示环境
var isdemo = false;

js/im.client.js

@@ -11,8 +11,8 @@ var imServer = "",
var imTimeOut = 20000;
if(publish_version){
    imServer = "http://222.218.31.19:3000/api/v2";
    socketUrl = "http://222.218.31.19:3000";
    imServer = "http://125.73.45.32:3000/api/v2";
    socketUrl = "http://125.73.45.32:3000";
}else{
    imServer = "http://172.19.103.72:3000/api/v2";
    socketUrl = "http://172.19.103.72:3000";

js/im_new.js

@@ -10,7 +10,7 @@ var servers = {
	dev: "http://27.154.233.186:3000",
    demo: "http://ehr.yihu.com",
    //prod: "http://120.41.253.95:3000"
    prod:"http://27.155.101.77:3000"
    prod:"http://125.73.45.32:3000"
};
// REST接口相对路径