1

ai_pyppeteer.py

@@ -126,33 +126,44 @@ class ToWork:
                 await asyncio.sleep(1)
         return status
 
-    # 登录
     async def login(self, page):
-        user_name = '2897821407@qq.com'
-        password = 'lhj157839477'
+        """
+            登录
+            :param page:
+            :return:
+        """
+        # 初始化return
+        result_obj = {
+            # 是否需要登录
+            'need_login': False,
+            # 状态
+            'status': False,
+        }
         # 用户名
         user_name_path = '//input[@name="email"]'
         is_offline = await self.FindElement(page, user_name_path)
         if is_offline:
-            #
+            # 修改为需要登录状态
+            result_obj['need_login'] = True
             logger.info('账号掉线，重新登录')
             name_el = await page.waitForXPath(user_name_path)
-            await name_el.type(user_name, {"delay": 1})
+            await name_el.type(self.browser_item['user_name'], {"delay": 1})
             # 密码
             password_path = '//*[@name="password"]'
             pwd_el = await self.FindElement(page, password_path)
             if pwd_el:
-                await pwd_el.type(password, {"delay": 1})
+                await pwd_el.type(self.browser_item['password'], {"delay": 1})
                 # 判断输入的内容
                 user_name_value = await page.evaluate('(name_el) => name_el.value', name_el)
                 password_value = await page.evaluate('(pwd_el) => pwd_el.value', pwd_el)
-                if user_name_value == user_name and password_value == password:
+                if user_name_value == self.browser_item['user_name'] and password_value == self.browser_item[
+                    'password']:
                     # 输入的值正确--点击登录
                     login_path = '//*[@id="app-mount"]/div[2]/div[1]/div[1]/div/div/div/div/form/div[2]/div/div[1]/div[2]/button[2]'
                     status = await self.ElementClick(page, login_path)
                     if status:
-                        return True
-        return False
+                        result_obj['status'] = True
+        return result_obj
 
     async def img_callback(self, task, href, message=''):
         url = task['callback']
@@ -389,15 +400,22 @@ class ToWork:
 
     # 等待登录成功
     async def wait_login_success(self, page):
-        logger.info('开始判断登录状态')
         while True:
-            # 登录成功元素
-            page_load = '//div[contains(@aria-label, "测试服务器")]'
-            login_success_el = await self.FindElement(page, page_load)
-            if login_success_el:
-                return True
-            #
-        return False
+            try:
+                # 登录成功元素
+                page_load = '//div[contains(@aria-label, "测试服务器")]'
+                login_success_el = await self.FindElement(page, page_load)
+                if login_success_el:
+                    return True
+                # 判断是否需要登录
+                res_obj = await self.login(page)
+                logger.info('等待登录成功')
+                # 等待三秒
+                time.sleep(3)
+            except Exception as e:
+                logger.info(e)
+                # 等待三秒
+                time.sleep(3)
 
     async def specified_server(self, page):
         try:
@@ -476,7 +494,9 @@ if __name__ == '__main__':
                 'num': 1,
                 # 'id': 'A1263FA0-7BBD-42F8-B048-75678D59654D',
                 # c
-                'id': '1FBCB385-2E09-4505-BF52-4B45099DBD08'
+                'id': '1FBCB385-2E09-4505-BF52-4B45099DBD08',
+                'user_name': '2897821407@qq.com',
+                'password': 'lhj157839477'
             }
         ]
         lock = Lock()