Merge branch 'master' of https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git

tiku_App/src/com/offcn/TestUnti/MapUtil.java

@@ -246,6 +246,8 @@ public class MapUtil {
 		return sb.toString();
 	}
 	
+
+	
 	//在parameter中查看，是否有(第二个参数)verifyCode的关键字，有的话返回他的字母值
 		public static String getParameter(String parameter,String Letter){
 			if(parameter==null){
@@ -255,17 +257,24 @@ public class MapUtil {
 			int comma=strcomma.length;
 			StringBuffer sb=new StringBuffer();
 			for(int k=0;k<comma;k++){
+				
 				//此时是多个，，，
 				String[] str=strcomma[k].split(":");
 				String str_strcomma=Arrays.toString(str);
 //				System.out.println("str="+Arrays.toString(str));
 				//按参数传过来的字符串做为子串，在以逗号为节点的串中分别查找子串的关键字，
 				//在找到后的位置开始查找数字，最后把数字的字符串返回
-			if(str_strcomma.contains(Letter)){
+//				System.out.println(str[k]);
+				if(str[0].equals(Letter) || str[0].equals("\""+Letter+"\"")){
 					int start=str_strcomma.indexOf(',');
 					sb.append(str_strcomma.substring(start+2,str_strcomma.length()-1));
 					return sb.toString();
 				}
+//				if(str_strcomma.contains(Letter)){
+//					int start=str_strcomma.indexOf(',');
+//					sb.append(str_strcomma.substring(start+2,str_strcomma.length()-1));
+//					return sb.toString();
+//				}
 			}
 			return sb.toString();
 		}

tiku_App/src/com/offcn/api/nwn/uploadImg.java

@@ -9,6 +9,7 @@ import java.sql.Statement;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 
 import org.json.simple.JSONArray;
@@ -20,6 +21,7 @@ import com.offcn.TestUnti.StringUtils;
 import com.offcn.interfaces.API;
 import com.offcn.process.NWN;
 import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
 import com.offcn.TestUnti.ListUtil;
 
 import net.sf.json.JSONObject;
@@ -60,6 +62,10 @@ public class uploadImg extends NWN implements API {
 	public Response SendRequest(HashMap<String, Object> data, String Url,
 			String Request) {
 		Response re = RequestDataUtils.Post_file(data, Url,"PHPSESSID",PHPSESSID,"img","1.png");
+		
+		
+	
+//		Response re = RequestDataUtils.POST_houtai(data,myRequest);
 		return re;
 	}
 

tiku_App/src/com/offcn/api/tk/app2/deleteUserExam.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+
+public class deleteUserExam extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String id;//选择考试的记录id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		id = MapUtil.getParameter(parameter, "id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!id.equals("")) && id.equals("code")) {
+			id=L_record_id;
+			parameter = parameter.replace("\"id\":code", "\"id\":\""+ id + "\"");
+		}
+
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		id = MapUtil.killQuotes(id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("id", id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getBookshelfLevel.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 9. 获取首页练习册 (v1: 106)
+ * 
+ */
+
+public class getBookshelfLevel extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_subtype_id;//专项层级id
+	public String exam_id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_subtype_id = MapUtil.getParameter(parameter, "exam_subtype_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		
+		if ((!exam_subtype_id.equals("")) && exam_subtype_id.equals("code")) {
+			exam_subtype_id=L_exam_subtype_id;
+			parameter = parameter.replace("\"exam_subtype_id\":code", "\"exam_subtype_id\":\""+ exam_subtype_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+
+		exam_subtype_id = MapUtil.killQuotes(exam_subtype_id, "\"");
+		exam_id = MapUtil.killQuotes(exam_id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("exam_subtype_id", exam_subtype_id);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				List<String> list=jp.getList("data");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+					for(int i=0;i<list.size();i++){
+						L_exam_subtype_id=jp.getString("data["+i+"].exam_subtype_id");
+					}
+					
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getExamList.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 获取考试列表 （v1 . 17）
+ * 
+ */
+
+public class getExamList extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String parent_id;//考试父级id
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		parent_id = MapUtil.getParameter(parameter, "parent_id").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("parent_id", parent_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				List<String> list=jp.getList("data");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+					for(int i=0;i<list.size();i++){
+						L_exam_id=jp.getString("data["+i+"].id");
+					}
+					
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getIndexPracticeDetail.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 9. 获取首页练习册 (v1: 106)
+ * 
+ */
+
+public class getIndexPracticeDetail extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		exam_id = MapUtil.killQuotes(exam_id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl("/apiv2/workbook/indexpractice/getIndexPracticeDetail");
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				List<String> list=jp.getList("data");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+					for(int i=0;i<list.size();i++){
+						L_exam_subtype_id=jp.getString("data["+i+"].exam_subtype_id");
+					}
+					
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getItemInfo.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+
+public class getItemInfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		exam_id = MapUtil.killQuotes(exam_id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		String signString= MapUtil.getParameter(parameter, "sign").trim();
+		signString = MapUtil.killQuotes(signString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		jsonAsMap.put("sign", signString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getRecommend.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 7. 获取首页轮播图（v1 . 19号接口）
+ * 
+ */
+
+public class getRecommend extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+
+		exam_id = MapUtil.killQuotes(exam_id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl("/apiv2/exam/recommend/getRecommend");
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getUserArea.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+
+public class getUserArea extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				List<String> list=jp.getList("data.exam");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+					for(int i=0;i<list.size();i++){
+						L_record_id=jp.getString("data.exam["+i+"].id");
+						L_exam_id=jp.getString("data.exam["+i+"].exam_id");
+//						System.out.println(L_record_id);
+						System.out.println(L_exam_id);
+					}
+					
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getUserExam.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 10. app首页获取今日做题、累计做题、累计天数（v1 . 20）
+ * 
+ */
+
+public class getUserExam extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		exam_id = MapUtil.killQuotes(exam_id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl("/apiv2/exam/user/getUserExam");
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/login.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+
+public class login extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//手机号
+	public String passwd;//密码（md5加密，32位小写）
+//	public String system;//手机系统信息
+//	public String platform;//手机平台
+//	public String version;//版本号
+//	public String device_id;//设备号
+
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();
+		if ((!phone.equals("")) && phone.equals("code")) {
+			phone=phoneNeb;
+			parameter = parameter.replace("\"phone\":code", "\"phone\":\""+ phone + "\"");
+		}
+		passwd = MapUtil.getParameter(parameter, "passwd").trim();
+//		system = MapUtil.getParameter(parameter, "system").trim();
+//		platform = MapUtil.getParameter(parameter, "platform").trim();
+//		version = MapUtil.getParameter(parameter, "version").trim();
+//		device_id = MapUtil.getParameter(parameter, "device_id").trim();
+
+
+		phone = MapUtil.killQuotes(phone, "\"");
+		passwd = MapUtil.killQuotes(passwd, "\"");
+//		system = MapUtil.killQuotes(system, "\"");
+//		platform = MapUtil.killQuotes(platform, "\"");
+//		version = MapUtil.killQuotes(version, "\"");
+//		device_id = MapUtil.killQuotes(device_id, "\"");
+
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+//		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		String signString= MapUtil.getParameter(parameter, "sign").trim();
+		signString = MapUtil.killQuotes(signString, "\"");
+		jsonAsMap.put("phone", phone);
+		jsonAsMap.put("passwd", passwd);
+//		jsonAsMap.put("system", system);
+//		jsonAsMap.put("platform", platform);
+//		jsonAsMap.put("version", version);
+//		jsonAsMap.put("device_id", device_id);
+		jsonAsMap.put("appid", tikuString);
+		jsonAsMap.put("sign", signString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/setDefaultExam.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+
+public class setDefaultExam extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String id;//选择考试的记录id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		id = MapUtil.getParameter(parameter, "id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!id.equals("")) && id.equals("code")) {
+			id=L_record_id;
+			parameter = parameter.replace("\"id\":code", "\"id\":\""+ id + "\"");
+		}
+
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		id = MapUtil.killQuotes(id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("id", id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/setUserExam.java

+package com.offcn.api.tk.app2;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+
+public class setUserExam extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		id = MapUtil.getParameter(parameter, "id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+
+		if ((!id.equals("")) && id.equals("code")) {
+			id=L_exam_id;
+			parameter = parameter.replace("\"id\":code", "\"id\":\""+ id + "\"");
+		}
+		
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		id = MapUtil.killQuotes(id, "\"");
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("id", id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getBookshelfInfo.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 获取考试列表 （v1 . 17）
+ * 
+ */
+
+public class getBookshelfInfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				List<String> list=jp.getList("data");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+					for(int i=0;i<list.size();i++){
+						L_shelf_id=jp.getString("data["+i+"].shelf_id");
+					}
+//					
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getIndexPracticeInfo.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 获取考试列表 （v1 . 17）
+ * 
+ */
+
+public class getIndexPracticeInfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_id;//考试id
+	public String user_id;//用户id
+	public String channel;//用户id
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getPracticeListByShelf.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 获取考试列表 （v1 . 17）
+ * 
+ */
+
+public class getPracticeListByShelf extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_id;//考试id
+	public String user_id;//用户id
+	public String shelf_id;//书架id
+	public String channel;//用户id
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		shelf_id = MapUtil.getParameter(parameter, "shelf_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!shelf_id.equals("")) && shelf_id.equals("code")) {
+			shelf_id=L_shelf_id;
+			parameter = parameter.replace("\"shelf_id\":code", "\"shelf_id\":\""+ shelf_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("shelf_id", shelf_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/ht/getPaperFilter.java

+package com.offcn.api.tk.ht;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.interfaces.API;
+import com.offcn.process.HT;
+import com.offcn.system.MyRequest;
+
+
+
+
+/**
+ * 
+ * 
+ * @author puhui
+ *
+ */
+public class getPaperFilter extends HT implements API {
+	public String parameter;//参数集合
+	
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setRequest(Request);
+		myRequest.setUrl(Url);
+		if(!"".equals(PHPSESSID)){
+			Map<String, String> Cookies=new HashMap<String, String>();
+			Cookies.put("PHPSESSID", PHPSESSID);
+			myRequest.setCookies(Cookies);
+		}
+		
+		Response re = RequestDataUtils.RestAssuredApi(data,myRequest);
+//		Response re = RequestDataUtils.POST_houtai(data,myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		String json = re.asString().substring(1);
+		JsonPath jp = new JsonPath(json);
+		
+		boolean result = true;
+		String failReason = "";
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			System.out.println(jp.toString());
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && jp.getString("data")!=null){
+				String custom=data.get("custom").toString();
+				String[] ArrayString=StringUtils.getArrayString(custom,",");
+//				System.out.println(jp.getString("custom"));
+//				System.out.println(Arrays.toString(ArrayString));
+				if(!StringUtils.VerificationString(jp.getString("data"),ArrayString)){
+					result = result && false;
+					failReason = failReason + "custom is expected "
+							+ data.get("custom").toString() + " but actually "
+							+ jp.getString("data") + ".";
+				}
+			}
+		}
+		
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/ht/mockList.java

@@ -3,27 +3,12 @@ package com.offcn.api.tk.ht;
 import io.restassured.path.json.JsonPath;
 import io.restassured.response.Response;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.json.simple.JSONArray;
-
-import test.HttpUtils;
-
-import com.offcn.TestUnti.ListUtil;
-import com.offcn.TestUnti.Log;
 import com.offcn.TestUnti.MapUtil;
-import com.offcn.TestUnti.MySqlUtil;
-import com.offcn.TestUnti.ReadProperties;
 import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
 import com.offcn.interfaces.API;
 import com.offcn.process.HT;
 import com.offcn.system.MyRequest;
@@ -71,11 +56,13 @@ public class mockList extends HT implements API {
 
 	@Override
 	public String handleOutput(Response re, HashMap<String, Object> data) {
-		JsonPath jp = re.body().jsonPath();
+//		JsonPath jp = re.body().jsonPath();
+		
 		boolean result = true;
 		String failReason = "";
 
-		String json = re.asString();
+		String json = re.asString().substring(1);
+		JsonPath jp = new JsonPath(json);
 
 		if ((data.get("statusCode") != null)
 				&& (!data.get("statusCode").toString()
@@ -86,46 +73,39 @@ public class mockList extends HT implements API {
 					+ String.valueOf(re.getStatusCode()) + ". ";
 		}
 
-//		if (json.length() != 0) {
-//			
-//			System.out.println(jp.toString());
-//			String msg=jp.getString("message");
-//			String code=jp.getString("retcode");
-//			
-//			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
-//				result = result && false;
-//				failReason = failReason + "code is expected "
-//						+ data.get("code").toString() + " but actually "
-//						+ jp.getString("code") + ".";
-//			}
-//
-//			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
-//				result = result && false;
-//				failReason = failReason + "msg is expected "
-//						+ data.get("msg").toString() + " but actually "
-//						+ jp.getString("msg") + ".";
-//			}
-//			
-//			if(data.get("custom") != null && jp.getString("data")!=null){
-//				String custom=data.get("custom").toString();
-//				String[] ArrayString=StringUtils.getArrayString(custom,",");
-////				System.out.println(jp.getString("custom"));
-////				System.out.println(Arrays.toString(ArrayString));
-//				if(!StringUtils.VerificationString(jp.getString("data"),ArrayString)){
-//					result = result && false;
-//					failReason = failReason + "custom is expected "
-//							+ data.get("custom").toString() + " but actually "
-//							+ jp.getString("data") + ".";
-//				}
-//			}
-			
-			
-//			if("0".equals(jp.getString("retcode"))){
-//				System.out.println(json);
-//			}
-			
-			
-//		}
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && jp.getString("data")!=null){
+				String custom=data.get("custom").toString();
+				String[] ArrayString=StringUtils.getArrayString(custom,",");
+//				System.out.println(jp.getString("custom"));
+//				System.out.println(Arrays.toString(ArrayString));
+				if(!StringUtils.VerificationString(jp.getString("data"),ArrayString)){
+					result = result && false;
+					failReason = failReason + "custom is expected "
+							+ data.get("custom").toString() + " but actually "
+							+ jp.getString("data") + ".";
+				}
+			}
+			
+		}
 		
 		if (result)
 			return "Pass";

tiku_App/src/com/offcn/process/BasicsGM.java

@@ -269,6 +269,7 @@ public class BasicsGM {
 		
 		try {
 			String errmsg=JSONObject.fromObject(re.body().asString()).getString("errmsg");
+			
 			if(StringIsNull(errmsg)){
 				return errmsg;
 			}

tiku_App/src/com/offcn/process/NWN.java

@@ -46,6 +46,10 @@ public class NWN extends BasicsGM{
 	public static String level_id_List = "";//层级的id
 	public static List<String> user_id_List = new ArrayList<String>();//user_id
 	
+	public NWN(){
+		Connectionsa();
+	}
+	
 	public void Connectionsa(){
 		//================设置数据库连接池=====================
 		ConnectionsMap=getConnections(new String[]{"nwn"});
@@ -57,9 +61,7 @@ public class NWN extends BasicsGM{
 //		DynamicParameter.put("sign","code");//动态公共参数
 	}
 	
-	public NWN(){
-		Connectionsa();
-	}
+
 	
 	//动态公共参数
 		public HashMap<String, Object> setDynamicParameter(HashMap<String, Object> data) {
@@ -78,15 +80,15 @@ public class NWN extends BasicsGM{
 					if(!parameter.contains("\""+key+"\"") && !parameter.contains(key+"=")){
 						if("get".equals(Request)){
 							if(parameter==null || parameter.length()==0){
-								parameter=key+"="+"ppp";
+								parameter=key+"="+"value";//value 需要自己写
 							}else{
-								parameter=parameter+"&"+key+"="+"ppp";
+								parameter=parameter+"&"+key+"="+"value";//value 需要自己写
 							}
 						}else{
 							if(parameter==null || parameter.length()==0){
-								parameter=key+"\":\""+"ppp"+"\"";
+								parameter=key+"\":\""+"value"+"\"";//value 需要自己写
 							}else{
-								parameter=parameter+",\""+key+"\":\""+"ppp"+"\"";
+								parameter=parameter+",\""+key+"\":\""+"value"+"\"";//value 需要自己写
 							}
 						}
 					}
@@ -114,15 +116,15 @@ public class NWN extends BasicsGM{
 					if(!parameter.contains("\""+key+"\"") && !parameter.contains(key+"=")){
 						if("get".equals(Request)){
 							if(parameter==null || parameter.length()==0){
-								parameter=key+"="+value;
+								parameter=key+"="+value;//value 需要自己写
 							}else{
-								parameter=parameter+"&"+key+"="+value;
+								parameter=parameter+"&"+key+"="+value;//value 需要自己写
 							}
 						}else{
 							if(parameter==null || parameter.length()==0){
-								parameter=key+"\":\""+value+"\"";
+								parameter=key+"\":\""+value+"\"";//value 需要自己写
 							}else{
-								parameter=parameter+",\""+key+"\":\""+value+"\"";
+								parameter=parameter+",\""+key+"\":\""+value+"\"";//value 需要自己写
 							}
 						}
 					}

tiku_App/src/com/offcn/process/TK.java

@@ -52,8 +52,6 @@ public class TK extends BasicsGM{
 	public static String is_hf_L="";//47
 	public static String type_L="";//47
 	public static String recordId_L="";//110申论，使用记录id 提交做题记录时需要用到
-	
-	
 	public static String admin_login_ssid="";//后台登录cookie
 	public static String admin_28_encode="";//后台登录cookie
 	public static String PHPSESSID="";//Cookie，后台第77个接口使用
@@ -61,12 +59,17 @@ public class TK extends BasicsGM{
 	public static String Location="";//Location，调用接口发现还是需要登录，获取到的连接
 	public static String Location1="";//Location，调用接口发现还是需要登录，获取到的连接
 //	tiku2接口数据
-	public static String L_record_id="";
+	public static String L_record_id="";//apiv2 1接口，用户选择考试的记录id
 	public static String L_mock_id="";
-	public static String L_exam_id="";
+	public static String L_exam_id="";//考试id
 	public static String L_mock_subject_id="";
 	public static String L_mock_sub_id="";
 	public static String L_record_sub_id="";
+//	public static String exam_id_L="";//考试id
+//	public static String Record_id="";//apiv2 1接口，用户选择考试的记录id
+	public static String L_exam_subtype_id="";//专项层级id
+//	tiku3接口数据
+	public static String L_shelf_id="";//书架id
 	
 	
 	

tiku_App/src/com/offcn/system/MyRequest.java

@@ -7,10 +7,11 @@ public class MyRequest {
 	private String Request;
 	private String Url;
 	private Map<String, String> Cookies;
-	private Map<String,String> headers;
+	private Map<String, String> Headers;
 	private String Parameter; //json请求方式的参数
 	private Map<String, String> formParameter;//form_data请求方式的参数、或file请求方式的参数
 	private String file;
+	private String fileType;
 	public String getRequest() {
 		return Request;
 	}
@@ -30,10 +31,10 @@ public class MyRequest {
 		Cookies = cookies;
 	}
 	public Map<String, String> getHeaders() {
-		return headers;
+		return Headers;
 	}
 	public void setHeaders(Map<String, String> headers) {
-		this.headers = headers;
+		Headers = headers;
 	}
 	public String getParameter() {
 		return Parameter;
@@ -53,19 +54,27 @@ public class MyRequest {
 	public void setFile(String file) {
 		this.file = file;
 	}
+	public String getFileType() {
+		return fileType;
+	}
+	public void setFileType(String fileType) {
+		this.fileType = fileType;
+	}
 	public MyRequest(String request, String url, Map<String, String> cookies,
 			Map<String, String> headers, String parameter,
-			Map<String, String> formParameter, String file) {
+			Map<String, String> formParameter, String file, String fileType) {
 		super();
 		Request = request;
 		Url = url;
 		Cookies = cookies;
-		this.headers = headers;
+		Headers = headers;
 		Parameter = parameter;
 		this.formParameter = formParameter;
 		this.file = file;
+		this.fileType = fileType;
 	}
 	public MyRequest() {
 	}
 	
+	
 }

tiku_App/src/com/offcn/test/APITest_tk.java

@@ -8,12 +8,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
-
 import net.sf.json.JSONObject;
-
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
-
 import com.offcn.TestData.offcn_api_testData;
 import com.offcn.TestUnti.Log;
 import com.offcn.TestUnti.MapUtil;
@@ -64,7 +61,6 @@ public class APITest_tk extends BasicsGM{
 	  String codeORerrcode="";
 	  String msgORerrmsy="";
 	  String result = "";
-	  
 	  if(re!=null){
 		  body=re.asString();
 		  if(body.contains("<html")){
@@ -92,21 +88,21 @@ public class APITest_tk extends BasicsGM{
 	  
 	  
 	  //数据回写
-//	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-//	  SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
-//	  sheet.writeExcel(
-//			  		data.get("NO").toString(),
-//				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
-//				  	data.get("Description").toString(),
-//				  	parameter.length()>1000?"内容超长。":parameter, 
-//					JSONObject.fromObject(ExpectResult).toString(),
-//					StringUtils.decodeUnicode(re.asString().length()>10000?"内容超长。状态码："+re.getStatusCode():re.asString()),
-//					codeORerrcode,
-//					msgORerrmsy,
-//					result,
-//					time
-//					);
-//	  
+	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
+	  SheetUtils sheet = new SheetUtils("DataAllMr.xls", "Output");
+	  sheet.writeExcel(
+			  		data.get("NO").toString(),
+				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
+				  	data.get("Description").toString(),
+				  	parameter.length()>1000?"内容超长。":parameter, 
+					JSONObject.fromObject(ExpectResult).toString(),
+					StringUtils.decodeUnicode(re.asString().length()>10000?"内容超长。状态码："+re.getStatusCode():re.asString()),
+					codeORerrcode,
+					msgORerrmsy,
+					result,
+					time
+					);
+	  
 	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();

tiku_App/src/makeTestCase/MakeTestCases.java

 package makeTestCase;
 
-
+//支持get方式 
 
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
@@ -35,22 +35,17 @@ public class MakeTestCases {
 	
 	public static void main(String[] args) {
 
-		make("TestData/CaseMake.xls","Sheet1");
+		make("TestData/CaseMake.xls","Sheet1","get","nwn");
 	}
 	
 	
-	public static void make(String FilePath,String SheetName){
+	public static void make(String FilePath,String SheetName,String getOrPost,String qudao){
 		//获取用例
 		List<String> listSum=TestCase(FilePath,SheetName);
         Set<String> set=new HashSet<String>();         
         set.addAll(listSum);
         listSum.clear();   
         listSum.addAll(set);
-        
-        for (String string : listSum) {
-			System.out.println(string);	
-		}
-		
         List<String> TeseName= TestCaseName(listSum);
 //        System.out.println("用例数"+listSum.size());
 //        System.out.println("用例名字数"+TeseName.size());
@@ -76,12 +71,20 @@ public class MakeTestCases {
 		String jieKouMing=apipath[0];
 		//生成测试用例
 		for(int i=0;i<listSum.size();i++){
-			outCase(i,leiming,jieKouMing,TeseName.get(i),path,listSum.get(i),name,"OutPage");
+			String cases=listSum.get(i);
+			if("get".equals(getOrPost)){
+				cases=cases.replace(":", "=");
+				cases=cases.replace("\"", "");
+				cases=cases.replace(",", "&");
+			}
+			System.out.println(cases);	
+			outCase(i,leiming,jieKouMing,TeseName.get(i),path,cases,name,"OutPage",getOrPost,qudao);
 		}
 				
 	}
 	//第一个参数是数量，第二个参数是接口类名，第三个参数是中文名
-	public static void outCase(int i,String leiming,String jieKouMing,String TeseName,String path,String cases,String wenjianming,String Sheet){
+	public static void outCase(int i,String leiming,String jieKouMing,String TeseName,
+			String path,String cases,String wenjianming,String Sheet,String getOrPost,String qudao){
 		
 		Date d = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -95,10 +98,10 @@ public class MakeTestCases {
 				  		leiming + "_" + (i+1),
 				  		(i+1)+"", 
 				  		jieKouMing+"-"+TeseName,
-				  		"tk_2",
+				  		qudao,
 					  	path,
 						"N", 
-						"post",
+						getOrPost,
 						"200",
 						cases
 						);
@@ -352,7 +355,7 @@ public class MakeTestCases {
 //				System.out.println("yongli="+yongli);
 				
 				listSum.add(yongli);
-//				System.out.println("listSum="+listSum);
+				//System.out.println("listSum="+listSum);
 			}
 		}
 //		System.out.println(listSum.toString());

tiku_App/src/resources/class.properties

 xyzb=com.offcn.api.xyzb.
 tk=com.offcn.api.tk.app.
 tk_2=com.offcn.api.tk.app2.
+tk_3=com.offcn.api.tk.app3.
 ht=com.offcn.api.tk.ht.
 htym=com.offcn.api.tk.ht.
 nwn=com.offcn.api.nwn.

tiku_App/src/resources/test.properties

-xls=DataAll.xls
+xls=DataAllMr.xls
 sheet=TestCase1
 mysql_local_Online=local
 Percentage=60
\ No newline at end of file

tiku_App/src/test/ReadProperties.java

+package test;
+
+
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class ReadProperties {
+	
+
+	public static void main(String[] args) {
+		String s=ReadProperties.GetTestPropertyByKey("xls");
+		System.out.println(s);
+//		ClearProperty();
+//		SetProperty("123","111");
+	}
+	
+    public static String GetPropertyByKey(String key) {
+        Properties pps = new Properties();
+        try {
+        	File directory = new File(".");
+            String sourceFile = directory.getCanonicalPath() +File.separator+"src"+File.separator+"resources"+File.separator+"class.properties";
+            InputStream in = new BufferedInputStream (new FileInputStream(sourceFile));  
+            pps.load(in);
+            String value = pps.getProperty(key);
+            return value;
+        }catch (IOException e) {
+            return null;
+        }
+    }
+    
+    public static String GetTestPropertyByKey(String key) {
+        Properties pps = new Properties();
+        try {
+        	File directory = new File(".");
+        	System.out.println(directory);
+        	
+            String sourceFile = directory.getCanonicalPath() +File.separator+"src"+File.separator+"resources"+File.separator+"test.properties";
+          
+            InputStream in = new BufferedInputStream (new FileInputStream(sourceFile));  
+            pps.load(in);
+            String value = pps.getProperty(key);
+            System.out.println("value====" +value);
+            return value;
+        }catch (IOException e) {
+            return null;
+        }
+    }
+ }
+    
\ No newline at end of file

tiku_App/src/test/maxiao.java

-package test;
-
-import static io.restassured.http.ContentType.JSON;
-
-import java.util.List;
-
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.restassured.http.Header;
-import io.restassured.http.Headers;
-import io.restassured.response.Response;
-
-public class maxiao implements Runnable{
-	public  String JSESSIONID;
-	public  String StatusCode;
-	public  String time;
-	
-	
-	public maxiao(String jSESSIONID) {
-		JSESSIONID = jSESSIONID;
-	}
-
-	@Override
-	public void run() {
-//		RestAssured ra_VerifyCode = new RestAssured();
-//		ra_VerifyCode.baseURI = "http://10.10.197.245";
-//		ra_VerifyCode.port = 8888;
-//		ra_VerifyCode.basePath = "/puhui-lend-pre/page/lendRepay/repayList.jsp";
-//		
-//		Long start=System.currentTimeMillis();
-//		Response re2 = ra_VerifyCode.given().given().
-//					headers("Cookie", JSESSIONID,
-//						"Referer","http://10.10.197.245:8888/puhui-lend-pre/main",
-//						"Upgrade-Insecure-Requests","1"
-//						).get();
-//		Long end=System.currentTimeMillis();
-//		
-//		time=(end-start)+"";
-//		System.out.println();
-//		StatusCode=re2.getStatusCode()+"";
-//		System.out.println(re2.getBody().asString());
-//		System.out.print("名称:"+Thread.currentThread().getName()+"状态："+re2.getStatusCode()+"耗时:"+time+"毫秒");
-		RestAssured ra_VerifyCode = new RestAssured();
-		ra_VerifyCode.baseURI = "http://10.10.197.245";
-		ra_VerifyCode.port = 8888;
-		ra_VerifyCode.basePath = "/puhui-lend-pre/lendRepay/list ";
-		
-		String Parameter="{\"billDate\":\"2016-12-25\",\"page\":1,\"rows\":20}";
-		System.out.println(Parameter);
-		
-		Long start=System.currentTimeMillis();
-		Response re2 = ra_VerifyCode.given().given().contentType(JSON).
-					headers("Cookie", "JSESSIONID=17E32712D50602F82C30A29E827343E6",
-						"Referer"," http://10.10.197.245:8888/puhui-lend-pre/page/lendRepay/repayList.jsp",
-						"Origin","http://10.10.197.245:8888"
-						).body(Parameter).when().post();
-		Long end=System.currentTimeMillis();
-		time=(end-start)+"";
-		System.out.println(re2.getBody().asString());
-		System.out.print("名称:"+Thread.currentThread().getName()+"状态："+re2.getStatusCode()+"耗时:"+time+"毫秒");
-	}
-	public static void main(String[] args) {
-		RestAssured ra_VerifyCode = new RestAssured();
-		ra_VerifyCode.baseURI = "http://10.10.197.245";
-		ra_VerifyCode.port = 8888;
-		ra_VerifyCode.basePath = "/puhui-lend-pre/lendRepay/list";
-		
-		String Parameter="{\"billDate\":\"2016-12-25\",\"page\":1,\"rows\":20}";
-		System.out.println(Parameter);
-		
-		Long start=System.currentTimeMillis();
-		Response re2 = ra_VerifyCode.given().given().contentType(ContentType.URLENC).
-					headers("Cookie", "JSESSIONID=17E32712D50602F82C30A29E827343E6",
-						"Referer"," http://10.10.197.245:8888/puhui-lend-pre/page/lendRepay/repayList.jsp",
-						"Origin","http://10.10.197.245:8888"
-						).body("billDate=2016-12-25&page=1&rows=20").when().post();
-		Long end=System.currentTimeMillis();
-		System.out.println(re2.getBody().asString());
-		System.out.print("名称:"+Thread.currentThread().getName()+"状态："+re2.getStatusCode()+"耗时:毫秒");
-	}		
-}