Merge branch 'master' into feature/v1.0.2

cases/fragmentation/登录/详情/purchasing_analysis.py

@@ -8,7 +8,6 @@ class c1:
         STEP(1, '第一步调用函数')
         res=apimgr.purchasing_analysis()
         r = res.json()
-        INFO(r)
         actural=r['error_code']
         # INFO(length)
         STEP(2, '第二步设置检查点')

cases/pc/未登录功能/bidsearch.py

@@ -1,11 +0,0 @@
-from hytest import *
-from lib.webapi import apimgr
-
-class c1:
-    name = '未登录招标搜索'
-    def teststeps(self):
-        res=apimgr.notloggedin_search()
-        code=res.status_code
-
-        # 设置检查点
-        CHECK_POINT('检查未登录招标搜索接口是否正常', code == 200)

cases/pc/未登录功能/buyersearch.py

@@ -1,12 +0,0 @@
-from hytest import *
-from lib.webapi import apimgr
-
-class c1:
-    name = '未登录采购单位搜索'
-    def teststeps(self):
-        res=apimgr.notloggedin_buysearch('科技')
-        r=res.json()
-        INFO(r)
-        actural = r['data']['count']
-        # 设置检查点
-        CHECK_POINT('检查未登录采购单位搜索接口是否正常', actural != 0)

cases/pc/未登录功能/搜索列表/buyerList.py

@@ -4,7 +4,6 @@ from hytest import *
 from lib.webapi import apimgr
 class c5:
     #测试用例名称
-    tags = ['采购单位搜索列表']
     name = '采购单位搜索列表'
     #测试步骤
     def teststeps(self):

cases/pc/未登录功能/链接验证/__st__.py

@@ -1,10 +0,0 @@
-from lib.linkapi import apilink
-
-def suite_setup():
-    # 初始化 Playwright
-    apilink.setup()
-
-
-def suite_teardown():
-    # 关闭浏览器
-    apilink.teardown()

cases/pc/未登录功能/链接验证/check_link_image_comparison.py

@@ -1,49 +0,0 @@
-# from hytest import *
-# from lib.linkapi import apilink
-# class T0001:
-#     #测试用例名称
-#     tags=['标讯搜索页验证']
-#     url1 = 'https://app-a1.jianyu360.cn/jy_mobile/search/middle/bidding'
-#     # 测试用例1
-#     # 样本快照,每一个链接，快照的名字不一样，要修改
-#     expected_app_search_screenshot = 'images/expected_app_search_screenshot.png'
-#     current_app_search_screenshot = 'images/current_app_search_screenshot.png'
-#
-#     # 定义要截取的区域
-#     clip1 = {
-#         'x': 0,
-#         'y': 0,
-#         'width': 1280,  # 根据你的截图实际宽度设置
-#         'height': 600  # 根据你的截图实际高度设置
-#     }
-#     # 测试用例2
-#     url2 = 'https://wx.jianyu360.cn/jy_mobile/search/result/bidding'
-#     # 样本快照,每一个链接，快照的名字不一样，要修改
-#     expected_wx_search_screenshot = 'images/expected_wx_search_screenshot.png'
-#     current_wx_search_screenshot = 'images/current_wx_search_screenshot.png'
-#
-#     # 定义要截取的区域
-#     clip2 = {
-#         'x': 0,
-#         'y': 0,
-#         'width': 1280,  # 根据你的截图实际宽度设置
-#         'height': 600  # 根据你的截图实际高度设置
-#     }
-#     ddt_cases = [
-#         {
-#             'name': 'app标讯搜索页面能否正常打开',
-#             'para': [url1, expected_app_search_screenshot, current_app_search_screenshot, clip1]
-#         },
-#         {
-#             'name': '微信标讯搜索页面能否正常打开',
-#             'para': [url2, expected_wx_search_screenshot, current_wx_search_screenshot, clip2]
-#         }
-#     ]
-#
-#     #测试步骤
-#
-#     def teststeps(self):
-#         url,expected_screenshot,current_screenshot,clip= self.para
-#         result=apilink.contrast_snapshot(url,expected_screenshot,current_screenshot,clip)
-#
-#         CHECK_POINT("检查标讯搜索页面是否正常打开", result)

cases/pc/未登录功能/链接验证/check_link_search.py

