Commit 45dbf5ab by zhangjingdong

更新小管家

parent 66a702c1
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="243b24f3-3df7-4c72-bf73-8de81d5ca458" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/碧合app/execute_automation_scripts.py" beforeDir="false" afterPath="$PROJECT_DIR$/碧合app/execute_automation_scripts.py" afterDir="false" />
</list>
<list default="true" id="243b24f3-3df7-4c72-bf73-8de81d5ca458" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -13,14 +11,15 @@
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/bihe_interface_test$execute_automation_scripts.coverage" NAME="execute_automation_scripts Coverage Results" MODIFIED="1545808680222" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/碧合app" />
<SUITE FILE_PATH="coverage/bihe_interface_test$hebin.coverage" NAME="hebin Coverage Results" MODIFIED="1546007322317" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/碧合app" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="execute_automation_scripts.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="116">
<caret line="11" column="49" lean-forward="true" selection-start-line="11" selection-start-column="49" selection-end-line="11" selection-end-column="49" />
<state relative-caret-position="180">
<caret line="10" column="49" lean-forward="true" selection-start-line="10" selection-start-column="49" selection-end-line="10" selection-end-column="49" />
<folding>
<element signature="e#18#29#0" expanded="true" />
</folding>
......@@ -28,6 +27,18 @@
</provider>
</entry>
</file>
<file leaf-file-name="hebin.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/碧合app/hebin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
<folding>
<element signature="e#14#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="推荐位.postman_collection.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/碧合app/推荐位/推荐位.postman_collection.json">
<provider selected="true" editor-type-id="text-editor">
......@@ -87,24 +98,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="活动.postman_collection.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="83" column="4" selection-start-line="83" selection-start-column="4" selection-end-line="83" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="活动_manage.postman_environment.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/碧合app/活动/活动_manage.postman_environment.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
<caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -118,9 +111,11 @@
<findStrings>
<find>活动报名</find>
<find>tests[\&quot;code\&quot;]=false;</find>
<find></find>
</findStrings>
<replaceStrings>
<replace>tests[\&quot;code\&quot;+jsonData.msg]=false;</replace>
<replace>,</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
......@@ -136,6 +131,7 @@
<option value="$PROJECT_DIR$/碧合app/企业墙/企业墙.postman_collection.json" />
<option value="$PROJECT_DIR$/碧合app/广场圈子/广场圈子.postman_collection.json" />
<option value="$PROJECT_DIR$/碧合app/execute_automation_scripts.py" />
<option value="$PROJECT_DIR$/碧合app/hebin.py" />
</list>
</option>
</component>
......@@ -171,42 +167,6 @@
</path>
<path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" />
<item name="bihe_interface_test" type="462c0819:PsiDirectoryNode" />
<item name="碧合app" type="462c0819:PsiDirectoryNode" />
<item name="企业墙" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" />
<item name="bihe_interface_test" type="462c0819:PsiDirectoryNode" />
<item name="碧合app" type="462c0819:PsiDirectoryNode" />
<item name="公告" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" />
<item name="bihe_interface_test" type="462c0819:PsiDirectoryNode" />
<item name="碧合app" type="462c0819:PsiDirectoryNode" />
<item name="小管家" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" />
<item name="bihe_interface_test" type="462c0819:PsiDirectoryNode" />
<item name="碧合app" type="462c0819:PsiDirectoryNode" />
<item name="广场圈子" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" />
<item name="bihe_interface_test" type="462c0819:PsiDirectoryNode" />
<item name="碧合app" type="462c0819:PsiDirectoryNode" />
<item name="推荐位" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" />
<item name="bihe_interface_test" type="462c0819:PsiDirectoryNode" />
<item name="碧合app" type="462c0819:PsiDirectoryNode" />
<item name="活动" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path>
</expand>
......@@ -234,7 +194,7 @@
</list>
</option>
</component>
<component name="RunManager">
<component name="RunManager" selected="Python.hebin">
<configuration name="execute_automation_scripts" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="bihe_interface_test" />
<option name="INTERPRETER_OPTIONS" value="" />
......@@ -254,8 +214,32 @@
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
</configuration>
<configuration name="hebin" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="bihe_interface_test" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/碧合app" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/碧合app/hebin.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
</configuration>
<list>
<item itemvalue="Python.execute_automation_scripts" />
<item itemvalue="Python.hebin" />
</list>
<recent_temporary>
<list>
<item itemvalue="Python.hebin" />
<item itemvalue="Python.execute_automation_scripts" />
</list>
</recent_temporary>
......@@ -280,11 +264,11 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32969698" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32969698" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Python Console" order="7" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32969698" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2639485" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2639485" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="SciView" order="3" />
......@@ -459,10 +443,23 @@
</state>
</provider>
</entry>
<entry file="file:///anaconda3/envs/py36/lib/python3.6/codecs.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/碧合app/hebin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
<folding>
<element signature="e#14#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="116">
<caret line="11" column="49" lean-forward="true" selection-start-line="11" selection-start-column="49" selection-end-line="11" selection-end-column="49" />
<state relative-caret-position="180">
<caret line="10" column="49" lean-forward="true" selection-start-line="10" selection-start-column="49" selection-end-line="10" selection-end-column="49" />
<folding>
<element signature="e#18#29#0" expanded="true" />
</folding>
......
{
{
......@@ -315,367 +315,6 @@
"url": "{{gateway-user}}/msgrecord/menu/{{menuId}}/readed"
},
"response": []
},
{
"name": "APP端二维码获取活动详情",
"event": [
{
"listen": "test",
"script": {
"id": "75189d4e-ceaa-4f82-9239-28d031c3e472",
"type": "text/javascript",
"exec": [
"var jsonData = JSON.parse(responseBody);",
"if(jsonData.code === \"0\")",
"{",
" tests[\"code\"] = true;",
"}",
"else{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"code\"+jsonData.msg]=false;",
"}"
]
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "access-token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": ""
},
"url": "{{gateway-user}}/app/new/activity/get/info/{{id}}"
},
"response": []
},
{
"name": "APP端获取活动评论列表",
"event": [
{
"listen": "test",
"script": {
"id": "698218d6-d3d6-4146-9d6f-510588491d51",
"type": "text/javascript",
"exec": [
"var jsonData = JSON.parse(responseBody);",
"if(jsonData.code === \"0\")",
"{",
" tests[\"code\"] = true;",
"}",
"else{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"code\"+jsonData.msg]=false;",
"}"
]
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "access-token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": ""
},
"url": {
"raw": "{{gateway-user}}/app/new/activity/list/comment/{{activityId}}?p=1&c=10",
"host": [
"{{gateway-user}}"
],
"path": [
"app",
"new",
"activity",
"list",
"comment",
"{{activityId}}"
],
"query": [
{
"key": "p",
"value": "1"
},
{
"key": "c",
"value": "10"
}
]
}
},
"response": []
},
{
"name": "活动优惠券",
"event": [
{
"listen": "test",
"script": {
"id": "18c720cd-8ab2-4e89-b9ce-44b6105955f7",
"type": "text/javascript",
"exec": [
"var jsonData = JSON.parse(responseBody);",
"if(jsonData.code === \"0\")",
"{",
" tests[\"code\"] = true;",
"}",
"else{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"code\"+jsonData.msg]=false;",
"}"
]
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "access-token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": ""
},
"url": {
"raw": "{{gateway-user}}/app/new/activity/card/{{activityId}}?p=1&c=10",
"host": [
"{{gateway-user}}"
],
"path": [
"app",
"new",
"activity",
"card",
"{{activityId}}"
],
"query": [
{
"key": "p",
"value": "1"
},
{
"key": "c",
"value": "10"
}
]
}
},
"response": []
},
{
"name": "条形码查询",
"event": [
{
"listen": "test",
"script": {
"id": "6334c8f5-ead1-4545-aba1-2a1cd51f1cb8",
"type": "text/javascript",
"exec": [
"var jsonData = JSON.parse(responseBody);",
"if(jsonData.code === \"0\")",
"{",
" tests[\"code\"] = true;",
"}",
"else{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"code\"+jsonData.msg]=false;",
"}"
]
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "access-token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": ""
},
"url": "{{gateway-user}}/pay/user/getcardstockmarket/voucherid/{{voucherid}}"
},
"response": []
},
{
"name": "已领取卡券列表",
"event": [
{
"listen": "test",
"script": {
"id": "ec959f65-f2cc-4488-930b-f8ba62ecd8ef",
"type": "text/javascript",
"exec": [
"var jsonData = JSON.parse(responseBody);",
"if(jsonData.code === \"0\")",
"{",
" tests[\"code\"] = true;",
"}",
"else{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"code\"+jsonData.msg]=false;",
"}"
]
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "access-token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": ""
},
"url": {
"raw": "{{gateway-user}}/pay/user/alreadyreceived/voucherid/{{voucherid}}?p=1&c=10",
"host": [
"{{gateway-user}}"
],
"path": [
"pay",
"user",
"alreadyreceived",
"voucherid",
"{{voucherid}}"
],
"query": [
{
"key": "p",
"value": "1"
},
{
"key": "c",
"value": "10"
}
]
}
},
"response": []
},
{
"name": "APP端活动评论",
"event": [
{
"listen": "test",
"script": {
"id": "f40a6f40-c974-435d-90e0-028838615007",
"type": "text/javascript",
"exec": [
"var jsonData = JSON.parse(responseBody);",
"if(jsonData.code === \"0\")",
"{",
" tests[\"code\"] = true;",
"}",
"else{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"code\"+jsonData.msg]=false;",
"}"
]
}
}
],
"request": {
"method": "POST",
"header": [
{
"key": "access-token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\"activityId\":378,\"commentType\":\"ACTIVITY\",\"comment\":\"1\",\"commentStatus\":\"COMMENT\",\"commentImg\":[]}"
},
"url": "{{gateway-user}}/app/new/activity/comment"
},
"response": []
},
{
"name": "APP端活动点赞",
"event": [
{
"listen": "test",
"script": {
"id": "ffd831ff-2bb2-48ae-8f75-531c458194e9",
"type": "text/javascript",
"exec": [
"var jsonData = JSON.parse(responseBody);",
"if(jsonData.code === \"0\")",
"{",
" tests[\"code\"] = true;",
"}",
"else{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"code\"+jsonData.msg]=false;",
"}"
]
}
}
],
"request": {
"method": "POST",
"header": [
{
"key": "access-token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\"activityId\":378,\"status\":\"ENABLE\",\"thumbsUpType\":\"ACTIVITY\"}"
},
"url": "{{gateway-user}}/app/new/activity/thumbs/up"
},
"response": []
}
]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment