smartpush 1.9.9__py3-none-any.whl → 2.0.0__py3-none-any.whl

smartpush/base/request_base.py

@@ -41,21 +41,23 @@ class RequestBase:
         }
         response_json = None
         default_kwargs.update(kwargs)
-        if default_kwargs.get('data') and isinstance(default_kwargs.get('data'), dict):  # 如果data有值json序列化
+        if default_kwargs.get('data') and isinstance(default_kwargs.get('data'), dict):
             data = json.dumps(default_kwargs.get('data'))
             default_kwargs.update({'data': data})
+        response = None
         try:
             print("请求参数为：\n", json.dumps(default_kwargs, ensure_ascii=False))
             response = self.session.request(method, url, **default_kwargs)
             response.raise_for_status()
             response_json = response.json()
             print("响应内容为：\n", json.dumps(response_json, ensure_ascii=False))
-            # assert response_json['code'] == 1
             return response_json
         except requests.exceptions.RequestException as e:
             print(f"请求失败: {e}")
             return None
         except Exception as e:
+            print("响应：\n", response)
+            print("响应内容为：\n", json.dumps(response.json(), ensure_ascii=False))
             raise e
 
 

smartpush/base/url_enum.py

@@ -25,9 +25,9 @@ class URL:
         """
         :type:表单报告
         """
