| 
					
				 | 
			
			
				@@ -20,6 +20,7 @@ from common.feishu import Feishu 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 from common.getuser import getUser 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 from common.db import MysqlHelper 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 from common.publish import Publish 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+from common.public import get_user_from_mysql 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 from common.userAgent import get_random_user_agent 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -386,11 +387,12 @@ class KuaiShouFollow: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Accept': '*/*', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Content-Type': 'application/json', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Origin': 'https://www.kuaishou.com', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                'Cookie': 'kpf=PC_WEB; clientid=3; did=web_c11041a45efb379fa3e11198d58d1dd1; kpn=KUAISHOU_VISION', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                'Cookie': 'kpf=PC_WEB; clientid=3; did=web_3f264336f6a6c191cd36fb15e87ab708; kpn=KUAISHOU_VISION', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Content-Length': '1244', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Accept-Language': 'zh-CN,zh-Hans;q=0.9', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Host': 'www.kuaishou.com', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',#get_random_user_agent('pc'), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                # get_random_user_agent('pc'), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Referer': 'https://www.kuaishou.com/profile/{}'.format(out_uid), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Accept-Encoding': 'gzip, deflate, br', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 'Connection': 'keep-alive' 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -737,11 +739,14 @@ class KuaiShouFollow: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @classmethod 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     def get_follow_videos(cls, log_type, crawler, strategy, oss_endpoint, env, machine): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        user_list = cls.get_user_list(log_type=log_type, crawler=crawler, sheetid="bTSzxW", env=env, machine=machine) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        # user_list = cls.get_user_list(log_type=log_type, crawler=crawler, sheetid="bTSzxW", env=env, machine=machine) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        user_list = get_user_from_mysql(log_type, crawler, crawler, env, machine) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for user in user_list: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            out_uid = user["out_uid"] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            user_name = user["user_name"] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            our_uid = user["our_uid"] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            spider_link = user["spider_link"] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            out_uid = spider_link.split('/')[-1] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            user_name = user["nick_name"] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            our_uid = user["media_id"] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Common.logger(log_type, crawler).info(f"开始抓取 {user_name} 用户主页视频\n") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             try: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 cls.get_videoList(log_type=log_type, 
			 |