Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore
#	extract.yaml

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/TEST.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.10 (TEST)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
+</module>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Default" />
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.10 (TEST)" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (TEST)" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/TEST.iml" filepath="$PROJECT_DIR$/.idea/TEST.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

extract.yaml

@@ -1,13 +1,7 @@
-token: PHONE_jeynbmxbtnvfksurjmzzwrro
+token: PHONE_qdslrfpybxrnpbwewfxhwzuc
 thqcid: '1778720595806466048'
 hdzxid: '838'
 sstdid: '1776784240427298817'
 xspxid: '1741114772279947264'
 xxpxid: '833'
 qczcid: '1778690715361914880'
-qczdid: '1751907844915245056'
-qcssid: '1740571928649682944'
-qzhid: '1775091289003372544'
-tjdid1: '1744946468054032384'
-tjdid2: '1740268214084923392'
-tjdid3: '1749252977512620032'

test_case/qccq/个人中心/test_001_个人中心-我的消息.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的消息
-    request:
-      method: post
-      url: /api/service-app-second/auth/appMessage/pageSelect
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          dataSource: ''
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的消息
+    request:
+      method: post
+      url: /api/service-app-second/auth/appMessage/pageSelect
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          dataSource: ''
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_002_个人中心-我的收藏.yaml

@@ -1,13 +1,13 @@
-  -
-    name: 个人中心-我的收藏
-    request:
-      method: post
-      url: /api/service-app-second/auth/multiModules/pageCollect
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query: {}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的收藏
+    request:
+      method: post
+      url: /api/service-app-second/auth/multiModules/pageCollect
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query: {}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_003_个人中心-浏览记录.yaml

@@ -1,13 +1,13 @@
-  -
-    name: 个人中心-浏览记录
-    request:
-      method: post
-      url: /api/service-app-second/auth/multiModules/pageView
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query: {}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-浏览记录
+    request:
+      method: post
+      url: /api/service-app-second/auth/multiModules/pageView
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query: {}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_004_个人中心-我的青创培训-我参与的.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青创培训-我参与的
-    request:
-      method: post
-      url: /api/service-qzh/auth/publishActivityController/activityQueryForAppQzh
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          businessBelong: ["InnovationAndEntrepreneurship"]
-      headers:
-        Token: ${read_yaml(token)}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的青创培训-我参与的
+    request:
+      method: post
+      url: /api/service-qzh/auth/publishActivityController/activityQueryForAppQzh
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          businessBelong: ["InnovationAndEntrepreneurship"]
+      headers:
+        Token: ${read_yaml(token)}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_005_个人中心-我的青创培训-我参与的-区域查询.yaml

@@ -1,9 +1,9 @@
-  -
-    name: 个人中心-我的青创培训-我参与的-区域查询
-    request:
-      method: get
-      url: /api/service-sysmgr/auth/PropertyController/listActivityZone
-      headers:
-        Token: ${read_yaml(token)}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的青创培训-我参与的-区域查询
+    request:
+      method: get
+      url: /api/service-sysmgr/auth/PropertyController/listActivityZone
+      headers:
+        Token: ${read_yaml(token)}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_006_个人中心-我的青创培训-我参与的-类型查询.yaml

@@ -1,9 +1,9 @@
-  -
-    name: 个人中心-我的青创培训-青创阵地
-    request:
-      method: get
-      url: /api/service-app-second/auth/AppCqzdSpaceContentController/applyList
-      headers:
-        Token: ${read_yaml(token)}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的青创培训-青创阵地
+    request:
+      method: get
+      url: /api/service-app-second/auth/AppCqzdSpaceContentController/applyList
+      headers:
+        Token: ${read_yaml(token)}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_007_个人中心-我的青创培训-我的评价.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青创培训-我的评价
-    request:
-      method: post
-      url: /api/service-qzh/auth/publishActivityController/queryActivityEvaluateList
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          businessBelong: ["InnovationAndEntrepreneurship"]
-    validate:
+  -
+    name: 个人中心-我的青创培训-我的评价
+    request:
+      method: post
+      url: /api/service-qzh/auth/publishActivityController/queryActivityEvaluateList
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          businessBelong: ["InnovationAndEntrepreneurship"]
+    validate:
       - contains: true

test_case/qccq/个人中心/test_008_个人中心-我的青创培训-青创阵地.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青创培训-青创阵地
-    request:
-      method: post
-      url: /api/service-qzh/auth/publishActivityController/queryActivityEvaluateList
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          businessBelong: ["InnovationAndEntrepreneurship"]
-    validate:
+  -
+    name: 个人中心-我的青创培训-青创阵地
+    request:
+      method: post
+      url: /api/service-qzh/auth/publishActivityController/queryActivityEvaluateList
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          businessBelong: ["InnovationAndEntrepreneurship"]
+    validate:
       - contains: true

test_case/qccq/个人中心/test_009_个人中心-我的青创培训-青创融资.yaml