-        pageFormReportDetail = '/formReport/detail/pageFormReportDetail', 'POST'  # 获取表单收集数据
-        getFormReportDetail = '/formReport/getFormReportDetail', 'POST'  # 获取表单报告数据(曝光/点击)
-        getFormPerformanceTrend = 'formReport/getFormPerformanceTrend', 'POST'
+        pageFormReportDetail = '/formReport/detail/pageFormReportDetail', POST  # 获取表单收集数据
+        getFormReportDetail = '/formReport/getFormReportDetail', POST  # 获取表单报告数据(曝光/点击)
+        getFormPerformanceTrend = 'formReport/getFormPerformanceTrend', POST
 
     class Crowd(BaseEnum):
         """

smartpush/crowd/crowd.py

@@ -1,10 +1,10 @@
 import json
 import time
-from smartpush.utils import ListDictUtils
+
 from smartpush.base.request_base import CrowdRequestBase, RequestBase
 from smartpush.base.url_enum import URL
-from smartpush.export.basic.ExcelExportChecker import compare_lists, compare_dicts
-from smartpush.export.basic.ReadExcel import read_excel_file_form_local_path
+from smartpush.export.basic.ExcelExportChecker import compare_dicts
+from smartpush.utils import ListDictUtils
 
 
 class Crowd(CrowdRequestBase):
@@ -37,7 +37,8 @@ class Crowd(CrowdRequestBase):
         requestParam = {"id": self.crowd_id, "page": page, "pageSize": pageSize}
         if filter_value is not None:
             requestParam["filter"] = {filter_type: {operator: filter_value}}
-        result = self.request(method=URL.Crowd.crowdPersonListInPackage.method, path=URL.Crowd.crowdPersonListInPackage.url,
+        result = self.request(method=URL.Crowd.crowdPersonListInPackage.method,
+                              path=URL.Crowd.crowdPersonListInPackage.url,
                               data=requestParam)
         resultData = result['resultData']
         return resultData
@@ -52,7 +53,8 @@ class Crowd(CrowdRequestBase):
         requestParam = {"id": self.crowd_id, "page": page, "pageSize": pageSize, "filter": {}}
         # if filter_value is not None:
         #     requestParam["filter"] = {filter_type: {"in": filter_value}}
-        result = self.request(method=URL.Crowd.crowdPackageDetail.method, path=URL.Crowd.crowdPackageDetail.url, data=requestParam)
+        result = self.request(method=URL.Crowd.crowdPackageDetail.method, path=URL.Crowd.crowdPackageDetail.url,
+                              data=requestParam)
         resultData = result['resultData']
         return resultData
 
@@ -95,31 +97,32 @@ class CrowdList(RequestBase):
 if __name__ == '__main__':
     host = "https://test.smartpushedm.com/bff/api-em-ec2"
     headers = {
-        "cookie": "sl_lc_session_id=ARdVBTYWFkAHFAOZAAAAAAAAAL-KVkgKBEThtKK15gJ0Zs5FGBzwsoTN2dBPh0jqgjbD; osudb_lang=; a_lang=zh-hans-cn; osudb_uid=4600602538; osudb_oar=#01#SID0000137BGuxewUplqynPbKiaNcheknhOa/Gnew3PkzQg3g4wX8svtCKzKNYEqtDMqbcprxgo3dc1piMLUaV7AcPZ4EYmLp/EjQbAowjsUkUOm02fj3Fd8WW8B8vDA2T9PNFbVEKwTdvt4T5g550posh1y5a; osudb_appid=SMARTPUSH; osudb_subappid=1; ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjA2NzA4MzUsImp0aSI6ImQyZTkxMzMyLTYwMTMtNGI3NC04NzAzLWQzZDAxMzkyNTdjNSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0NjAwNjAyNTM4IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6Imx1Lmx1QHNob3BsaW5lLmNvbSIsInVzZXJSb2xlIjoib3duZXIiLCJwbGF0Zm9ybVR5cGUiOjcsInN1YlBsYXRmb3JtIjoxLCJwaG9uZSI6IiIsImxhbmd1YWdlIjoiemgtaGFucy1jbiIsImF1dGhUeXBlIjoiIiwiYXR0cmlidXRlcyI6eyJjb3VudHJ5Q29kZSI6IkNOIiwiY3VycmVuY3kiOiJVU0QiLCJjdXJyZW5jeVN5bWJvbCI6IlVTJCIsImRvbWFpbiI6Imx1LWx1LmVtYWlsIiwibGFuZ3VhZ2UiOiJ6aC1oYW50LXR3IiwibWVyY2hhbnRFbWFpbCI6Imx1Lmx1QHNob3BsaW5lLmNvbSIsIm1lcmNoYW50TmFtZSI6Imx1bHUzODIt6K6i6ZiF5byP55S15ZWGIiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL1NoYW5naGFpIn0sInN0b3JlSWQiOiIxNzQ1Mzc3NzA1OTM2IiwiaGFuZGxlIjoibHVsdTM4MiIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc1ODA3ODgzNTYwMiwic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIiwiYXBpLXNwLW1hcmtldC1lYzIiXSwiY2xpZW50X2lkIjoiZW1haWwtbWFya2V0In0.ZMtJ83tH8i-BArVnSvfS4rKCD49N8WLsnhxVJ11BddI; JSESSIONID=02CC44F5CD538B9151BF875A62716465",
-        "authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjA2NzA4MzUsImp0aSI6ImQyZTkxMzMyLTYwMTMtNGI3NC04NzAzLWQzZDAxMzkyNTdjNSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0NjAwNjAyNTM4IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6Imx1Lmx1QHNob3BsaW5lLmNvbSIsInVzZXJSb2xlIjoib3duZXIiLCJwbGF0Zm9ybVR5cGUiOjcsInN1YlBsYXRmb3JtIjoxLCJwaG9uZSI6IiIsImxhbmd1YWdlIjoiemgtaGFucy1jbiIsImF1dGhUeXBlIjoiIiwiYXR0cmlidXRlcyI6eyJjb3VudHJ5Q29kZSI6IkNOIiwiY3VycmVuY3kiOiJVU0QiLCJjdXJyZW5jeVN5bWJvbCI6IlVTJCIsImRvbWFpbiI6Imx1LWx1LmVtYWlsIiwibGFuZ3VhZ2UiOiJ6aC1oYW50LXR3IiwibWVyY2hhbnRFbWFpbCI6Imx1Lmx1QHNob3BsaW5lLmNvbSIsIm1lcmNoYW50TmFtZSI6Imx1bHUzODIt6K6i6ZiF5byP55S15ZWGIiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL1NoYW5naGFpIn0sInN0b3JlSWQiOiIxNzQ1Mzc3NzA1OTM2IiwiaGFuZGxlIjoibHVsdTM4MiIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc1ODA3ODgzNTYwMiwic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIiwiYXBpLXNwLW1hcmtldC1lYzIiXSwiY2xpZW50X2lkIjoiZW1haWwtbWFya2V0In0.ZMtJ83tH8i-BArVnSvfS4rKCD49N8WLsnhxVJ11BddI"}
+        "cookie": "sl_lc_session_id=ARdgF0IxFkAHFAOZAAAAAAAAABJgXW48NEPOu5SFl0dmT_3mihLHpce906zxUbThGnBe; _ga=GA1.1.676535481.1761883127; _ga_D2KXR23WN3=GS2.1.s1761883127$o1$g0$t1761883170$j17$l0$h0; sl_lr_session_id=ARdiIhhRFkAHFBUHAAAAAAAAAF08xxHuy0uKhjUqNs0ySkc050947mcvDaYK1whe3bi0; sp-session-open=true; osudb_lang=; sl_sc_session_id=ARdjNlKHFkAHFBUHAAAAAAAAACKxXGuiEEi6p_f7aB_GsR1asT_RaDMApK3eKmrzF7K4; sl_sr_session_id=ARdjNlKHFkAHFBUHAAAAAAAAALw794pz7UbdgxmE9hqsfoCD0maOX-3IE8uxltg4-wSI; osudb_appid=SMARTPUSH; osudb_subappid=1; osudb_uid=4600602538; osudb_oar=#01#SID0000142BPp54f8NDtV4PIn2E2jFeSWv0Yvr3/bJiObNipUuVmL68bE0gjeq6e4AvQlafd9IfQNXzplOpO1uv7soFJlYEudAcdY+RHiefXV9GaweU3oaqcQhHDeybhaEVH1wYJxato/m3SY4rrPu/mgUba51; JSESSIONID=176938AB2D7E2F1BBEDB9B71E88EE8D5",
+        # "authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjA2NzA4MzUsImp0aSI6ImQyZTkxMzMyLTYwMTMtNGI3NC04NzAzLWQzZDAxMzkyNTdjNSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0NjAwNjAyNTM4IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6Imx1Lmx1QHNob3BsaW5lLmNvbSIsInVzZXJSb2xlIjoib3duZXIiLCJwbGF0Zm9ybVR5cGUiOjcsInN1YlBsYXRmb3JtIjoxLCJwaG9uZSI6IiIsImxhbmd1YWdlIjoiemgtaGFucy1jbiIsImF1dGhUeXBlIjoiIiwiYXR0cmlidXRlcyI6eyJjb3VudHJ5Q29kZSI6IkNOIiwiY3VycmVuY3kiOiJVU0QiLCJjdXJyZW5jeVN5bWJvbCI6IlVTJCIsImRvbWFpbiI6Imx1LWx1LmVtYWlsIiwibGFuZ3VhZ2UiOiJ6aC1oYW50LXR3IiwibWVyY2hhbnRFbWFpbCI6Imx1Lmx1QHNob3BsaW5lLmNvbSIsIm1lcmNoYW50TmFtZSI6Imx1bHUzODIt6K6i6ZiF5byP55S15ZWGIiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL1NoYW5naGFpIn0sInN0b3JlSWQiOiIxNzQ1Mzc3NzA1OTM2IiwiaGFuZGxlIjoibHVsdTM4MiIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc1ODA3ODgzNTYwMiwic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIiwiYXBpLXNwLW1hcmtldC1lYzIiXSwiY2xpZW50X2lkIjoiZW1haWwtbWFya2V0In0.ZMtJ83tH8i-BArVnSvfS4rKCD49N8WLsnhxVJ11BddI"
+    }
 
-    crowd_id = "687a028fa34ae35465dc91a2"
 
+    # crowd_id = "687a028fa34ae35465dc91a2"
 
     # def diff_person(_crowd_id, path):
-        ## 这里是查询群组的人的差异
-        # list_len = 0
-        # flag = True
-        # page = 1
-        # crowd = Crowd(crowd_id=_crowd_id, host=host, headers=headers)
-        # result_list = []
-        #
-        # while flag:
-        #     result = crowd.callCrowdPersonListInPackage(pageSize=100, page=page)
-        #     page += 1
-        #     num = result['num']
-        #     list_len += len(result['responseResult'])
-        #     for data in result['responseResult']:
-        #         result_list.append(data['id'])
-        #     if list_len >= num:
-        #         break
-        # print(result_list)
-        # print("es查询群组数量：", len(result_list))
+    ## 这里是查询群组的人的差异
+    # list_len = 0
+    # flag = True
+    # page = 1
+    # crowd = Crowd(crowd_id=_crowd_id, host=host, headers=headers)
+    # result_list = []
+    #
+    # while flag:
+    #     result = crowd.callCrowdPersonListInPackage(pageSize=100, page=page)
+    #     page += 1
+    #     num = result['num']
+    #     list_len += len(result['responseResult'])
+    #     for data in result['responseResult']:
+    #         result_list.append(data['id'])
+    #     if list_len >= num:
+    #         break
+    # print(result_list)
+    # print("es查询群组数量：", len(result_list))
 
     #     # 这里是解析本地文件，查看
     #     key = ["user_id"]
@@ -129,378 +132,130 @@ if __name__ == '__main__':
     #     compare_lists(list(data.get("crowd_id")))
     #
     #
-    # def diff_crowd_num(sql_result_list):
-    #     ## 比较哪些群组数量不一致
-    #     _sql_result_list = {item["crowd_id"]: item["num"] for item in sql_result_list}
-    #     crowd_list = CrowdList(host=host, headers=headers)
-    #     cc = crowd_list.callCrowdPackageList(1, 100)
-    #     crowd_dict = {i['id']: i['nums'] for i in cc['responseList']}
-    #
-    #     print("-----sql_result_list-----:\n", json.dumps(sql_result_list, ensure_ascii=False))
-    #     print("****crowd_dict*****:\n", json.dumps(cc, ensure_ascii=False))
-    #     print(f"人群列表数量:{len(crowd_dict)}，hive数量：{len(_sql_result_list)}")
-    #     print(":::::差异:::::\n", json.dumps(compare_dicts(crowd_dict, _sql_result_list), ensure_ascii=False))
-    #
-    #
-    # sql_result_list = [
-    #             {
-    #                 "crowd_id": "68778564f40cc91244b1e9fc",
-    #                 "num": "1306"
-    #             },
-    #             {
-    #                 "crowd_id": "68b54dbef66289676b17fb02",
-    #                 "num": "5"
-    #             },
-    #             {
-    #                 "crowd_id": "68942ae20241ad76344e3bab",
-    #                 "num": "8"
-    #             },
-    #             {
-    #                 "crowd_id": "6894453f0241ad76344e3bd3",
-    #                 "num": "9"
-    #             },
-    #             {
-    #                 "crowd_id": "68c838d568575727b9f017fb",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "689444a20241ad76344e3bd1",
-    #                 "num": "3"
-    #             },
-    #             {
-    #                 "crowd_id": "68942bd458bb063f71fd58c9",
-    #                 "num": "8"
-    #             },
-    #             {
-    #                 "crowd_id": "68ba5c555259840710f2e44c",
-    #                 "num": "5"
-    #             },
-    #             {
-    #                 "crowd_id": "687b3670a34ae35465dc92ee",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "68942a780241ad76344e3baa",
-    #                 "num": "1297"
-    #             },
-    #             {
-    #                 "crowd_id": "689adf847430a236d5cb6f08",
-    #                 "num": "23"
-    #             },
-    #             {
-    #                 "crowd_id": "687e1753a5e5180731e21271",
-    #                 "num": "20"
-    #             },
-    #             {
-    #                 "crowd_id": "68998763498c5c49695a260b",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "68942b1b58bb063f71fd58c6",
-    #                 "num": "35"
-    #             },
-    #             {
-    #                 "crowd_id": "689444e958bb063f71fd58eb",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "6874b5338c6fe76c51447579",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "6879fc5aa34ae35465dc9199",
-    #                 "num": "1280"
-    #             },
-    #             {
-    #                 "crowd_id": "687dec0ba5e5180731e2113d",
-    #                 "num": "21"
-    #             },
-    #             {
-    #                 "crowd_id": "68a2c948f847681961408a55",
-    #                 "num": "3"
-    #             },
-    #             {
-    #                 "crowd_id": "687a028fa34ae35465dc91a2",
-    #                 "num": "1290"
-    #             },
-    #             {
-    #                 "crowd_id": "687debd0a5e5180731e2113c",
-    #                 "num": "55"
-    #             },
-    #             {
-    #                 "crowd_id": "687da2bda34ae35465dc9460",
-    #                 "num": "1256"
-    #             },
-    #             {
-    #                 "crowd_id": "687ef5febeaa88751e197aca",
-    #                 "num": "48"
-    #             },
-    #             {
-    #                 "crowd_id": "687a1913a34ae35465dc91fb",
-    #                 "num": "21"
-    #             },
-    #             {
-    #                 "crowd_id": "687afff5a34ae35465dc92d7",
-    #                 "num": "2"
-    #             },
-    #             {
-    #                 "crowd_id": "687e171ba5e5180731e2126f",
-    #                 "num": "9"
-    #             },
-    #             {
-    #                 "crowd_id": "689444b858bb063f71fd58e9",
-    #                 "num": "39"
-    #             },
-    #             {
-    #                 "crowd_id": "6894444e58bb063f71fd58e7",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "687a193aa34ae35465dc91fc",
-    #                 "num": "2"
-    #             },
-    #             {
-    #                 "crowd_id": "6894456558bb063f71fd58ee",
-    #                 "num": "14"
-    #             },
-    #             {
-    #                 "crowd_id": "689445030241ad76344e3bd2",
-    #                 "num": "3"
-    #             },
-    #             {
-    #                 "crowd_id": "68942bb20241ad76344e3bac",
-    #                 "num": "12"
-    #             },
-    #             {
-    #                 "crowd_id": "689448b10241ad76344e3bdf",
-    #                 "num": "39"
-    #             },
-    #             {
-    #                 "crowd_id": "68942aa258bb063f71fd58c4",
-    #                 "num": "6"
-    #             },
-    #             {
-    #                 "crowd_id": "6894447b58bb063f71fd58e8",
-    #                 "num": "1256"
-    #             },
-    #             {
-    #                 "crowd_id": "6873eeddf1ac104346194bde",
-    #                 "num": "8"
-    #             },
-    #             {
-    #                 "crowd_id": "689d9df3cb5cfd0392532206",
-    #                 "num": "24"
-    #             },
-    #             {
-    #                 "crowd_id": "689443d70241ad76344e3bcb",
-    #                 "num": "5"
-    #             },
-    #             {
-    #                 "crowd_id": "687b0207a34ae35465dc92da",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "689a0f2fb96a557a6d78bf3c",
-    #                 "num": "11"
-    #             },
-    #             {
-    #                 "crowd_id": "6889f03c48f6a30bd07aa14e",
-    #                 "num": "3"
-    #             },
-    #             {
-    #                 "crowd_id": "68c7ebc168575727b9f01445",
-    #                 "num": "68"
-    #             },
-    #             {
-    #                 "crowd_id": "687e16dfa5e5180731e2126e",
-    #                 "num": "12"
-    #             },
-    #             {
-    #                 "crowd_id": "68942b7158bb063f71fd58c7",
-    #                 "num": "8"
-    #             },
-    #             {
-    #                 "crowd_id": "687b0269a34ae35465dc92db",
-    #                 "num": "3"
-    #             },
-    #             {
-    #                 "crowd_id": "68832876f0cc690fd7105324",
-    #                 "num": "93"
-    #             },
-    #             {
-    #                 "crowd_id": "687e1908a5e5180731e21272",
-    #                 "num": "1314"
-    #             },
-    #             {
-    #                 "crowd_id": "6879f8c6a34ae35465dc9185",
-    #                 "num": "22"
-    #             },
-    #             {
-    #                 "crowd_id": "687df922a5e5180731e211d0",
-    #                 "num": "4"
-    #             },
-    #             {
-    #                 "crowd_id": "689c4ba7c73a8e68c750ef9c",
-    #                 "num": "8"
-    #             },
-    #             {
-    #                 "crowd_id": "687b3c0ba34ae35465dc9303",
-    #                 "num": "51"
-    #             },
-    #             {
-    #                 "crowd_id": "689420620241ad76344e3b9e",
-    #                 "num": "22"
-    #             },
-    #             {
-    #                 "crowd_id": "687de8eaa5e5180731e21123",
-    #                 "num": "3"
-    #             },
-    #             {
-    #                 "crowd_id": "68c78afb70b5fc0b7a37992c",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "689444cd58bb063f71fd58ea",
-    #                 "num": "2"
-    #             },
-    #             {
-    #                 "crowd_id": "6877c4aaf40cc91244b1ea05",
-    #                 "num": "1289"
-    #             },
-    #             {
-    #                 "crowd_id": "689c4cc2801953000707b9b9",
-    #                 "num": "1315"
-    #             },
-    #             {
-    #                 "crowd_id": "689443f758bb063f71fd58e5",
-    #                 "num": "2"
-    #             },
-    #             {
-    #                 "crowd_id": "68b68f041532400e8327b305",
-    #                 "num": "12"
-    #             },
-    #             {
-    #                 "crowd_id": "6880a6a146fc3040a4851cff",
-    #                 "num": "105"
-    #             },
-    #             {
-    #                 "crowd_id": "68c9027c68575727b9f01d1b",
-    #                 "num": "9"
-    #             },
-    #             {
-    #                 "crowd_id": "68ade82592874335048e92c4",
-    #                 "num": "3"
-    #             },
-    #             {
-    #                 "crowd_id": "68942abf58bb063f71fd58c5",
-    #                 "num": "1267"
-    #             },
-    #             {
-    #                 "crowd_id": "6894457c0241ad76344e3bd4",
-    #                 "num": "4"
-    #             },
-    #             {
-    #                 "crowd_id": "6894452e58bb063f71fd58ec",
-    #                 "num": "9"
-    #             },
-    #             {
-    #                 "crowd_id": "6894455258bb063f71fd58ed",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "68b543d5f66289676b17fa6c",
-    #                 "num": "12"
-    #             },
-    #             {
-    #                 "crowd_id": "689a2c95079db40c09aa710d",
-    #                 "num": "1314"
-    #             },
-    #             {
-    #                 "crowd_id": "689add237430a236d5cb6efc",
-    #                 "num": "1306"
-    #             },
-    #             {
-    #                 "crowd_id": "68c38fd2617bb73ea09f7da0",
-    #                 "num": "2"
-    #             },
-    #             {
-    #                 "crowd_id": "687b38dda34ae35465dc92ef",
-    #                 "num": "9"
-    #             },
-    #             {
-    #                 "crowd_id": "68942b9258bb063f71fd58c8",
-    #                 "num": "5"
-    #             },
-    #             {
-    #                 "crowd_id": "68a02fc81625ac62b727fae2",
-    #                 "num": "24"
-    #             },
-    #             {
-    #                 "crowd_id": "6879fc29a34ae35465dc9198",
-    #                 "num": "25"
-    #             },
-    #             {
-    #                 "crowd_id": "689a1e17b96a557a6d78bf4d",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "6894461e58bb063f71fd58ef",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "68ba5e0d5259840710f2e457",
-    #                 "num": "1"
-    #             },
-    #             {
-    #                 "crowd_id": "687a0dada34ae35465dc91be",
-    #                 "num": "59"
-    #             },
-    #             {
-    #                 "crowd_id": "689444620241ad76344e3bcf",
-    #                 "num": "50"
-    #             },
-    #             {
-    #                 "crowd_id": "687b649aa34ae35465dc934a",
-    #                 "num": "14"
-    #             },
-    #             {
-    #                 "crowd_id": "6894209858bb063f71fd58b1",
-    #                 "num": "21"
-    #             },
-    #             {
-    #                 "crowd_id": "687b632ca34ae35465dc933b",
-    #                 "num": "57"
-    #             },
-    #             {
-    #                 "crowd_id": "686dea326424e217d9c0c86a",
-    #                 "num": "2"
-    #             },
-    #             {
-    #                 "crowd_id": "687e05e8a5e5180731e2122b",
-    #                 "num": "2"
-    #             },
-    #             {
-    #                 "crowd_id": "689bf254801953000707b8fe",
-    #                 "num": "1315"
-    #             },
-    #             {
-    #                 "crowd_id": "689420c258bb063f71fd58b4",
-    #                 "num": "13"
-    #             },
-    #             {
-    #                 "crowd_id": "689c133a801953000707b996",
-    #                 "num": "1306"
-    #             },
-    #             {
-    #                 "crowd_id": "687dec77a5e5180731e21143",
-    #                 "num": "10"
-    #             },
-    #             {
-    #                 "crowd_id": "6881a1d97fe4b22a4d5feec6",
-    #                 "num": "1"
-    #             }
-    #         ]
-    # diff_crowd_num(sql_result_list)
+    def diff_crowd_num(sql_result_list):
+        ## 比较哪些群组数量不一致
+        _sql_result_list = {item["crowd_id"]: item["num"] for item in sql_result_list}
+        crowd_list = CrowdList(host=host, headers=headers)
+        cc = crowd_list.callCrowdPackageList(1, 100)
+        crowd_dict = {i['id']: i['nums'] for i in cc['responseList']}
+
+        print("-----sql_result_list-----:\n", json.dumps(sql_result_list, ensure_ascii=False))
+        print("****crowd_dict*****:\n", json.dumps(cc, ensure_ascii=False))
+        print(f"人群列表数量:{len(crowd_dict)}，hive数量：{len(_sql_result_list)}")
+        print(":::::差异:::::\n", json.dumps(compare_dicts(crowd_dict, _sql_result_list), ensure_ascii=False))
+
+
+    sql_result_list = [
+  {
+    "crowd_id": "682b0aca244a981570817656",
+    "num": "4"
+  },
+  {
+    "crowd_id": "69086abbd283550420102410",
+    "num": "19"
+  },
+  {
+    "crowd_id": "6822ad71d917d574ee10133c",
+    "num": "3"
+  },
+  {
+    "crowd_id": "6858f2e0a4025622a4245310",
+    "num": "3"
+  },
+  {
+    "crowd_id": "68e880910d5a50be1f816898",
+    "num": "1"
+  },
+  {
+    "crowd_id": "682c2cc8da627a549206b8eb",
+    "num": "152"
+  },
+  {
+    "crowd_id": "68e87fd00d5a50be1f816897",
+    "num": "2"
+  },
+  {
+    "crowd_id": "68e87f440d5a50be1f816896",
+    "num": "2"
+  },
+  {
+    "crowd_id": "68244081702ed60ff73adbc6",
+    "num": "4"
+  },
+  {
+    "crowd_id": "68c93bfe68575727b9f02269",
+    "num": "1"
+  },
+  {
+    "crowd_id": "6923fc88870f8d72c6d05de7",
+    "num": "19"
+  },
+  {
+    "crowd_id": "6923fec9870f8d72c6d05e01",
+    "num": "15"
+  },
+  {
+    "crowd_id": "691e7c1de425257bf240470a",
+    "num": "155"
+  },
+  {
+    "crowd_id": "6923fcf8870f8d72c6d05dec",
+    "num": "18"
+  },
+  {
+    "crowd_id": "6923ff07870f8d72c6d05e08",
+    "num": "2"
+  },
+  {
+    "crowd_id": "6923fcbe870f8d72c6d05dea",
+    "num": "1"
+  },
+  {
+    "crowd_id": "6923fda9870f8d72c6d05df5",
+    "num": "14"
+  },
+  {
+    "crowd_id": "6923fdfc870f8d72c6d05df9",
+    "num": "8"
+  },
+  {
+    "crowd_id": "6912db312f12dc67394a50d1",
+    "num": "2"
+  },
+  {
+    "crowd_id": "6923fe45870f8d72c6d05dfb",
+    "num": "6"
+  },
+  {
+    "crowd_id": "69240e54870f8d72c6d05e87",
+    "num": "6"
+  },
+  {
+    "crowd_id": "691d98b8ff6d32155eeb5efc",
+    "num": "152"
+  },
+  {
+    "crowd_id": "6923ff57870f8d72c6d05e13",
+    "num": "4"
+  },
+  {
+    "crowd_id": "6923ff40870f8d72c6d05e12",
+    "num": "12"
+  },
+  {
+    "crowd_id": "6923ff1d870f8d72c6d05e0c",
+    "num": "5"
+  },
+  {
+    "crowd_id": "6923fd66870f8d72c6d05df0",
+    "num": "15"
+  },
+  {
+    "crowd_id": "6924101b870f8d72c6d05e91",
+    "num": "10"
+  }
+]
+    diff_crowd_num(sql_result_list)
 
     # diff_person(_crowd_id="687a028fa34ae35465dc91a2",
     #             path="/Users/lulu/Downloads/临时文件2_20250719155155.xls")

smartpush/email/activity.py

@@ -39,7 +39,7 @@ class ActivityTemplate(ActivityTemplateRequestBase, RequestBase):
                         "currentHtml": "",
                         "currentJsonSchema": final_currentJsonSchema,
                         "previewJsonSchema": final_currentJsonSchema,
-                        "schemaAnalysis": genSchemaAnalysis(json.loads(final_currentJsonSchema))}
+                        "schemaAnalysis": BlockSchema.genSchemaAnalysis(json.loads(final_currentJsonSchema))}
 
         result = self.request(path=URL.Activity.step2.url, method=URL.Activity.step2.method,
                               data=requestParam)

smartpush/email/schema.py

@@ -508,68 +508,69 @@ class BlockSchema(Enum):
         ]
     }
 
-
-def genSection(block_list: list):
-    """
-        根据Block生成Section结构体
-        :param block_list:
-        :return:
+    @staticmethod
+    def genSection(block_list: list):
         """
-    section = BlockSchema.Section
-    if section.value['children'][0]['type'] == 'Column':
-        section.value['children'][0]['children'] = block_list
-    return section
-
+            根据Block生成Section结构体
+            :param block_list:
+            :return:
+            """
+        section = BlockSchema.Section
+        if section.value['children'][0]['type'] == 'Column':
+            section.value['children'][0]['children'] = block_list
+        return section
 
