smartpush 1.5.4__py3-none-any.whl → 1.5.6__py3-none-any.whl

smartpush/account/operate_account.py

@@ -0,0 +1,36 @@
+import json
+import requests
+
+
+def del_merchant_sub_account(cookies, ac_host, merchantId, platform, num=None):
+    """删除店铺未验证子账号"""
+    if num is None or num == "":
+        num = 49
+        # 查询店铺所有子账号
+    role_url = ac_host + "/role/getMerchantRoles"
+    role_headers = {
+        'cookie': cookies
+    }
+    params = {"merchantId": merchantId, "plat": platform}
+    del_roles = {}
+    role_result = json.loads(requests.request("GET", url=role_url, params=params, headers=role_headers).text)
+    if num > len(role_result["resultData"]["merchantRoleInfos"]):
+        num = len(role_result["resultData"]["merchantRoleInfos"])
+    for i in range(num):
+        if not (role_result["resultData"]["merchantRoleInfos"][i]["status"] == "1" or
+                role_result["resultData"]["merchantRoleInfos"][i]["role"] == "owner"):
+            del_roles[i] = role_result["resultData"]["merchantRoleInfos"][i]
+            del_roles[i]["plat"] = role_result["resultData"]["plat"]
+            del_roles[i]["merchantId"] = merchantId
+            del del_roles[i]["status"]
+            del del_roles[i]["name"]
+
+    # 删除子账号
+    del_role_url = ac_host + "/role/delMerchantRole"
+    role_headers["content-type"] = 'application/json'
+    results = []
+    for i in del_roles.values():
+        del_role_result = requests.request("POST", url=del_role_url, headers=role_headers, data=json.dumps(i)).text
+        results.append({i["email"]: del_role_result})
+
+    print(f"已删除账号: {results}")

smartpush/base/request_base.py

@@ -1,7 +1,6 @@
 import json
 
 import requests
-from requests import session
 from requests.adapters import HTTPAdapter
 from tenacity import stop_after_attempt, wait_fixed, retry
 from urllib3 import Retry

smartpush/form/form_after.py

@@ -77,8 +77,8 @@ class FormAfter(FormRequestBase):
 
     def callDeleteForm(self, merchant_id):
         requestParam = {"formId": self.form_id, "merchant_id": merchant_id}
-        result = self.request(url=self.host + URL.deleteForm.url, params=requestParam)
-        assert result['code']
+        result = self.request(method=URL.deleteForm.method,url=URL.deleteForm.url, params=requestParam)
+        assert result['code'] == 1
         print(f"删除id:{self.form_id}表单成功")
 
     # --------        处理数据  --------------
@@ -152,3 +152,12 @@ class FormAfter(FormRequestBase):
 
     def getCrowdPersonList(self, _id, page=1, pageSize=20, filter_type="email", filter_value=""):
         self.callCrowdPersonList(self, _id, page, pageSize, filter_type, filter_value)
+
+if __name__ == '__main__':
+    heard = {
+        'cookie': 'osudb_appid=SMARTPUSH;osudb_oar=#01#SID0000130BNXOsK5n5eE9jRh/qvw4GkPUL+3WXTwjU1L8VyW4x8OsSN2Z2/Dt4aoaLuvY8+7q9DWFuwOYuZEvYlUl28lCuZSliDRKgR25jsvr/a7AhjqltByzrs9QzPyaHJwgI1LND0Xt4QVU2c5FxQlCfex5;osudb_subappid=1;osudb_uid=4213785247;ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTI2Mzg0NzUsImp0aSI6IjU3OTVkMTJkLTFkMDktNGRlZi1hOTFlLWVkNzVlYzRiYzk5YSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc1MDA0NjQ3NTkzNywic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIiwiYXBpLXNwLW1hcmtldC1lYzIiXSwiY2xpZW50X2lkIjoiZW1haWwtbWFya2V0In0.T9u3uzrxEulBSMWB-mqkyxEsu6tB-7FVqt9nBhkxPAo;',
+        'authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTI2Mzg0NzUsImp0aSI6IjU3OTVkMTJkLTFkMDktNGRlZi1hOTFlLWVkNzVlYzRiYzk5YSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc1MDA0NjQ3NTkzNywic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIiwiYXBpLXNwLW1hcmtldC1lYzIiXSwiY2xpZW50X2lkIjoiZW1haWwtbWFya2V0In0.T9u3uzrxEulBSMWB-mqkyxEsu6tB-7FVqt9nBhkxPAo',
+        'Content-Type': 'application/json'}
+    host = 'https://test.smartpushedm.com/bff/api-em-ec2'
+    after = FormAfter(form_id=19238, headers=heard, host=host)
+    print(after.callGetFormInfo())