@@ -1,15 +1,15 @@
-  -
-    name: 个人中心-我的青创培训-青创融资
-    request:
-      method: post
-      url: /api/service-match/auth/mthProjectFinancing/pageMyProjectApply
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          reviewStatus: [0]
-          publicityStatus: 0
-    validate:
+  -
+    name: 个人中心-我的青创培训-青创融资
+    request:
+      method: post
+      url: /api/service-match/auth/mthProjectFinancing/pageMyProjectApply
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          reviewStatus: [0]
+          publicityStatus: 0
+    validate:
       - contains: true

test_case/qccq/个人中心/test_010_个人中心-我的青创培训-青创赛事-赛事列表.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青创培训-青创融资-赛事列表
-    request:
-      method: post
-      url: /api/service-match/auth/MthMatchInfoAppController/myMatchList
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          qcFlag: 1
-    validate:
+  -
+    name: 个人中心-我的青创培训-青创融资-赛事列表
+    request:
+      method: post
+      url: /api/service-match/auth/MthMatchInfoAppController/myMatchList
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          qcFlag: 1
+    validate:
       - contains: true

test_case/qccq/个人中心/test_011_个人中心-我的青创培训-青创赛事-赛事收藏.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青创培训-青创融资-赛事收藏
-    request:
-      method: post
-      url: /api/service-match/auth/MthMatchInfoAppController/pageCollectedMatch
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          qcFlag: 1
-    validate:
+  -
+    name: 个人中心-我的青创培训-青创融资-赛事收藏
+    request:
+      method: post
+      url: /api/service-match/auth/MthMatchInfoAppController/pageCollectedMatch
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          qcFlag: 1
+    validate:
       - contains: true

test_case/qccq/个人中心/test_012_个人中心-我的青创培训-资金帮扶.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青创培训-青创融资-资金帮扶
-    request:
-      method: post
-      url: /api/service-qm/auth/QfPlanAuditController/pageMyLoanStatistics
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          authState: 0
-    validate:
+  -
+    name: 个人中心-我的青创培训-青创融资-资金帮扶
+    request:
+      method: post
+      url: /api/service-qm/auth/QfPlanAuditController/pageMyLoanStatistics
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          authState: 0
+    validate:
       - contains: true

test_case/qccq/个人中心/test_013_个人中心-我的赛事-赛事列表.yaml

@@ -1,13 +1,13 @@
-  -
-    name: 个人中心-我的赛事-赛事列表
-    request:
-      method: post
-      url: /api/service-match/auth/MthMatchInfoAppController/myMatchList
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query: {}
-    validate:
+  -
+    name: 个人中心-我的赛事-赛事列表
+    request:
+      method: post
+      url: /api/service-match/auth/MthMatchInfoAppController/myMatchList
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query: {}
+    validate:
       - contains: true

test_case/qccq/个人中心/test_014_个人中心-我的赛事-赛事收藏.yaml

@@ -1,13 +1,13 @@
-  -
-    name: 个人中心-我的赛事-赛事收藏
-    request:
-      method: post
-      url: /api/service-match/auth/MthMatchInfoAppController/pageCollectedMatch
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query: {}
-    validate:
+  -
+    name: 个人中心-我的赛事-赛事收藏
+    request:
+      method: post
+      url: /api/service-match/auth/MthMatchInfoAppController/pageCollectedMatch
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query: {}
+    validate:
       - contains: true

test_case/qccq/个人中心/test_015_个人中心-活动中心-我参与的.yaml

@@ -1,13 +1,13 @@
-  -
-    name: 个人中心-活动中心-我参与的
-    request:
-      method: post
-      url: /api/service-qzh/auth/publishActivityController/activityQueryForAppQzh
-      json:
-        pageNo: 1
-        pageSize: 10
-        query: {}
-      headers:
-        Token: ${read_yaml(token)}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-活动中心-我参与的
+    request:
+      method: post
+      url: /api/service-qzh/auth/publishActivityController/activityQueryForAppQzh
+      json:
+        pageNo: 1
+        pageSize: 10
+        query: {}
+      headers:
+        Token: ${read_yaml(token)}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_016_个人中心-活动中心-区域查询.yaml

@@ -1,9 +1,9 @@
-  -
-    name: 个人中心-活动中心-区域查询
-    request:
-      method: get
-      url: /api/service-sysmgr/auth/PropertyController/listActivityZone
-      headers:
-        Token: ${read_yaml(token)}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-活动中心-区域查询
+    request:
+      method: get
+      url: /api/service-sysmgr/auth/PropertyController/listActivityZone
+      headers:
+        Token: ${read_yaml(token)}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_017_个人中心-活动中心-类型查询.yaml

@@ -1,9 +1,9 @@
-  -
-    name: 个人中心-活动中心-类型查询
-    request:
-      method: get
-      url: /api/service-qzh/auth/publishActivityController/getBelongBUsiness
-      headers:
-        Token: ${read_yaml(token)}
-    validate:
-      - contains: true
+  -
+    name: 个人中心-活动中心-类型查询
+    request:
+      method: get
+      url: /api/service-qzh/auth/publishActivityController/getBelongBUsiness
+      headers:
+        Token: ${read_yaml(token)}
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_018_个人中心-活动中心-我的评价.yaml