-def genSchemaAnalysis(schema):
-    """
-        递归遍历嵌套字典结构，提取所有层级的type和对应的id
-        相同type的id将以列表形式汇总（按遍历顺序追加）
-
-        Args:
-            data: 嵌套字典/列表结构（支持单节点字典或children列表）
-
-        Returns:
-            dict: key为type值，value为id列表（即使只有一个id也保持列表格式）
-            :param schema:
+    @staticmethod
+    def genSchemaAnalysis(schema):
         """
-    result = {}
-
-    def recursive_parse(node):
-        if isinstance(node, dict):
-            if 'type' in node and 'id' in node:
-                type_val = node['type']
-                id_val = node['id']
-                result.setdefault(type_val, []).append(id_val)
+            递归遍历嵌套字典结构，提取所有层级的type和对应的id
+            相同type的id将以列表形式汇总（按遍历顺序追加）
 
-            if 'children' in node and isinstance(node['children'], list):
-                for child in node['children']:
-                    recursive_parse(child)
-        elif isinstance(node, list):
-            for item in node:
-                recursive_parse(item)
+            Args:
+                data: 嵌套字典/列表结构（支持单节点字典或children列表）
 
-    recursive_parse(schema if isinstance(schema,dict) else schema.value)
-    schemaAnalysis = {"schema": result}
-    return json.dumps(schemaAnalysis, indent=4, ensure_ascii=False)
+            Returns:
+                dict: key为type值，value为id列表（即使只有一个id也保持列表格式）
+                :param schema:
+            """
+        result = {}
 
+        def recursive_parse(node):
+            if isinstance(node, dict):
+                if 'type' in node and 'id' in node:
+                    type_val = node['type']
+                    id_val = node['id']
+                    result.setdefault(type_val, []).append(id_val)
 
-def genAllBlockSchema():
-    """
-    获取所有的BlockSchema
-    :return:
-    """
-    temp_list = [i.value for i in BlockSchema if i not in (BlockSchema.Section, BlockSchema.Footer, BlockSchema.Header)]
-    return temp_list
+                if 'children' in node and isinstance(node['children'], list):
+                    for child in node['children']:
+                        recursive_parse(child)
+            elif isinstance(node, list):
+                for item in node:
+                    recursive_parse(item)
+        recursive_parse(schema if isinstance(schema, dict) else schema.value)
+        schemaAnalysis = {"schema": result}
+        return json.dumps(schemaAnalysis)
 
+    @staticmethod
+    def genAllBlockSchema():
+        """
+        获取所有的BlockSchema
+        :return:
+        """
+        temp_list = [i.value for i in BlockSchema if
+                     i not in (BlockSchema.Section, BlockSchema.Footer, BlockSchema.Header)]
+        return temp_list
 
-def genAllBlockSchemaList():
-    """
-    获取所有的BlockSchema
-    :return:
-    """
-    temp_list = [i.name for i in BlockSchema if i not in (BlockSchema.Section, BlockSchema.Footer, BlockSchema.Header)]
-    return temp_list
+    @staticmethod
+    def genAllBlockSchemaList():
+        """
+        获取所有的BlockSchema
+        :return:
+        """
+        temp_list = [i.name for i in BlockSchema if
+                     i not in (BlockSchema.Section, BlockSchema.Footer, BlockSchema.Header)]
+        return temp_list
 
 
 if __name__ == '__main__':
@@ -581,4 +582,4 @@ if __name__ == '__main__':
     #  BlockSchema.ImageText,
     #  BlockSchema.Button, BlockSchema.Divider, BlockSchema.Social, BlockSchema.HTMLCode]
 
-    print(genSchemaAnalysis(BlockSchema.Section))
+    print(genSchemaAnalysis(BlockSchema.Section))

smartpush/email/universal_content.py

@@ -1,5 +1,6 @@
 import json
 import time
+
 from smartpush.base.request_base import RequestBase
 from smartpush.base.url_enum import *
 from smartpush.email.schema import *
@@ -33,7 +34,8 @@ class UniversalContent(RequestBase):
 
     # 创建universal
     def create_universal(self, requestParam):
-        result = self.request(method=URL.UniversalContent.saveUniversalContent.method, path=URL.UniversalContent.saveUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.saveUniversalContent.method,
+                              path=URL.UniversalContent.saveUniversalContent.url,
                               data=requestParam)
         return result
 
@@ -48,7 +50,8 @@ class UniversalContent(RequestBase):
         requestParam = {'universalName': universa_name}
         if blockType_list and type(blockType_list) == list:
             requestParam.update(blockType=blockType_list)
-        result = self.request(method=URL.UniversalContent.queryUniversalContent.method, path=URL.UniversalContent.queryUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.queryUniversalContent.method,
+                              path=URL.UniversalContent.queryUniversalContent.url,
                               data=requestParam)
         return result
 
@@ -72,8 +75,10 @@ class UniversalContent(RequestBase):
             "data": universal_list,
             "type": _type
         }
-        result = self.request(method=URL.UniversalContent.updateUniversalContent.method, path=URL.UniversalContent.updateUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.updateUniversalContent.method,
+                              path=URL.UniversalContent.updateUniversalContent.url,
                               data=requestParam)
+        # TODO 未完成
         return result
 
     # 删除universal
@@ -84,7 +89,8 @@ class UniversalContent(RequestBase):
         :return:
         """
         requestParam = {'universalId': universalId}
