Skip to content

A
aidapidesign
Commit 56839594 by lichaogang
Options

1.refactor get remote cmd schema 2.remove redundance parameters

parent 5de2a818
Showing with 97 additions and 92 deletions
.idea/workspace.xml
......@@ -2,8 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="71ac4745-0bfc-417e-a0b6-f6dc883b0fee" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/idapidesign/v1/app/03_upload_vision_data.md" afterPath="$PROJECT_DIR$/idapidesign/v1/app/03_upload_vision_data.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/idapidesign/v1/app/04_batch_upload_vision_data.md" afterPath="$PROJECT_DIR$/idapidesign/v1/app/04_batch_upload_vision_data.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/idapidesign/v1/app/08_get_school_class_list.md" afterPath="$PROJECT_DIR$/idapidesign/v1/app/08_get_school_class_list.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/idapidesign/v1/app/11_get_student_latest_visions.md" afterPath="$PROJECT_DIR$/idapidesign/v1/app/11_get_student_latest_visions.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/idapidesign/v1/app/12_get_student_visions.md" afterPath="$PROJECT_DIR$/idapidesign/v1/app/12_get_student_visions.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/idapidesign/v1/app/15_terminal_remote_cmd.md" afterPath="$PROJECT_DIR$/idapidesign/v1/app/15_terminal_remote_cmd.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/idapidesign/v1/app/15_terminal_upload_file.md" afterPath="$PROJECT_DIR$/idapidesign/v1/app/15_terminal_upload_file.md" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -18,41 +23,21 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="08_get_school_class_list.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/08_get_school_class_list.md">
<file leaf-file-name="15_terminal_remote_cmd.md" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/15_terminal_remote_cmd.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="33" column="15" lean-forward="false" selection-start-line="33" selection-start-column="15" selection-end-line="33" selection-end-column="15" />
<state relative-caret-position="42">
<caret line="19" column="57" lean-forward="false" selection-start-line="19" selection-start-column="57" selection-end-line="19" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="11_get_student_latest_visions.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/11_get_student_latest_visions.md">
<file leaf-file-name="05_vision_terminal_active.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/05_vision_terminal_active.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-234">
<caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="04_batch_upload_vision_data.md" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/04_batch_upload_vision_data.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="43" column="45" lean-forward="false" selection-start-line="43" selection-start-column="45" selection-end-line="43" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="12_get_student_visions.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/12_get_student_visions.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="40" column="51" lean-forward="false" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="51" />
<state relative-caret-position="-548">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -61,18 +46,8 @@
<file leaf-file-name="03_upload_vision_data.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/03_upload_vision_data.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59">
<caret line="22" column="16" lean-forward="false" selection-start-line="22" selection-start-column="16" selection-end-line="22" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="10_get_student_list.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/10_get_student_list.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<state relative-caret-position="293">
<caret line="38" column="199" lean-forward="true" selection-start-line="37" selection-start-column="12" selection-end-line="38" selection-end-column="199" />
<folding />
</state>
</provider>
......@@ -87,11 +62,14 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/idapidesign/.gitignore" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/08_get_school_class_list.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/10_get_student_list.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/11_get_student_latest_visions.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/08_get_school_class_list.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/12_get_student_visions.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/03_upload_vision_data.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/11_get_student_latest_visions.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/04_batch_upload_vision_data.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/15_terminal_upload_file.md" />
<option value="$PROJECT_DIR$/idapidesign/v1/app/15_terminal_remote_cmd.md" />
</list>
</option>
</component>
......@@ -102,8 +80,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="8" />
<option name="y" value="81" />
<option name="x" value="9" />
<option name="y" value="23" />
<option name="width" value="1381" />
<option name="height" value="808" />
</component>
......@@ -264,15 +242,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1561019695843</updated>
<workItem from="1561019697151" duration="6996000" />
<workItem from="1561019697151" duration="14056000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6996000" />
<option name="totallyTimeSpent" value="14056000" />
</component>
<component name="ToolWindowManager">
<frame x="8" y="81" width="1381" height="808" extended-state="0" />
<frame x="9" y="23" width="1381" height="808" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25367647" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
......@@ -314,48 +292,72 @@
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/08_get_school_class_list.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="33" column="15" lean-forward="false" selection-start-line="33" selection-start-column="15" selection-end-line="33" selection-end-column="15" />
<state relative-caret-position="213">
<caret line="36" column="8" lean-forward="false" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/12_get_student_visions.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="67">
<caret line="39" column="8" lean-forward="false" selection-start-line="39" selection-start-column="8" selection-end-line="39" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/03_upload_vision_data.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="38" column="199" lean-forward="true" selection-start-line="37" selection-start-column="12" selection-end-line="38" selection-end-column="199" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/11_get_student_latest_visions.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="63" column="31" lean-forward="false" selection-start-line="63" selection-start-column="31" selection-end-line="63" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/10_get_student_list.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<state relative-caret-position="-285">
<caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/12_get_student_visions.md">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/05_vision_terminal_active.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="40" column="51" lean-forward="false" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="51" />
<state relative-caret-position="-548">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/03_upload_vision_data.md">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/04_batch_upload_vision_data.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59">
<caret line="22" column="16" lean-forward="false" selection-start-line="22" selection-start-column="16" selection-end-line="22" selection-end-column="16" />
<state relative-caret-position="156">
<caret line="35" column="60" lean-forward="false" selection-start-line="35" selection-start-column="60" selection-end-line="35" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/11_get_student_latest_visions.md">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/15_terminal_upload_file.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-234">
<caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<state relative-caret-position="96">
<caret line="28" column="11" lean-forward="true" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/04_batch_upload_vision_data.md">
<entry file="file://$PROJECT_DIR$/idapidesign/v1/app/15_terminal_remote_cmd.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="43" column="45" lean-forward="false" selection-start-line="43" selection-start-column="45" selection-end-line="43" selection-end-column="45" />
<state relative-caret-position="42">
<caret line="19" column="57" lean-forward="false" selection-start-line="19" selection-start-column="57" selection-end-line="19" selection-end-column="57" />
<folding />
</state>
</provider>
......
idapidesign/v1/app/03_upload_vision_data.md
......@@ -21,11 +21,10 @@ API请求参数
### Form Parameters
dataId {String} 唯一ID ，由Android端生成
studentId {String} 学生ID
leftEye {float} 左视力
rightEye {float} 右眼视力
distance {int}
testType {int} 设备模式，1:学校模式、2:商城模式、3:海航模式
studentId {int} 学生ID
leftEye {float} 左眼视力 3.8-5.3
rightEye {float} 右眼视力 3.8-5.3
distance {int} 3米或5米
testTime {int}
## Response
......@@ -36,10 +35,9 @@ API请求参数
**Command**
curl -X POST \
-H "Content-Type: application/json" \
-H "X-Token: 5ebfdbca1a5d4dbd4a6cc8e835276779" \
-H "X-DeviceInformation: Android%2F5.0%2F4.8%2Fxxxxx%2FtestName" \
-d '{"uuid":"1DE5CAAA-DB46-419A-8162-EC853DAEA5CF","sid":"1111","eid":"2222","leftEye":1.0,"rightEye":1.2,"addType":1,"distance":3,"testTime":1560426091}' \
-H "X-DeviceInformation: 11%2f22%2f141" \
-H "X-Sign: mCNfxI/TgBt9K63KJ/cMcW2SgjJuQhmpiyUsSIVncfrI7XgukTBX8mqB5zZZ4Zmid2Elb0NbeUEmPanSMkWMENzLu0hbFQQhN9FaOsCNAK0wBmOgZ0PW0/jCqi7m4yC0wcxRlkbefob7nB76ri5j2wvB0Qi4Js8UPUl77eegs9A=" \
-d 'dataId=1DE5CAAA-DB46-419A-8162-EC853DAEA5CF&studentId=549&leftEye=1.0&rightEye=1.2&addType=0&distance=3&testTime=1560426091' \
http://localhost:8080/v1/upload_vision_data
**Output**
......
idapidesign/v1/app/04_batch_upload_vision_data.md
......@@ -29,11 +29,11 @@ API请求参数
**Command**
curl -X POST \
-H "Content-Type: application/json" \
-H "X-Token: 5ebfdbca1a5d4dbd4a6cc8e835276779" \
-H "X-DeviceInformation: Android%2F5.0%2F4.8%2Fxxxxx%2FtestName" \
-d '[{"uuid":"1DE5CAAA-DB46-419A-8162-EC853DAEA5CF","studentId":"1111","leftEye":1.0,"rightEye":1.2,"testType":1,"distance":3,"testTime":1560426091}]'
http://localhost:8080/v1/batch_upload_vision_data
-H "X-DeviceInformation: 11%2f22%2f96" \
-H "X-Sign: qM2Ep2wGF5xCJMerRVxtzciuWi8xrjgLkhNpvV2zNLF/Rv/Rf9FF3XwsIF/BOHFPEtwbmGNX57fkdzTEriDTZaCJ566PbNy7eklZ21GdAXSsrpY6Yl6YfRqSFCJbzatB0tCAKkMkHaizJ+5g05PklCo6833E9x8VZZ8g1mf4oXg=" \
-H "Content-Type: application/json" \
-d '[{"dataId":"7a2adcb0-9408-11e9-ad5f-32001713d001","studentId":549,"leftEye":3.0,"rightEye":3.2,"testType":0,"distance":3,"testTime":1561113665},{"dataId":"7a2adcb0-9408-11e9-ad5f-32001713d004","studentId":549,"leftEye":3.0,"rightEye":3.2,"testType":0,"distance":3,"testTime":1561113665},{"dataId":"7a2adcb0-9408-11e9-ad5f-32001713d002","studentId":549,"leftEye":3.0,"rightEye":3.2,"testType":0,"distance":3,"testTime":1561113665}]' \
http://localhost:8080/v1/batch_upload_vision_data
**Output**
......
idapidesign/v1/app/08_get_school_class_list.md
......@@ -33,8 +33,8 @@ API请求参数
curl -X GET \
-H "X-DeviceInformation: 5ebfdbca1a5d4dbd4a6cc8e835276779" \
-H "X-Sign: xxxxxxxx"
-H "X-DeviceInformation: 11%2f22%2f96" \
-H "X-Sign: mCNfxI/TgBt9K63KJ/cMcW2SgjJuQhmpiyUsSIVncfrI7XgukTBX8mqB5zZZ4Zmid2Elb0NbeUEmPanSMkWMENzLu0hbFQQhN9FaOsCNAK0wBmOgZ0PW0/jCqi7m4yC0wcxRlkbefob7nB76ri5j2wvB0Qi4Js8UPUl77eegs9A=" \
http://localhost:8080/v1/get_school_grade_and_class
**Output**
......
idapidesign/v1/app/11_get_student_latest_visions.md
......@@ -49,7 +49,7 @@ API请求参数
"leftEye": "4.3",
"rightEye": "4.4",
"distance": 3,
"addTime": 1556006511
"testTime": 1556006511
}
]
},
......@@ -61,7 +61,7 @@ API请求参数
"leftEye": "5.1",
"rightEye": "5.1",
"distance": 3,
"addTime": 1556006511
"testTime": 1556006511
}
]
}
......
idapidesign/v1/app/12_get_student_visions.md
......@@ -36,8 +36,8 @@ API请求参数
curl -X GET \
-H "X-DeviceInformation: 5ebfdbca1a5d4dbd4a6cc8e835276779" \
-H "X-Sign: xxxxxxxx"
-H "X-DeviceInformation: 11%2f22%2f96" \
-H "X-Sign: mCNfxI/TgBt9K63KJ/cMcW2SgjJuQhmpiyUsSIVncfrI7XgukTBX8mqB5zZZ4Zmid2Elb0NbeUEmPanSMkWMENzLu0hbFQQhN9FaOsCNAK0wBmOgZ0PW0/jCqi7m4yC0wcxRlkbefob7nB76ri5j2wvB0Qi4Js8UPUl77eegs9A=" \
http://localhost:8080/v1/get_student_visions
**Output**
......
idapidesign/v1/app/15_terminal_remote_cmd.md
......@@ -17,7 +17,7 @@ API请求参数
### Form Parameters
equipmentId {String} RSA
equipmentId {String} RSA 记得urlencode 一下
## Response
......@@ -41,9 +41,14 @@ cmd 上传命令
{
"data": {
"cmd": "backup",
"params": "1",
"cmdTime":18910265201,
"list":[
{
"cmdId":1111
"cmd": "backup",
"params": "1",
"cmdTime":18910265201,
}
],
"serverTime":18910265201,
},
"errno": 200,
......
idapidesign/v1/app/15_terminal_upload_file.md
......@@ -19,9 +19,9 @@ API请求参数
X-Sign {String} rsa(timestamp) 加密
### Form Parameters
cmdId int64 1233
dataType {String} backup,log
file {String} gzip
file {String} 压缩文件
## Response
......@@ -31,9 +31,9 @@ API请求参数
**Command**
curl -X POST \
-H "X-Sign: xxxxxxxx"
-H "X-DeviceInformation: Android%2F5.0%2F4.8%2Fxxxxx%2FtestName" \
-G \
-H "X-DeviceInformation: 11%2f22%2f96" \
-H "X-Sign: qM2Ep2wGF5xCJMerRVxtzciuWi8xrjgLkhNpvV2zNLF/Rv/Rf9FF3XwsIF/BOHFPEtwbmGNX57fkdzTEriDTZaCJ566PbNy7eklZ21GdAXSsrpY6Yl6YfRqSFCJbzatB0tCAKkMkHaizJ+5g05PklCo6833E9x8VZZ8g1mf4oXg=" \
-F "cmdId=1" -F "file=@/Users/jack/Downloads/730.zip" \
http://localhost:8080/v1/terminal_upload_file
**Output**
......
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 to comment