修改更新房间信息方式，由房间id修改为地址

src/main/java/com/zhiwei/live/danmu/bilibili/BilibiliClient.java

@@ -33,7 +33,7 @@ public class BilibiliClient {
      */
     public static void getDanmu(DataCallBack dataCallBack,String roomId) throws Exception {
     	 //根据房间号获取真实房间号
-    	 RoomInfo roomInfo = BilibiliRoomInfoCrawler.getRoomInfoByRoomId(roomId);
+    	 RoomInfo roomInfo = BilibiliRoomInfoCrawler.getRoomInfoByRoomUrl(roomId);
     	 if(Objects.nonNull(roomInfo)) {
     		 //获取弹幕服务器地址
     		 String url = "https://live.bilibili.com/api/player?id=cid:" + roomInfo.getRoomId();

src/main/java/com/zhiwei/live/danmu/douyu/DouyuClient.java

@@ -33,7 +33,7 @@ public class DouyuClient {
 	 */
 	public static void getDanmu(DataCallBack dataCallBack, String roomId) throws Exception {
 		// 根据房间号获取真实房间号
-		RoomInfo roomInfo = DouYuRoomInfoCrawler.getRoomInfoByRoomId(roomId);
+		RoomInfo roomInfo = DouYuRoomInfoCrawler.getRoomInfoByRoomUrl(roomId);
 		if (Objects.nonNull(roomInfo)) {
 			// 建立弹幕连接
 			Connector.asynchronizedTcpConnect(new NioEventLoopGroup(), HOST, PORT, new IdleStateHandler(0, 30, 45),

src/main/java/com/zhiwei/live/roominfo/BilibiliRoomInfoCrawler.java

@@ -28,9 +28,8 @@ public class BilibiliRoomInfoCrawler {
 	 * @return
 	 * @throws Exception
 	 */
-	public static RoomInfo getRoomInfoByRoomId(String roomId) throws Exception{
-		String url = "https://live.bilibili.com/" + roomId;
-		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(url)).body().string();
+	public static RoomInfo getRoomInfoByRoomUrl(String roomUrl) throws Exception{
+		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl)).body().string();
 		if(!StringUtils.isBlank(htmlBody)) {
 			//判断页面中是否包含房间信息
 			if(htmlBody.contains("window.__NEPTUNE_IS_MY_WAIFU__=")) {
@@ -46,17 +45,17 @@ public class BilibiliRoomInfoCrawler {
 				Integer person_num = data.getIntValue("online");
 				String roomname = data.getString("title");
 				Integer room_id = data.getInteger("room_id");
-				String roomIds = room_id!=null?room_id.toString():null;
+				String roomId = room_id!=null?room_id.toString():null;
 				
 				String username = null;
 				//通过房间id获取用户信息
-				String roomUrl = "https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid="+room_id;
+				roomUrl = "https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid="+room_id;
 				String roomBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl)).body().string();
 				if(!StringUtils.isBlank(roomBody)) {
 					JSONObject roomData = JSONObject.parseObject(roomBody).getJSONObject("data");
 					username = roomData.getJSONObject("info").getString("uname");
 				}
-				return new RoomInfo(PT, roomIds, roomname, username, person_num);
+				return new RoomInfo(PT, roomId, roomname, username, person_num);
 			}else {
 				logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", htmlBody);
 				return null;
@@ -68,9 +67,8 @@ public class BilibiliRoomInfoCrawler {
 	
 	
 	
-	public static RoomInfo getRoomInfoByRoomIdProxy(String roomId) throws Exception{
-		String url = "https://live.bilibili.com/" + roomId;
-		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(url),ProxyHolder.NAT_PROXY).body().string();
+	public static RoomInfo getRoomInfoByRoomUrlProxy(String roomUrl) throws Exception{
+		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl), ProxyHolder.NAT_PROXY).body().string();
 		if(!StringUtils.isBlank(htmlBody)) {
 			//判断页面中是否包含房间信息
 			if(htmlBody.contains("window.__NEPTUNE_IS_MY_WAIFU__=")) {
@@ -86,17 +84,17 @@ public class BilibiliRoomInfoCrawler {
 				Integer person_num = data.getIntValue("online");
 				String roomname = data.getString("title");
 				Integer room_id = data.getInteger("room_id");
-				String roomIds = room_id!=null?room_id.toString():null;
+				String roomId = room_id!=null?room_id.toString():null;
 				
 				String username = null;
 				//通过房间id获取用户信息
-				String roomUrl = "https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid="+room_id;
-				String roomBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl),ProxyHolder.NAT_PROXY).body().string();
+				roomUrl = "https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid="+room_id;
+				String roomBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl), ProxyHolder.NAT_PROXY).body().string();
 				if(!StringUtils.isBlank(roomBody)) {
 					JSONObject roomData = JSONObject.parseObject(roomBody).getJSONObject("data");
 					username = roomData.getJSONObject("info").getString("uname");
 				}
-				return new RoomInfo(PT, roomIds, roomname, username, person_num);
+				return new RoomInfo(PT, roomId, roomname, username, person_num);
 			}else {
 				logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", htmlBody);
 				return null;

src/main/java/com/zhiwei/live/roominfo/DouYuRoomInfoCrawler.java

@@ -27,7 +27,11 @@ public class DouYuRoomInfoCrawler {
 	 * @return
 	 * @throws Exception
 	 */
-	public static RoomInfo getRoomInfoByRoomId(String roomId) throws Exception{
+	public static RoomInfo getRoomInfoByRoomUrl(String roomUrl) throws Exception{
+		
+		String roomBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl)).body().string();
+		if(!StringUtils.isBlank(roomBody) && roomBody.contains("ROOM.room_id =")) {
+			String roomId = roomBody.split("ROOM\\.room_id = ")[1].split("; ")[0].trim();
 			String url = "http://open.douyucdn.cn/api/RoomApi/room/" + roomId;
 			String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(url)).body().string();
 			if(!StringUtils.isBlank(htmlBody)) {
@@ -41,6 +45,10 @@ public class DouYuRoomInfoCrawler {
 				logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", htmlBody);
 				return null;
 			}
+		}else {
+			logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", roomBody);
+			return null;
+		}
 	}
 	
 	
@@ -50,9 +58,12 @@ public class DouYuRoomInfoCrawler {
 	 * @return
 	 * @throws Exception
 	 */
-	public static RoomInfo getRoomInfoProxyByRoomId(String roomId) throws Exception{
+	public static RoomInfo getRoomInfoProxyByRoomUrl(String roomUrl) throws Exception{
+		String roomBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl), ProxyHolder.NAT_PROXY).body().string();
+		if(!StringUtils.isBlank(roomBody) && roomBody.contains("ROOM.room_id =")) {
+			String roomId = roomBody.split("ROOM\\.room_id = ")[1].split("; ")[0].trim();
 			String url = "http://open.douyucdn.cn/api/RoomApi/room/" + roomId;
-		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(url),ProxyHolder.NAT_PROXY).body().string();
+			String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(url), ProxyHolder.NAT_PROXY).body().string();
 			if(!StringUtils.isBlank(htmlBody)) {
 				JSONObject data = JSONObject.parseObject(htmlBody).getJSONObject("data");
 				String room_name = data.getString("room_name");
@@ -64,6 +75,10 @@ public class DouYuRoomInfoCrawler {
 				logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", htmlBody);
 				return null;
 			}
+		}else {
+			logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", roomBody);
+			return null;
+		}
 	}
 
 }

src/main/java/com/zhiwei/live/roominfo/HuYaRoomInfoCrawler.java

@@ -24,9 +24,8 @@ public class HuYaRoomInfoCrawler {
 	 * @return
 	 * @throws Exception
 	 */
-	public static RoomInfo getRoomInfoByRoomId(String roomId) throws Exception {
-		String url = "http://www.huya.com/" + roomId;
-		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(url), ProxyHolder.NAT_PROXY).body().string();
+	public static RoomInfo getRoomInfoByRoomUrl(String roomUrl) throws Exception {
+		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl)).body().string();
 		if (!StringUtils.isBlank(htmlBody)) {
 			Document document = Jsoup.parse(htmlBody);
 			String roomName = document.select("h1#J_roomTitle").text();
@@ -39,7 +38,30 @@ public class HuYaRoomInfoCrawler {
 			logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", htmlBody);
 			return null;
 		}
-
 	}
 
+	
+	
+	/**
+	 * 根据房间id获取房间信息
+	 * 
+	 * @param roomId
+	 * @return
+	 * @throws Exception
+	 */
+	public static RoomInfo getRoomInfoProxyByRoomUrl(String roomUrl) throws Exception {
+		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl), ProxyHolder.NAT_PROXY).body().string();
+		if (!StringUtils.isBlank(htmlBody)) {
+			Document document = Jsoup.parse(htmlBody);
+			String roomName = document.select("h1#J_roomTitle").text();
+			Integer liveCount = Integer.valueOf(document.select("em#live-count").text().replaceAll(",", ""));
+			String username = document.select("h3.host-name").text();
+			String activityCount = document.select("div#activityCount").text();
+			String room_id = document.select("span.host-rid").text();
+			return new RoomInfo(PT, room_id, roomName, username, liveCount);
+		} else {
+			logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", htmlBody);
+			return null;
+		}
+	}
 }

src/main/java/com/zhiwei/live/roominfo/PandamTVRoomInfoCrawler.java

@@ -27,9 +27,8 @@ public class PandamTVRoomInfoCrawler {
 	 * @return
 	 * @throws Exception
 	 */
-	public static RoomInfo getRoomInfoByRoomId(String roomId) throws Exception{
-		String url = "https://www.panda.tv/" + roomId;
-		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(url),ProxyHolder.NAT_PROXY).body().string();
+	public static RoomInfo getRoomInfoByRoomUrl(String roomUrl) throws Exception{
+		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl)).body().string();
 		if(!StringUtils.isBlank(htmlBody)) {
 			//判断页面中是否包含房间信息,此为pc端直播
 			if(htmlBody.contains("window._config_roominfo = ")) {
@@ -39,11 +38,11 @@ public class PandamTVRoomInfoCrawler {
 				htmlBody = ZhiWeiTools.delHTMLTag(htmlBody);
 				htmlBody = htmlBody.replaceAll("\\\\", "").replaceAll("'", "\"")
 						.replaceAll("\"param\":\"", "\"param\":").replaceAll("}\",", "},");   //
-				
 				//解析json数据
 				JSONObject json = JSONObject.parseObject(htmlBody);
 				JSONObject callbackParam = json.getJSONObject("callbackParam");
 				Integer person_num = callbackParam.getJSONObject("param").getIntValue("person_num");
+				String roomId = callbackParam.getJSONObject("param").getString("roomid");
 				JSONObject roominfo = json.getJSONObject("roominfo");
 				String roomname = roominfo.getString("name");
 				JSONObject hostinfo = json.getJSONObject("hostinfo");
@@ -58,11 +57,11 @@ public class PandamTVRoomInfoCrawler {
 				htmlBody = ZhiWeiTools.decodeUnicode(htmlBody);
 				htmlBody = ZhiWeiTools.delHTMLTag(htmlBody);
 				htmlBody = htmlBody.replaceAll("\\\\", "").replaceAll("'", "\"");
-				
 				//解析json数据
 				JSONObject json = JSONObject.parseObject(htmlBody);
 				JSONObject roominfo = json.getJSONObject("roominfo");
 				Integer person_num = roominfo.getIntValue("personnum");
+				String roomId = roominfo.getString("roomid");
 				String roomname = roominfo.getString("name");
 				JSONObject hostinfo = json.getJSONObject("hostinfo");
 				String username = hostinfo.getString("nickName");
@@ -78,4 +77,56 @@ public class PandamTVRoomInfoCrawler {
 	
 	
 	
+	/**
+	 * 根据房间id获取房间信息
+	 * @param roomId
+	 * @return
+	 * @throws Exception
+	 */
+	public static RoomInfo getRoomInfoProxyByRoomUrl(String roomUrl) throws Exception{
+		String htmlBody = httpBoot.syncCall(RequestUtils.wrapGet(roomUrl),ProxyHolder.NAT_PROXY).body().string();
+		if(!StringUtils.isBlank(htmlBody)) {
+			//判断页面中是否包含房间信息,此为pc端直播
+			if(htmlBody.contains("window._config_roominfo = ")) {
+				//通过截取获取直播间信息字段，将截取的字段处理为json格式方便解析
+				htmlBody = htmlBody.split("window._config_roominfo = ")[1].split("}  };")[0]+"}  }";
+				htmlBody = ZhiWeiTools.decodeUnicode(htmlBody);
+				htmlBody = ZhiWeiTools.delHTMLTag(htmlBody);
+				htmlBody = htmlBody.replaceAll("\\\\", "").replaceAll("'", "\"")
+						.replaceAll("\"param\":\"", "\"param\":").replaceAll("}\",", "},");   //
+				//解析json数据
+				JSONObject json = JSONObject.parseObject(htmlBody);
+				JSONObject callbackParam = json.getJSONObject("callbackParam");
+				Integer person_num = callbackParam.getJSONObject("param").getIntValue("person_num");
+				String roomId = callbackParam.getJSONObject("param").getString("roomid");
+				JSONObject roominfo = json.getJSONObject("roominfo");
+				String roomname = roominfo.getString("name");
+				JSONObject hostinfo = json.getJSONObject("hostinfo");
+				String username = hostinfo.getString("name");
+				return new RoomInfo(PT, roomId, roomname, username, person_num);
+			}
+			//判断页面中是否包含房间信息,此为使用手机端直播
+			else if(htmlBody.contains("window.HOSTINFO=")){
+				//通过截取获取直播间信息字段，将截取的字段处理为json格式方便解析
+				htmlBody = htmlBody.split("window.HOSTINFO=")[1].split(";</script>")[0];
+				htmlBody = ZhiWeiTools.decodeUnicode(htmlBody);
+				htmlBody = ZhiWeiTools.delHTMLTag(htmlBody);
+				htmlBody = htmlBody.replaceAll("\\\\", "").replaceAll("'", "\"");
+				//解析json数据
+				JSONObject json = JSONObject.parseObject(htmlBody);
+				JSONObject roominfo = json.getJSONObject("roominfo");
+				Integer person_num = roominfo.getIntValue("personnum");
+				String roomId = roominfo.getString("roomid");
+				String roomname = roominfo.getString("name");
+				JSONObject hostinfo = json.getJSONObject("hostinfo");
+				String username = hostinfo.getString("nickName");
+				return new RoomInfo(PT, roomId, roomname, username, person_num);
+			}else {
+				logger.info("此次采集页面中不包含房间信息字段, 此次页面信息为:{}", htmlBody);
+				return null;
+			}
+		}
+		return null;
+	}
+
 }

src/test/java/com/zhiwei/live/test/roomInfo/RoomInfoCrawlerTest.java

@@ -19,10 +19,10 @@ public class RoomInfoCrawlerTest {
 	}
 	
 	@Test
-	public void getBilibiliRoomInfoByRoomId() {
-		String roomId = "24";
+	public void getBilibiliRoomInfoByRoomUrl() {
+		String roomUrl = "https://live.bilibili.com/483";
 		try {
-			RoomInfo roomInfo = BilibiliRoomInfoCrawler.getRoomInfoByRoomId(roomId);
+			RoomInfo roomInfo = BilibiliRoomInfoCrawler.getRoomInfoByRoomUrl(roomUrl);
 			System.out.println("房间信息:::"+ roomInfo);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -31,10 +31,10 @@ public class RoomInfoCrawlerTest {
 
 	
 	@Test
-	public void getDouyuRoomInfoByRoomId() {
-		String roomId = "5723238";
+	public void getDouyuRoomInfoByRoomUrl() {
+		String roomUrl = "https://www.douyu.com/topic/LEC";
 		try {
-			RoomInfo roomInfo = DouYuRoomInfoCrawler.getRoomInfoByRoomId(roomId);
+			RoomInfo roomInfo = DouYuRoomInfoCrawler.getRoomInfoByRoomUrl(roomUrl);
 			System.out.println("房间信息:::"+ roomInfo);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -43,10 +43,10 @@ public class RoomInfoCrawlerTest {
 	
 	
 	@Test
-	public void getHuYaRoomInfoByRoomId() {
-		String roomId = "blizzardgame1";
+	public void getHuYaRoomInfoByRoomUrl() {
+		String roomUrl = "https://www.huya.com/baishaling";
 		try {
-			RoomInfo roomInfo = HuYaRoomInfoCrawler.getRoomInfoByRoomId(roomId);
+			RoomInfo roomInfo = HuYaRoomInfoCrawler.getRoomInfoByRoomUrl(roomUrl);
 			System.out.println("房间信息:::"+ roomInfo);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -54,10 +54,10 @@ public class RoomInfoCrawlerTest {
 	}
 	
 	@Test
-	public void getPandamTVRoomInfoByRoomId() {
-		String roomId = "1564821";
+	public void getPandamTVRoomInfoByRoomUrl() {
+		String roomUrl = "https://www.panda.tv/337852";
 		try {
-			RoomInfo roomInfo = PandamTVRoomInfoCrawler.getRoomInfoByRoomId(roomId);
+			RoomInfo roomInfo = PandamTVRoomInfoCrawler.getRoomInfoByRoomUrl(roomUrl);
 			System.out.println("房间信息:::"+ roomInfo);
 		} catch (Exception e) {
 			e.printStackTrace();