{smartpush-1.5.4.dist-info → smartpush-1.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.5.4
+Version: 1.5.6
 Summary: 用于smartpush自动化测试工具包
 Author: lulu、felix、long
 

{smartpush-1.5.4.dist-info → smartpush-1.5.6.dist-info}/RECORD

@@ -1,8 +1,10 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=OYaDV6VPAmkGKYLlRnsi1ZyKHU8xEiVnjsYrc41ZR0U,17910
+smartpush/account/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/account/operate_account.py,sha256=nzJLLAEwNElavZeWVqnA_MSGTBzQrSrknmezYBwtvWs,1525
 smartpush/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,24643
-smartpush/base/request_base.py,sha256=LQfbECJTIk57iV-JFNjOx_zWbhwCLWAWTOUU1VmwTIw,1877
+smartpush/base/request_base.py,sha256=JCkISn2mp_Aaugv_ZaNtFQrVaHtjQPxGgko6kCXOdlk,1848
 smartpush/base/url_enum.py,sha256=_RcBMjDMWS_KOAK9T0HKG9msOWZLJGiKYKC4W5lOKjU,965
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=3IAeu1kjFS4MpDxjVB1htAcRA1BtfpH3xEkZyP4htAA,19963
@@ -12,18 +14,17 @@ smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0F
 smartpush/flow/MockFlow.py,sha256=MI8WIMZyKlxrV5QVs8rXX6iD07Ldl37_L5Yb5FWqHzU,8595
 smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/form/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/form/form_after.py,sha256=3z3dO22_ncVsAA1w9zGAcfJZCOELZ2lVBmaV-RfD0Hc,6335
+smartpush/form/form_after.py,sha256=j68HXkeCNCqjCkn3QFZbqutsKNMB7pLEzbuZPfFc2Q8,9395
 smartpush/form/form_assert.py,sha256=wPIRfQHhr7lN1fFd-mp0z_qKMtF4jfrNxRWvp2xfqCg,257
 smartpush/form/form_before.py,sha256=CCvAC_2yWPlnQGtjEA8LPLy9853Nq3nNjcL2GewFWIs,175
 smartpush/form/form_client_operation.py,sha256=gg-5uHXCyMa_ypBSYPYFVxXdwZdYBJsNtUCqayknMBw,303
-smartpush/form/test_form_after.py,sha256=aZglf2k2BUqKgL7FDMGX25rQ_ulj5kCd4R70hQzx4zs,58
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
 smartpush/utils/ListDictUtils.py,sha256=Fm5_d7UyY6xB8gySMPdl5jIFSRhXZcYXdYW-_L1alcE,1640
 smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
-smartpush-1.5.4.dist-info/METADATA,sha256=UWktqTBpOYyes2pWSBCBjNF_RsRAvSNqLLgkuDS3cdE,131
-smartpush-1.5.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.5.4.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.5.4.dist-info/RECORD,,
+smartpush-1.5.6.dist-info/METADATA,sha256=6KmjOu4G6bt-vHKfqmIs31lW_QRfpw6G7rk-Rhi8C5k,131
+smartpush-1.5.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.5.6.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.5.6.dist-info/RECORD,,

smartpush/form/test_form_after.py

@@ -1,2 +0,0 @@
-def test_call_page_form_report_detail():
-    assert False