-        result = self.request(method=URL.UniversalContent.deleteUniversalContent.method, path=URL.UniversalContent.deleteUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.deleteUniversalContent.method,
+                              path=URL.UniversalContent.deleteUniversalContent.url,
                               params=requestParam)
         return result
 
@@ -97,7 +103,8 @@ class UniversalContent(RequestBase):
         :return:
         """
         requestParam = {"type": _type, "campaignId": campaignId, "universalIds": universalIds}
-        result = self.request(method=URL.UniversalContent.updateCampaignUsed.method, path=URL.UniversalContent.updateCampaignUsed.url,
+        result = self.request(method=URL.UniversalContent.updateCampaignUsed.method,
+                              path=URL.UniversalContent.updateCampaignUsed.url,
                               data=requestParam)
         return result
 
@@ -165,7 +172,8 @@ if __name__ == '__main__':
                                             universalName=gen_universal_name(block))
         result_list.append(block_schema)
     print(result_list)
-    section_schema = get_universal_schema(genSection(result_list), _id=generate_UUID(9), universalId=sectionUniversalId,
+    section_schema = get_universal_schema(BlockSchema.genSection(result_list), _id=generate_UUID(9),
+                                          universalId=sectionUniversalId,
                                           universalName=sectionUniversalName)
     universal_request_param = gen_universal_request_param(sectionUniversalId, section_schema)
     print(universal_request_param)
@@ -174,32 +182,40 @@ if __name__ == '__main__':
         "Content-Type": "application/json", "accept-language": "zh-CN"}
     universal = UniversalContent(headers=head, host='https://test.smartpushedm.com/bff/api-sp-market-ec2')
     try:
-        universal.create_universal(requestParam=universal_request_param)
-        universal.assert_block_in_the_section(sectionUniversalName, result_list)
+        # universal.create_universal(requestParam=universal_request_param)
+        # universal.assert_block_in_the_section(sectionUniversalName, result_list)
+        _list =[
+            {"universalId": "ec5d5278-4ed7-4933-8010-2b0c6a776356", "universalName": "Auto-Logo-2025-11-26 00:35:35",
+             "schema": "{\"id\":\"96997bb0a\",\"universalId\":\"ec5d5278-4ed7-4933-8010-2b0c6a776356\",\"universalName\":\"Auto-Logo-2025-11-26 00:35:35\",\"type\":\"Logo\",\"props\":{\"width\":120,\"height\":120,\"imgRatio\":1,\"src\":\"https://cdn.smartpushedm.com/frontend/smart-push/staging/1741054956275/1758595834300_74d62ae6.png?width=120&height=120\",\"href\":\"https://smartpush4.myshoplinestg.com\",\"align\":\"center\",\"containerBackgroundColor\":\"#b46b6b\",\"paddingLeft\":\"20px\",\"paddingRight\":\"20px\",\"paddingTop\":\"20px\",\"paddingBottom\":\"20px\",\"paddingCondition\":\"true\",\"segmentTypeConfig\":1},\"children\":[]}",
+             "subUniversalId": "ec5d5278-4ed7-4933-8010-2b0c6a776356", "type": 0, "blockType": "Logo",
+             "flowModal": ""}]
+        universal.update_universal(_list)
     except:
         raise
     finally:
-        universal.delete_universal(sectionUniversalId)
-
-
-if __name__ == '__main__':
-    sectionUniversalId = generate_UUID()
-    sectionUniversalName = gen_universal_name(BlockSchema.Section)
-    print(sectionUniversalName)
-    block_list = [BlockSchema.Logo]  # 添加block
-
-    block_dict = {}
-    result_list = []
-    blockUniversalNameList = []
-    for block in block_list:
-        name = block.name
-        block_schema = get_universal_schema(block, _id=generate_UUID(9), universalId=generate_UUID(),
-                                            universalName=gen_universal_name(block))
-        result_list.append(block_schema)
-    print(result_list)
-    vars['result_list'] = result_list
-    section_schema = get_universal_schema(genSection(result_list), _id=generate_UUID(9), universalId=sectionUniversalId,
-                                          universalName=sectionUniversalName)
-    universal_request_param = gen_universal_request_param(sectionUniversalId, section_schema)
-    vars['universal_request_param'] = universal_request_param
-    print(universal_request_param)
+        # universal.delete_universal(sectionUniversalId)
+        # pass
+        pass
+#
+# if __name__ == '__main__':
+#     sectionUniversalId = generate_UUID()
+#     sectionUniversalName = gen_universal_name(BlockSchema.Section)
+#     print(sectionUniversalName)
+#     block_list = [BlockSchema.Logo]  # 添加block
+#
+#     block_dict = {}
+#     result_list = []
+#     blockUniversalNameList = []
+#     for block in block_list:
+#         name = block.name
+#         block_schema = get_universal_schema(block, _id=generate_UUID(9), universalId=generate_UUID(),
+#                                             universalName=gen_universal_name(block))
+#         result_list.append(block_schema)
+#     print(result_list)
+#     # vars['result_list'] = result_list
+#     section_schema = get_universal_schema(BlockSchema.genSection(result_list), _id=generate_UUID(9),
+#                                           universalId=sectionUniversalId,
+#                                           universalName=sectionUniversalName)
+#     universal_request_param = gen_universal_request_param(sectionUniversalId, section_schema)
+#     vars['universal_request_param'] = universal_request_param
+#     print(universal_request_param)

smartpush/form/form_after.py

@@ -1,9 +1,5 @@
-import json
-from tenacity import retry, stop_after_attempt, wait_fixed
 from smartpush.base.request_base import FormRequestBase
 from smartpush.base.url_enum import URL
-from smartpush.crowd import crowd
-from smartpush.export.basic.GetOssUrl import log_attempt
 
 
 class FormAfter(FormRequestBase):
@@ -22,38 +18,38 @@ class FormAfter(FormRequestBase):
         if start_time is not None and end_time is not None:
             requestParam["startTime"] = start_time
             requestParam["endTime"] = end_time
-        result = self.request(method=URL.pageFormReportDetail.method, path=URL.pageFormReportDetail.url,
+        result = self.request(method=URL.FormReport.pageFormReportDetail.method, path=URL.FormReport.pageFormReportDetail.url,
                               data=requestParam)
         persons_list = result["resultData"]["reportDetailData"]["datas"]
         return persons_list
 
     def callGetFormReportDetail(self):
         requestParam = {"formId": self.form_id}
-        result = self.request(method=URL.getFormReportDetail.method, path=URL.getFormReportDetail.url,
+        result = self.request(method=URL.FormReport.getFormReportDetail.method, path=URL.FormReport.getFormReportDetail.url,
                               data=requestParam)
         resultData = result["resultData"]
         return resultData
 
     def callGetFormPerformanceTrend(self):
         requestParam = {"formId": self.form_id}
-        result = self.request(method=URL.getFormPerformanceTrend.method, path=URL.getFormPerformanceTrend.url,
+        result = self.request(method=URL.FormReport.getFormPerformanceTrend.method, path=URL.FormReport.getFormPerformanceTrend.url,
                               data=requestParam)
         resultData = result["resultData"]
         return resultData
 
     def callGetFormList(self, formName):
         requestParam = {'page': 1, 'pageSize': 10, 'name': formName}
-        result = self.request(method=URL.getFormList.method, path=URL.getFormList.url, data=requestParam)
+        result = self.request(method=URL.Form.getFormList.method, path=URL.Form.getFormList.url, data=requestParam)
         return result["resultData"]['datas']
 
     def callGetFormInfo(self):
         requestParam = {'formId': self.form_id}
-        result = self.request(method=URL.getFormInfo.method, path=URL.getFormInfo.url, params=requestParam)
+        result = self.request(method=URL.Form.getFormInfo.method, path=URL.Form.getFormInfo.url, params=requestParam)
         return result['resultData']
 
     def callDeleteForm(self, merchant_id):
         requestParam = {"formId": self.form_id, "merchant_id": merchant_id}
-        result = self.request(method=URL.deleteForm.method, path=URL.deleteForm.url, params=requestParam)
+        result = self.request(method=URL.Form.deleteForm.method, path=URL.Form.deleteForm.url, params=requestParam)
         assert result['code'] == 1
         print(f"删除id:{self.form_id}表单成功")
 
@@ -75,6 +71,7 @@ class FormAfter(FormRequestBase):
                     return True, person
                 else:
                     return False, None
+        return None
 
     def FormReportNumQuery(self, num_type="viewNum", assertNum=None):
         """
