Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/im/imController.java

@@ -22,7 +22,7 @@ public class imController extends BaseController {
	public String sendBusinessMsg(String userId,String content)
	{
		try{
			String _url = host+"/system/sendmsg.im";
			String _url = host+"/api/v1/chats/sm";
			String param = "user_id="+userId+"&content="+content;
			String result = HttpUtil.sendPost(_url, param);
		

patient-co-wlyy/src/main/resources/system.properties

@@ -5,8 +5,8 @@
#server_domain=wlyy
#server_url=http://www.xmtyw.cn/wlyy/
#
#im_group_server=http://120.41.253.95:3000/group/sendgroupmsg.im
#msg_push_server=http://120.41.253.95:3000/system/sendmsg.im
#im_group_server=http://120.41.253.95:3000/api/v1/chats/gm
#msg_push_server=http://120.41.253.95:3000/api/v1/chats/sm
#file upload temp path
#upload_temp_path=/var/local/temp
@@ -30,8 +30,8 @@
#server_domain=ssgg
#server_url=http://ehr.yihu.com/ssgg/
#im_group_server=http://ehr.yihu.com/imwebsocket/group/sendgroupmsg.im
#msg_push_server=http://ehr.yihu.com/imwebsocket/system/sendmsg.im
#im_group_server=http://ehr.yihu.com/api/v1/chats/gm
#msg_push_server=http://ehr.yihu.com/api/v1/chats/sm
#file upload temp path
#upload_temp_path=/var/local/temp