From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码
---
QiaoJiaSystem/DataManagerServer/web-server接口.txt | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt" "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
index 487734a..c8943af 100644
--- "a/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
+++ "b/QiaoJiaSystem/DataManagerServer/web-server\346\216\245\345\217\243.txt"
@@ -167,7 +167,8 @@
//"str_sdks": "1,2,4",
//"str_det_thr": "90,80,95",
//"str_cmp_thr": "80,85,90",
- "str_reserved": ""
+ "str_reserved": "",//鍙紶鍙笉浼�
+ "n_type" : 0 //0娣诲姞 1缂栬緫
}
杩斿洖锛�
{
@@ -190,7 +191,7 @@
"str_longitude" : "39.994827",
"str_name" : "澶у崕鎽勫儚鏈�2",
"str_password" : "123456",
- "str_reserved" : "",
+ "str_reserved" : "group2/M00/02/7F/wKgBnFw1whWAT5DbAALrl1a_A04988.jpg", //瀹炴椂娴佹埅鍥�
// "str_sdks" : "1,2",
"str_username" : "admin"
},
@@ -205,7 +206,7 @@
"str_longitude" : "39.994833",
"str_name" : "澶у崕鎽勫儚鏈�3",
"str_password" : "123433",
- "str_reserved" : "",
+ "str_reserved" : "group2/M00/02/7F/wKgBnFw1whWAT5DbAALrl1a_A04988.jpg",//瀹炴椂娴佹埅鍥�
//"str_sdks" : "1,2,3",
"str_username" : "admin"
}
@@ -286,8 +287,8 @@
//瑙嗛鏃堕暱璁剧疆 cut_dura_edit
涓嬪彂锛�
{
- "cut_max_duration" : 3
- "cut_min_duration" : 3
+ "cut_max_duration" : 3,
+ "cut_min_duration" : 3
}
杩斿洖锛氭爣鍑嗚繑鍥炲��
@@ -460,7 +461,7 @@
"error": "erlang is null"
}
-鏌ユ壘鍚屾搴曞簱 findLocalDatabase
+鏌ユ壘鏈湴搴曞簱 findLocalDatabase
涓嬪彂锛氭棤
杩斿洖锛�
[{
--
Gitblit v1.8.0