@@ -89,6 +86,7 @@ class FormAfter(FormRequestBase):
                 return var
             else:
                 return data.get(num_type) == assertNum
+        return None
 
     def getFormAttributionSales(self, key, start_time=None, end_time=None):
         """
@@ -109,6 +107,7 @@ class FormAfter(FormRequestBase):
                     return True, order
                 else:
                     return False, None
+        return None
 
     def getFormLineChart(self, date=None, num_type="viewNum", assertNum=None):
         """
@@ -125,6 +124,7 @@ class FormAfter(FormRequestBase):
                         assert data.get(num_type) == assertNum
                     else:
                         return data.get(num_type)
+        return None
 
     def getCrowdPersonList(self, _id, page=1, pageSize=20, filter_type="email", filter_value=""):
         self.callCrowdPersonList(self, _id, page, pageSize, filter_type, filter_value)

smartpush/utils/ListDictUtils.py

@@ -1,6 +1,6 @@
 import json
 
-from deepdiff import DeepDiff
+# from deepdiff import DeepDiff
 
 
 def compare_lists(temp1, temp2, check_key=["completedCount"], all_key=False, num=1):
@@ -83,3 +83,55 @@ def check_values_in_list_set(a, b):
         return [True, "匹配成功"]
     else:
         return [False, "匹配失败，不匹配数据" + str(missing_values)]