@@ -1,13 +1,13 @@
-  -
-    name: 个人中心-活动中心-我的评价
-    request:
-      method: post
-      url: /api/service-qzh/auth/publishActivityController/queryActivityEvaluateList
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query: {}
-    validate:
+  -
+    name: 个人中心-活动中心-我的评价
+    request:
+      method: post
+      url: /api/service-qzh/auth/publishActivityController/queryActivityEvaluateList
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query: {}
+    validate:
       - contains: true

test_case/qccq/个人中心/test_019_个人中心-我的下载.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的下载
-    request:
-      method: post
-      url: /api/service-app-second/auth/appDownloadRecordController/queryImgList
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          name: ""
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的下载
+    request:
+      method: post
+      url: /api/service-app-second/auth/appDownloadRecordController/queryImgList
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          name: ""
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_020_个人中心-我的青字号-风采展示.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青字号-风采展示
-    request:
-      method: post
-      url: /api/service-qzh/auth/activityController/pageYcqQzhActivity
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          condition: myApp
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的青字号-风采展示
+    request:
+      method: post
+      url: /api/service-qzh/auth/activityController/pageYcqQzhActivity
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          condition: myApp
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_021_个人中心-我的青字号-我的活动.yaml

@@ -1,14 +1,14 @@
-  -
-    name: 个人中心-我的青字号-我的活动
-    request:
-      method: post
-      url: /api/service-qzh/auth/publishActivityController/activityQueryForAppQzh
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          businessBelong: ["QZJ"]
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的青字号-我的活动
+    request:
+      method: post
+      url: /api/service-qzh/auth/publishActivityController/activityQueryForAppQzh
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          businessBelong: ["QZJ"]
+    validate:
+      - contains: true

test_case/qccq/个人中心/test_022_个人中心-我的需求.yaml

@@ -1,15 +1,15 @@
-  -
-    name: 个人中心-我的青字号-我的活动
-    request:
-      method: post
-      url: /api/service-youthcall-iam/ycqYouthcallWorkOrder/auth/myPaginQuery
-      headers:
-        Token: ${read_yaml(token)}
-      json:
-        pageNo: 1
-        pageSize: 10
-        query:
-          proposerId: 11846
-          workOrderName: ""
-    validate:
-      - contains: true
+  -
+    name: 个人中心-我的青字号-我的活动
+    request:
+      method: post
+      url: /api/service-youthcall-iam/ycqYouthcallWorkOrder/auth/myPaginQuery
+      headers:
+        Token: ${read_yaml(token)}
+      json:
+        pageNo: 1
+        pageSize: 10
+        query:
+          proposerId: 11846
+          workOrderName: ""
+    validate:
+      - contains: true

test_case/temps/5425b053-6220-4ac0-8209-bd073a3e6829-container.json

@@ -0,0 +1 @@
+{"uuid": "1b60d73b-d0ec-4a08-add5-eed99481e3a0", "children": ["5f86dafb-d4fb-4169-b5b7-41b43ef2dd68"], "befores": [{"name": "_session_faker", "status": "passed", "start": 1713165507771, "stop": 1713165507851}], "start": 1713165507771, "stop": 1713165507989}

test_case/temps/74dc7639-bf9d-41d1-afd9-cd970cb7424c-container.json

@@ -0,0 +1 @@
+{"uuid": "7b12b8fb-adeb-449f-92cd-81d35a0059c2", "children": ["5f86dafb-d4fb-4169-b5b7-41b43ef2dd68"], "befores": [{"name": "clear_yam", "status": "broken", "statusDetails": {"message": "FileNotFoundError: [Errno 2] No such file or directory: 'D:\\\\TestPythonProject\\\\TEST\\\\test_case\\\\config.yaml'\n", "trace": "  File \"D:\\TestPythonProject\\TEST\\venv\\lib\\site-packages\\pluggy\\_callers.py\", line 102, in _multicall\n    res = hook_impl.function(*args)\n  File \"D:\\TestPythonProject\\TEST\\venv\\lib\\site-packages\\_pytest\\fixtures.py\", line 1121, in pytest_fixture_setup\n    result = call_fixture_func(fixturefunc, request, kwargs)\n  File \"D:\\TestPythonProject\\TEST\\venv\\lib\\site-packages\\_pytest\\fixtures.py\", line 900, in call_fixture_func\n    fixture_result = fixturefunc(**kwargs)\n  File \"D:\\TestPythonProject\\TEST\\conftest.py\", line 17, in clear_yam\n    login_system(yaml_path)\n  File \"D:\\TestPythonProject\\TEST\\conftest.py\", line 24, in login_system\n    url =read_config_yaml(\"base\", \"base_qccq_sc\")+ i['request'].pop(\"url\")\n  File \"D:\\TestPythonProject\\TEST\\common\\yaml_util.py\", line 63, in read_config_yaml\n    with open(get_project_path() + '\\\\config.yaml', mode='r', encoding='utf-8') as f:\n"}, "start": 1713165507851, "stop": 1713165507854}], "start": 1713165507851, "stop": 1713165507989}