Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

business/im-service/src/main/java/com/yihu/jw/im/util/ImUtil.java

@@ -453,7 +453,7 @@ public class ImUtil {
			if(obj.getInteger("status") ==200&&sessionId.equals(obj.getString("sessionId"))){
				String sessionStatus = obj.getString("status");
				if (sessionStatus.equalsIgnoreCase("1")){
					String sessionStatusUrl = im_host + "api/v2/sessions/isExist?session_id="+sessionId;
					String sessionStatusUrl = im_host + "api/v2/sessions/"+sessionId+"/status?status=0&sessionId="+sessionId;
					JSONObject object = new JSONObject();
					String rs = HttpClientUtil.postBody(sessionStatusUrl, object);
					JSONObject jsonObject = JSONObject.parseObject(rs);