+
+
+def is_json_equal(a, b, exclude_fields=None):
+    """
+    递归比较两段JSON（字典/列表/基础类型）是否一致，排除指定字段
+
+    :param a: 第一段JSON数据（dict/list/str/int/float/bool/None）
+    :param b: 第二段JSON数据（dict/list/str/int/float/bool/None）
+    :param exclude_fields: 需要排除的字段列表（如["id", "updateTime"]）
+    :return: bool - 一致返回True，不一致返回False
+    """
+    # 初始化排除字段列表（默认空）
+    exclude_fields = exclude_fields or []
+
+    # 1. 类型不同直接判定不一致
+    if type(a) != type(b):
+        return False
+
+    # 2. 处理字典类型：排除指定字段后比较键值对
+    if isinstance(a, dict):
+        # 获取排除字段后的键集合
+        keys_a = {k for k in a.keys() if k not in exclude_fields}
+        keys_b = {k for k in b.keys() if k not in exclude_fields}
+
+        # 键集合不同则不一致
+        if keys_a != keys_b:
+            return False
+
+        # 递归比较每个键对应的值
+        for key in keys_a:
+            if not is_json_equal(a[key], b[key], exclude_fields):
+                return False
+        return True
+
+    # 3. 处理列表类型：按顺序递归比较每个元素
+    elif isinstance(a, list):
+        # 列表长度不同则不一致
+        if len(a) != len(b):
+            return False
+
+        # 逐个比较列表元素
+        for item_a, item_b in zip(a, b):
+            if not is_json_equal(item_a, item_b, exclude_fields):
+                return False
+        return True
+
+    # 4. 处理基础类型（str/int/float/bool/None）：直接比较值
+    else:
+        # 特殊处理浮点数精度问题（可选，根据需求开启）
+        # if isinstance(a, float) and isinstance(b, float):
+        #     return abs(a - b) < 1e-9
+        return a == b

