一起看

Author: danbai225

.idea/workspace.xml

@@ -15,6 +15,7 @@
 
 ## 功能特性
 
++ 一起在线连麦观看(和朋友一起观看精彩影视)
 + 免VIP在线观看影视(资源来源网络)
 + 观看看影视的同时能发送弹幕
 + 跨平台同步观看历史记录
@@ -32,6 +33,10 @@
 
 ## 版本内容更新
 
+### 2020-3-20
+
+增加一起看功能
+
 ### 2019-10-20
 
 + 弹幕获取功能,不用担心一个人看没弹幕啦,在一些人气较高的影视会自动获取弹幕

README.md

@@ -87,6 +87,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.11</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -96,12 +101,6 @@
                 <configuration>
                     <mainClass>com.danbai.ys.YsApplication</mainClass>
                     <layout>ZIP</layout>
-                    <includes>
-                        <include>
-                            <groupId>nothing</groupId>
-                            <artifactId>nothing</artifactId>
-                        </include>
-                    </includes>
                 </configuration>
                 <executions>
                     <execution>

pom.xml

@@ -1,4 +1,4 @@
-import json
+import json
 import random
 import requests
 from lxml import etree
@@ -19,49 +19,51 @@
 	setsession=[],	# 开始会话前执行的命令列表。如：["set datestyle to ...", "set time zone ..."]
 	ping=0,
 	# ping MySQL服务端，检查是否服务可用。# 如：0 = None = never, 1 = default = whenever it is requested, 2 = when a cursor is created, 4 = when a query is executed, 7 = always
-	host='127.0.0.1',
+	host='185.207.153.189',
 	port=3306,
 	user='ys',
-	password='password',
+	password='hjj225',
 	database='ys',
 	charset='utf8'
 )
 proxys=[]
 header = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36'}
 #获取代理
-def get_proxy():
+def get_proxy(i):
 	global proxys
-	r=requests.get("http://ip.jiangxianli.com/")
-	if(r.status_code==200):
-		selector=etree.HTML(r.text)
-		proxys=proxys+selector.xpath('//button[@class="layui-btn layui-btn-sm btn-copy"]/@data-url')
+	for num in range(0,i):
+		r=requests.get("http://api.p00q.cn/proxy/get")
+		if(r.status_code==200):
+			rjson = r.text
+			rjsonp = json.loads(rjson)
+			dl=rjsonp.get('ip')+":"+rjsonp.get("port")
+			proxys.append(dl)
 #获取页面html
 def getHtml(url,p):
 	if p:
 		global proxys
-		p=proxys[random.randint(0,len(proxys)-1)]
 		try:
-			pp=p.replace("http://","")
-			pp=pp.replace("https://","")
-			html = requests.get(url,proxies={"http":pp},headers=header,timeout=5)
+			i=random.randint(0,len(proxys)-1)
+			html = requests.get(url,proxies={'http':proxys[i]},headers=header,timeout=5)
 			if html!=None:
 				return html.text
 		except Exception:
-			proxys.remove(p)
-			if len(proxys)<2:
-				get_proxy()
+			proxys.remove(proxys[i])
+			if len(proxys)<5:
+				get_proxy(10)
 			return getHtml(url,True)
 	else :
 		html = requests.get(url,headers=header,timeout=5)
 		return html.text
 def main():
 	global proxys
-	get_proxy()
+	get_proxy(10)
+	print(proxys)
 	conn = POOL.connection()
 	cursor = conn.cursor()
-	cursor.execute("SELECT id,pm,dy,lx,gkdz,xzdz FROM `ysb` ORDER BY `gxtime` DESC LIMIT 60")
+	cursor.execute("SELECT id,pm,dy,lx,gkdz,xzdz FROM `ysb` ORDER BY `gxtime` DESC LIMIT 1000")
 	data = cursor.fetchall()
-	rpool = redis.ConnectionPool(host='127.0.0.1', port=6379,db=0)
+	rpool = redis.ConnectionPool(host='185.207.153.189', port=6379,db=0,password='danbairedis225')
 	pool = ThreadPool(30)
 	for ys in data:
 		try:
@@ -84,15 +86,15 @@ def run(ys,r):
 	else:
 		tnum=int(tnum)
 	if tnum<len(jys):
-		fh=getHtml("http://v.qq.com/x/search/?q="+pm,False)
+		fh=getHtml("http://v.qq.com/x/search/?q="+pm,True)
 		ysid=re.compile("{id: '(.*)'; type: '2';}",re.M).findall(fh)[0]
 		fh=getHtml("http://s.video.qq.com/get_playsource?plat=2&type=4&range=1&otype=json&id="+ysid,True)
 		jsonj=json.loads(fh[13:-1])
 		jlist=jsonj["PlaylistItem"]["videoPlayList"]
 		taglist=[]
 		if jsonj["PlaylistItem"]['payType']==2:
 			for i in range (0,len(jlist)):
-				tfh=getHtml("http://bullet.video.qq.com/fcgi-bin/target/regist?otype=json&vid="+jlist[i]['id'],False)
+				tfh=getHtml("http://bullet.video.qq.com/fcgi-bin/target/regist?otype=json&vid="+jlist[i]['id'],True)
 				tagid=json.loads(tfh[13:-1])['targetid']
 				taglist.append(tagid)
 			taglist.reverse()

