Skip to content

zhangjingdong / bihe_interface_test

Go to a project
Commit f4955ccf by zhangjingdong
Options

添加脚本

parent 0adcb4a9
Showing with 269 additions and 17 deletions
.DS_Store
No preview for this file type
.idea/workspace.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="243b24f3-3df7-4c72-bf73-8de81d5ca458" name="Default" comment=""> <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" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/bihe_interface_test$execute_automation_scripts.coverage" NAME="execute_automation_scripts Coverage Results" MODIFIED="1543544423737" 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$execute_automation_scripts.coverage" NAME="execute_automation_scripts Coverage Results" MODIFIED="1544604209555" 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>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="execute_automation_scripts.py" pinned="false" current-in-tab="true"> <file leaf-file-name="execute_automation_scripts.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py"> <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-124"> <state relative-caret-position="198">
<caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" /> <caret line="11" column="49" lean-forward="true" selection-start-line="11" selection-start-column="49" selection-end-line="11" selection-end-column="49" />
<folding> <folding>
<element signature="e#18#29#0" expanded="true" /> <element signature="e#18#29#0" expanded="true" />
</folding> </folding>
...@@ -38,11 +38,6 @@ ...@@ -38,11 +38,6 @@
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
</file> </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" />
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -52,6 +47,16 @@ ...@@ -52,6 +47,16 @@
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>500</find>
<find>6000</find>
</findStrings>
<replaceStrings>
<replace>&quot;+delay_request+&quot;</replace>
<replace>&quot;+timeout_request+&quot;</replace>
</replaceStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
...@@ -71,7 +76,7 @@ ...@@ -71,7 +76,7 @@
<component name="NodePackageJsonFileManager"> <component name="NodePackageJsonFileManager">
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectFrameBounds" fullScreen="true"> <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
<option name="width" value="1440" /> <option name="width" value="1440" />
<option name="height" value="900" /> <option name="height" value="900" />
</component> </component>
...@@ -80,7 +85,6 @@ ...@@ -80,7 +85,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -95,12 +99,25 @@ ...@@ -95,12 +99,25 @@
</path> </path>
<path> <path>
<item name="bihe_interface_test" type="b2602c69:ProjectViewProjectNode" /> <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" /> <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -158,22 +175,30 @@ ...@@ -158,22 +175,30 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1543310367094</updated> <updated>1543310367094</updated>
</task> </task>
<task id="LOCAL-00001" summary="修改活动环境变量和添加企业墙脚本">
<created>1544604333950</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1544604333951</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" /> <frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info anchor="bottom" id="TODO" order="6" /> <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="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" /> <window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Python Console" order="7" /> <window_info anchor="bottom" id="Python Console" order="7" />
<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="Terminal" order="7" weight="0.32969698" /> <window_info anchor="bottom" id="Terminal" order="7" weight="0.32969698" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25679544" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26037195" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <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="Database" order="3" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32969698" />
<window_info anchor="right" id="SciView" order="3" /> <window_info anchor="right" id="SciView" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
...@@ -184,7 +209,6 @@ ...@@ -184,7 +209,6 @@
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32969698" />
<window_info anchor="bottom" id="Concurrent Activities Diagram" order="8" weight="0.32969698" /> <window_info anchor="bottom" id="Concurrent Activities Diagram" order="8" weight="0.32969698" />
</layout> </layout>
</component> </component>
...@@ -194,6 +218,10 @@ ...@@ -194,6 +218,10 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="修改活动环境变量和添加企业墙脚本" />
<option name="LAST_COMMIT_MESSAGE" value="修改活动环境变量和添加企业墙脚本" />
</component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<default-breakpoints> <default-breakpoints>
...@@ -208,6 +236,25 @@ ...@@ -208,6 +236,25 @@
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py"> <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
<folding>
<element signature="e#18#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/碧合app/活动/活动.postman_collection.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/碧合app/活动/-活动_manage.postman_environment.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234"> <state relative-caret-position="234">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<folding> <folding>
...@@ -259,8 +306,8 @@ ...@@ -259,8 +306,8 @@
<entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-28_09:34:00.html" /> <entry file="file://$PROJECT_DIR$/碧合app/活动2018-11-28_09:34:00.html" />
<entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py"> <entry file="file://$PROJECT_DIR$/碧合app/execute_automation_scripts.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-124"> <state relative-caret-position="198">
<caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" /> <caret line="11" column="49" lean-forward="true" selection-start-line="11" selection-start-column="49" selection-end-line="11" selection-end-column="49" />
<folding> <folding>
<element signature="e#18#29#0" expanded="true" /> <element signature="e#18#29#0" expanded="true" />
</folding> </folding>
......
config/.DS_Store
No preview for this file type
碧合app/.DS_Store
No preview for this file type
碧合app/企业墙/企业墙.postman_collection.json 0 → 100644
{
{
"info": {
"_postman_id": "2a3c1f0c-37b1-4c06-9f2f-a378571047d6",
"name": "企业墙",
"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json"
},
"item": [
{
"name": "用户登录",
"event": [
{
"listen": "test",
"script": {
"id": "ab616fda-d96b-4f71-a9aa-6c59ce279e71",
"type": "text/javascript",
"exec": [
"// console.log(\"----------------responseBody--------------\"+responseBody);",
"var jsonData = JSON.parse(responseBody);",
"// console.log(\"----------------jsonData.data.accessToken--------------\"+jsonData.data.accessToken);",
"",
"if(jsonData.data !== null || jsonData.data !==\"\")",
"{",
" tests[\"accessToken\"] = true;",
" postman.setEnvironmentVariable(\"access-Token\",jsonData.data.accessToken);",
" ",
"}",
"else",
"{",
" console.log(\"接口返回错误:\"+jsonData.msg);",
" tests[\"accessToken\"]=false;",
"}",
""
]
}
}
],
"request": {
"method": "POST",
"header": [
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\n \"userPhone\": {{user_phone}},\n \"userPassword\": \"123456\",\n \"equipment\": \"c5d93c486a95d658\",\n \"channelId\": 1\n}"
},
"url": "{{gateway-user}}/app/login"
},
"response": []
},
{
"name": "APP根据类型查询企业列表",
"request": {
"method": "POST",
"header": [
{
"key": "access-Token",
"value": "{{access-Token}}"
},
{
"key": "Content-Type",
"value": "application/json"
}
],
"body": {
"mode": "raw",
"raw": "{\n \"townId\": 1,\n \"id\": \"\"\n}"
},
"url": {
"raw": "{{gateway-user}}/enterprise/wall/type?p=1&c=10",
"host": [
"{{gateway-user}}"
],
"path": [
"enterprise",
"wall",
"type"
],
"query": [
{
"key": "p",
"value": "1"
},
{
"key": "c",
"value": "10"
}
]
}
},
"response": []
},
{
"name": "APP 获取企业详情",
"event": [
{
"listen": "test",
"script": {
"id": "abd52a73-7a0b-470d-bd6b-26b308776215",
"type": "text/javascript",
"exec": [
""
]
}
}
],
"request": {
"method": "GET",
"header": [
{
"key": "Content-Type",
"value": "application/json"
},
{
"key": "access-Token",
"value": "{{access-Token}}"
}
],
"body": {},
"url": "{{gateway-user}}/enterprise/wall/{{id}}"
},
"response": []
}
]
}
\ No newline at end of file
碧合app/企业墙/企业墙_manage.postman_environment.json 0 → 100644
{
{
"id": "8696c47e-61ac-4e1c-915a-403b5b20c36e",
"name": "企业墙_manage",
"values": [
{
"key": "gateway-user",
"value": "https://usergwtest.bgycc.com",
"enabled": true,
"type": "text"
},
{
"key": "user_phone",
"value": "17610939089",
"enabled": true,
"type": "text"
},
{
"key": "access-Token",
"value": "d0623a906fac4f1bb9c410680eced5ef",
"enabled": true,
"type": "text"
},
{
"key": "townId",
"value": "1",
"enabled": true,
"type": "text"
},
{
"key": "id",
"value": "289",
"enabled": true,
"type": "text"
}
],
"_postman_variable_scope": "environment",
"_postman_exported_at": "2018-12-12T07:51:18.360Z",
"_postman_exported_using": "Postman/6.1.4"
}
\ No newline at end of file
碧合app/活动/活动_manage.postman_environment.json 0 → 100644
{
{
"id": "a3a5880d-98ad-45e8-84e3-7642fdfa81c2",
"name": "\b活动_manage",
"values": [
{
"key": "gateway-user",
"value": "https://usergwtest.bgycc.com",
"enabled": true,
"type": "text"
},
{
"key": "user_phone",
"value": "18670340158",
"enabled": true,
"type": "text"
},
{
"key": "access-Token",
"value": "be4c6160f25c4085b6c4c61fa7803a7a",
"enabled": true,
"type": "text"
},
{
"key": "activityId",
"value": "196",
"enabled": true,
"type": "text"
}
],
"_postman_variable_scope": "environment",
"_postman_exported_at": "2018-11-27T03:29:41.309Z",
"_postman_exported_using": "Postman/6.1.4"
}
\ 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