{smartpush-1.9.9.dist-info → smartpush-2.0.0.dist-info}/METADATA

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

{smartpush-1.9.9.dist-info → smartpush-2.0.0.dist-info}/RECORD

@@ -1,17 +1,18 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=s3hPwC6KePS5BtqNS9o15eCh7Nx2gn16bn6tfYK0iQI,18112
+smartpush/test.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=eMF6zw0QKzIMQhg3LNqutaCNTQJ5lsrHuohkaadOl64,2677
-smartpush/base/url_enum.py,sha256=7JRE61JPvwaGfnbZHhFohhxqS758CSiAPk-wwlLyy78,2232
+smartpush/base/request_base.py,sha256=jQRnURl9-BA5BnymjyD5auqFc256CtmepM_woFVkE6g,2754
+smartpush/base/url_enum.py,sha256=vVg4Y1w8ayT_jD3DDzQCEzD6cWpnRr-7MxPeEqU5OTU,2226
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/crowd/crowd.py,sha256=7FNtTVfW8Okf-RU1n5O9olFv7aSKxBVHigZ6zi9MFKw,21107
+smartpush/crowd/crowd.py,sha256=KNwvX-BnBnMVVuHM79a-VeBMp_guB-Kqw3tFaAPiAp8,9768
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/email/activity.py,sha256=LXssDWgxnPEcqnmlr7kiSVP4YbNhP4SDJep6Qc49bcM,3481
-smartpush/email/schema.py,sha256=cB9WAjdLbesfnMGnu6gB7JJU0Ja4WJB8-s_jz5DaCYg,30927
-smartpush/email/universal_content.py,sha256=TwbhvtybbegkUzuvh9WE3SOnPs15PQu-mXQUCz2iMuw,10180
+smartpush/email/activity.py,sha256=bFiuxp8wb5qxQP0hg2BSqztqnLy7jxuaUONpqF9dl0M,3493
+smartpush/email/schema.py,sha256=790z_2aym1L4yd3igslgMmugvDOJ_XXwzMFrgfUsqg0,31208
+smartpush/email/universal_content.py,sha256=_SHnp1QeZK076U0MEWIFsSSgzEWt2W1R2oMEMbMOa08,11502
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9ZtqEwiQyPkOemlACfs,21508
 smartpush/export/basic/GetOssUrl.py,sha256=zxNZj6x7Ph9N3P5k82pLpBFjZxKrDfbgqS2fTYyhvso,8467