@@ -1,16 +0,0 @@
-# from hytest import *
-# from lib.linkapi import apilink
-# class T0001:
-#     #测试用例名称
-#     name = "app标讯搜索页验证1"
-#     #测试步骤
-#     def teststeps(self):
-#         STEP(1, "访问页面并截取特定区域快照")
-#         # url = 'https://app-a1.jianyu360.cn/jy_mobile/search/middle/bidding'
-#         url = 'https://www.baidu.com'
-#         #样本快照,每一个链接，快照的名字不一样，要修改
-#         expected_screenshot = 'images/expected_app_search_screenshot.png'
-#         current_screenshot = 'images/current_app_search_screenshot.png'
-#         elements=['.s_ipt','.s-hotsearch-title']
-#         result=apilink.contrast_snapshot(url,expected_screenshot,current_screenshot,elements,clip=None)
-#         CHECK_POINT("检查app标讯搜索页面是否正常打开", result)

cases/pc/登录功能/搜索功能/bidsearch.py

@@ -9,7 +9,6 @@ class c2:
         STEP(1,'第一步调用函数')    #会出现在测试报告中
         res = apimgr.bidsearch()
         code = res.status_code
-        INFO(res)
         STEP(2,'第二步设置检查点')
         #设置检查点
         CHECK_POINT('检查招标搜索接口是否正常',code == 200)

cases/pc/登录功能/搜索功能/enterpriseSearch.py

@@ -1,3 +1,5 @@
+from time import sleep
+
 from hytest import *
 from lib.webapi import apimgr
 class c3:
@@ -6,7 +8,8 @@ class c3:
     #测试步骤
     def teststeps(self):
         INFO('测试步骤')
-        STEP(1,'第一步调用函数')    #会出现在测试报告中
+        STEP(1,'第一步调用函数') #会出现在测试报告中
+        sleep(3)
         r = apimgr.enterpriseSearch()
         if r is not None:
             try:

cases/pc/登录功能/数据/send_mailverify.py

@@ -1,3 +1,5 @@
+from time import sleep
+
 from hytest import *
 from lib.webapi import apimgr
 
@@ -6,6 +8,7 @@ class c1:
     def teststeps(self):
         INFO("测试步骤")
         STEP(1, '第一步调用函数')
+        sleep(3)
         res=apimgr.send_mailverify()
         r = res.json()
         actural = r["success"]

cases/pc/登录功能/机构中心/add_personnel.py

@@ -1,13 +1,13 @@
+from time import sleep
 from hytest import *
 from lib.webapi import apimgr
-import json
-
 class c1:
     name = '添加人员'
 
     def teststeps(self):
         INFO('初始化方法')
         STEP(1, '第一步调用函数')
+        sleep(3)
         res = apimgr.add_personnel()
         resp = res.json()
         error_code = resp['error_code']

cases/pc/登录功能/机构中心/enterprise_information.py

@@ -1,6 +1,6 @@
+from time import sleep
 from hytest import *
 from lib.webapi import apimgr
-import json
 
 class c1:
     name = '企业信息'
@@ -8,6 +8,7 @@ class c1:
     def teststeps(self):
         INFO('初始化方法')
         STEP(1, '第一步调用函数')
+        sleep(3)
         res = apimgr.enterprise_information()
         resp = res.json()
         error_code = resp['error_code']

cases/pc/登录功能/机构中心/subdepartment.py

@@ -1,13 +1,13 @@
+from time import sleep
 from hytest import *
 from lib.webapi import apimgr
-import json
-
 class c1:
     name = '子部门'
 
     def teststeps(self):
         INFO('初始化方法')
         STEP(1, '第一步调用函数')
+        sleep(3)
         res = apimgr.subdepartment()
         resp = res.json()
         error_code = resp['error_code']

doc/sendemail.py

@@ -34,25 +34,25 @@ def send_email(report_name):
     username="liumm_6064@163.com"
     password="TPVBPYSETVHWTIDH"
     #接受邮件的邮箱
-    receiver=['lizhikun@topnet.net.cn']
+    receiver=['yanpeizhu@topnet.net.cn','renzheng@topnet.net.cn','lianbingjie@topnet.net.cn','lizhikun@topnet.net.cn','jialuyao@topnet.net.cn','liumiaomiao@topnet.net.cn','luwenna@topnet.net.cn','zangyamei@topnet.net.cn','yuanyuan@topnet.net.cn']
+    # receiver=['liumiaomiao@topnet.net.cn']
     #创建邮件对象
     message=MIMEMultipart('related')
     #邮件主题
     subject="剑鱼自动化测试报告"