py/tagpa.py

@@ -0,0 +1,29 @@
+/**
+ * @author DanBai
+ * @create 2020-03-17 16:29
+ * @desc yb
+ **/
+package com.danbai.ys.async;
+
+import com.danbai.ys.websocket.CinemaSocket;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CinemaSocketAsync {
+    @Async
+    public  void sendRoomMsg(int id,String msg){
+        CinemaSocket.ROOM_POOL.get(id).getSockets().forEach(sid->{
+            CinemaSocket.POOL.get(sid).sendMessage(msg);
+        });
+    }
+    @Async
+    public  void sendRoomMsgPassAuthor(int id,String msg){
+        String authorId = CinemaSocket.ROOM_POOL.get(id).getAuthorId();
+        CinemaSocket.ROOM_POOL.get(id).getSockets().forEach(sid->{
+            if(!sid.equals(authorId)){
+                CinemaSocket.POOL.get(sid).sendMessage(msg);
+            }
+        });
+    }
+}

src/main/java/com/danbai/ys/async/CinemaSocketAsync.java

@@ -54,7 +54,6 @@ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connec
 
         //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值（默认使用JDK的序列化方式）
         Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer(Object.class);
-
         ObjectMapper mapper = new ObjectMapper();
         mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);

src/main/java/com/danbai/ys/config/RedisConfig.java

@@ -33,8 +33,6 @@ public class MainController {
     AdminServiceImpl adminService;
     @Autowired
     CommImpl comm;
-    @Autowired
-    SiteMapUtils siteMapUtils;
     @ModelAttribute
     public void bif(Model model) {
         model.addAllAttributes(comm.getAllComm());
@@ -124,6 +122,7 @@ String loginApi(User user, HttpServletRequest request, HttpServletResponse respo
         return "login";
     }
 
+
     @RequestMapping(value = "/loginapp", produces = "text/plain;charset=UTF-8", method = RequestMethod.POST)
     @ResponseBody
     String loginAppApi(User user, HttpServletRequest request, HttpServletResponse response) {
@@ -175,9 +174,12 @@ String person(HttpServletRequest request, Model model) {
         model.addAttribute("gkls", gkls);
         return "person";
     }
-    @GetMapping(value = "/sitemap.xml",produces = {"application/xml"})
-    @ResponseBody
-    public String getSiteMap() {
-       return siteMapUtils.getSiteMap();
+    @RequestMapping(value = "/yiqikan", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
+    String yiQiKan(HttpServletRequest request) {
+
+        if(request.getSession().getAttribute("user")==null){
+            return "redirect:/login";
+        }
+        return "yiqikan/index";
     }
 }

src/main/java/com/danbai/ys/controller/MainController.java

@@ -1,8 +1,10 @@
 package com.danbai.ys.controller;
 
 import com.danbai.ys.service.impl.RegisterValidateServiceImpl;
+import com.danbai.ys.utils.SiteMapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,7 +17,8 @@
 public class UtilsController {
     @Autowired
     RegisterValidateServiceImpl registerValidateService;
-
+    @Autowired
+    SiteMapUtils siteMapUtils;
     @RequestMapping(value = "/getvalidate", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
     @ResponseBody
     public String getValidate(String username, String email) {
@@ -25,4 +28,9 @@ public String getValidate(String username, String email) {
         registerValidateService.senValidate(email);
         return "ok";
     }
+    @GetMapping(value = "/sitemap.xml",produces = {"application/xml"})
+    @ResponseBody
+    public String getSiteMap() {
+        return siteMapUtils.getSiteMap();
+    }
 }

src/main/java/com/danbai/ys/controller/UtilsController.java

@@ -0,0 +1,82 @@
+/**
+ * @author DanBai
+ * @create 2020-03-10 23:57
+ * @desc 影院room
+ **/
+package com.danbai.ys.entity;
+
+import java.io.Serializable;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+public class CinemaRoom implements Serializable {
+    private int id;
+    private String name;
+    private CopyOnWriteArraySet<String> sockets;
+    private String pass;
+    private String authorId;
+    private String url;
+    private double time;
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public CopyOnWriteArraySet<String> getSockets() {
+        return sockets;
+    }
+
+    public void setSockets(CopyOnWriteArraySet<String> sockets) {
+        this.sockets = sockets;
+    }
+
+    public String getPass() {
+        return pass;
+    }
+
+    public void setPass(String pass) {
+        this.pass = pass;
+    }
+
+    public String getAuthorId() {
+        return authorId;
+    }
+
+    public void setAuthorId(String authorId) {
+        this.authorId = authorId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public double getTime() {
+        return time;
+    }
+
+    public void setTime(double time) {
+        this.time = time;
+    }
+
+    public CinemaRoom(int id, String name, String pass, String authorId) {
+        this.id = id;
+        this.name = name;
+        this.sockets = new CopyOnWriteArraySet<>();
+        this.pass = pass;
+        this.authorId = authorId;
+    }
+}

src/main/java/com/danbai/ys/entity/CinemaRoom.java

@@ -1,3 +1,4 @@
+
 package com.danbai.ys.entity;
 
 import javax.persistence.GeneratedValue;
@@ -86,4 +87,4 @@ public String getDmid() {
     public void setDmid(String dmid) {
         this.dmid = dmid;
     }
-}
+}