@@ -22,18 +23,18 @@ smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/flow/global_flow.py,sha256=D1hCpO5fsWTEfl4yNpi3O8PFhz_UmKLHSIQhKtypkvU,2817
 smartpush/flow/history_flow.py,sha256=Gds1FI6i9ue-n1WwpNgL2JlQ2PhSR8VK7dvZ9JemZKw,4854
 smartpush/form/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/form/form_after.py,sha256=VzBRDCzUmrgdSQu_Mr2ccbqkQvVCr71vei2utmvPbwI,8334
+smartpush/form/form_after.py,sha256=KHatgVQvOiCykbfXm5TD07gvGvMgQYqQIQkcIKkAnQU,8348
 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/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
-smartpush/utils/ListDictUtils.py,sha256=6jIngO_4vARkKTKRb9ZW4wR7zPkYbc1wiMLF7ySZQXc,3191
+smartpush/utils/ListDictUtils.py,sha256=Xc8kfSOZjX_k026Au4cfvtgFh5WoHxw4yRJWASyA_Cc,5041
 smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/date_utils.py,sha256=Xgx2DbmWYri71xXBiaKYTZDeh2a8MFhYns_xB0U2JOA,13159
 smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
-smartpush-1.9.9.dist-info/METADATA,sha256=fy3DQCfKtpyrckWnVSd4mNNjxLnRNjeENPVnQ_xAf4o,131
-smartpush-1.9.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.9.9.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.9.9.dist-info/RECORD,,
+smartpush-2.0.0.dist-info/METADATA,sha256=v4plV_C6P-VNEfK4waKSnHj2DvCLvAl_6ASXVz1RZ5Y,131
+smartpush-2.0.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-2.0.0.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-2.0.0.dist-info/RECORD,,