-    fujian=MIMEText(open(f'D:\PycharmProjects\jianyu_auto_api\log/{report_name}','rb').read(),'html','utf-8')
+    fujian=MIMEText(open(f'/mnt/jianyu_auto_api/log/{report_name}','rb').read(),'html','utf-8')
     #把邮件信息组装到邮件对象里面
     message['from']=username
     message['to']= ",".join(receiver)
     message['subject']=subject
     message.attach(fujian)
     #登录smtp服务器并发送邮件
-    smtp=smtplib.SMTP()
-    smtp.connect(smtpserver)
+    smtp=smtplib.SMTP_SSL(smtpserver,465)
     smtp.login(username,password)
     smtp.sendmail(username,receiver,message.as_string())
     smtp.quit()
 if __name__ == '__main__':
-    dir = r'D:\PycharmProjects\jianyu_auto_api\log'
+    dir = r'/mnt/jianyu_auto_api/log'
     filename = find_newest_file(dir)
     if filename:
         send_email(filename)

lib/linkapi.py

@@ -1,5 +1,4 @@
 from hytest import *
-from playwright.sync_api import sync_playwright
 from PIL import Image, ImageChops
 from bs4 import BeautifulSoup
 import requests
@@ -52,16 +51,6 @@ class APILink():
         element_value = element.text
         return element_value
 
-    def setup(self):
-        # 初始化 Playwright
-        self.playwright = sync_playwright().start()
-        self.browser = self.playwright.chromium.launch(headless=True)
-        self.page = self.browser.new_page()
-
-    def teardown(self):
-        # 关闭浏览器
-        self.browser.close()
-        self.playwright.stop()
 
     def obtain_element_text(self,url,element):
         self.page.goto(url)

lib/webapi.py

@@ -55,7 +55,7 @@ class APIMgr():
     s = requests.Session()
     GSTORE['s'] = s
     #pc登录接口
-    def mgr_login(self, phone='18211989987', password='123456',useproxies=False):
+    def mgr_login(self, phone='18211989987', password='#80Z!RVv52',useproxies=False):
         headers=GSTORE['headers']
         s = GSTORE['s']
         if useproxies:
@@ -67,12 +67,11 @@ class APIMgr():
                                      'phone':phone,
                                      'password':password
                                     })
-        self.printResponse(response)
         # 把response对象返回出去
         return response
 
     # app登录接口
-    def mgr_login_app(self, phone='18211989987', password='123456',useproxies=False):
+    def mgr_login_app(self, phone='18211989987', password='#80Z!RVv52',useproxies=False):
         headers=GSTORE['headers']
         s = GSTORE['s']
         if useproxies:
@@ -88,7 +87,6 @@ class APIMgr():
                                      'channel': '',
                                      'deviceId': ''
                                     })
-        self.printResponse(response)
         # 把response对象返回出去
         return response
     """退出登录pc"""
@@ -97,7 +95,6 @@ class APIMgr():
         headers = GSTORE['headers']
         s = GSTORE['s']
         s.post(url=url, headers=headers)
-        # self.printResponse(res)
         # return res
 
     """退出登录app"""
@@ -114,7 +111,6 @@ class APIMgr():
         #保存session
         session = self.s
         response = session.post(f"{cfg.target_host}/jylab/supsearch/index.html", headers=headers, params=params)
-        self.printResponse(response)
         return response
     #超前项目搜索
     def advanced_search(self):
@@ -162,7 +158,6 @@ class APIMgr():
             'pageSize': pageSize,
             'pageNum': pageNum
         })
-        self.printResponse(response)
         return response
 
     # 供应搜索
@@ -183,7 +178,6 @@ class APIMgr():
             }
         session=self.s
         response = session.post(url=url, headers=headers, data=json.dumps(data))
-        self.printResponse(response)
         return response
 
     #采购单位搜索
@@ -208,7 +202,6 @@ class APIMgr():
             "pageNum":pageNum
         }
         response = requests.post(url=url, json=data, headers=self.headers)
-        self.printResponse(response)
         return response
 
     #融创用户搜索
@@ -253,7 +246,6 @@ class APIMgr():
 
         session = self.s
         response = session.post(url=url, headers=headers, params=params)
-        self.printResponse(response)
         return response
 
     """三级页公告摘要"""
@@ -567,7 +559,7 @@ class APIMgr():
         headers = GSTORE['headers']
         s = GSTORE['s']
         params = {
-            "password": "123456"
+            "password": "#80Z!RVv52"
         }
         response = s.post(f"{cfg.target_host}/publicapply/password/check", headers=headers, params=params)
         return response