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

tiku_App/src/com/offcn/api/tk/app3/getUserIdBySsoI.java → tiku_App/src/com/offcn/api/tk/app3/addExaminePosition.java

@@ -30,38 +30,35 @@ import net.sf.json.JSONObject;
 
 
 /**
- * .IIP获取user_id及token接口
+ * 86、添加估分职位
  * 
- * @author lyy
+ * @author puhui
  *
  */
-public class getUserIdBySsoI extends TK implements API {
+public class addExaminePosition extends TK implements API {
 	public String parameter;//参数集合
 	
-	public String sso_id;//用户id
-	public String phone;//用户手机号
-	public String code;//手机验证码
-	public String login_type;//第三方登录方式
+	public String user_id;//用户id
+	public String item_id;//考试项目id
+	public String question_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_get(parameter, "user_id").trim();
 		
-		sso_id = MapUtil.getParameter(parameter, "sso_id").trim();
-	
-
-		if ((!sso_id.equals("")) && sso_id.equals("code")) {
-			sso_id="3620016";
-			parameter = parameter.replace("\"sso_id\":code", "\"sso_id\":\""+ sso_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;
 	}
@@ -69,8 +66,7 @@ public class getUserIdBySsoI extends TK implements API {
 	@Override
 	public Response SendRequest(HashMap<String, Object> data, String Url,
 			String Request) {
-		//Response re = RequestDataUtils.Post_token(data, Url,tk_token);
-		Response re = RequestDataUtils.Post_NOToken(data, Url);
+		Response re = RequestDataUtils.Get_token_all(data, Url, tk_token);
 		return re;
 	}
 
@@ -80,7 +76,7 @@ public class getUserIdBySsoI extends TK implements API {
 		boolean result = true;
 		String failReason = "";
 
-		String json = re.asString();
+		String json = StringUtils.decodeUnicode(re.asString());
 
 		if ((data.get("statusCode") != null)
 				&& (!data.get("statusCode").toString()
@@ -93,8 +89,9 @@ public class getUserIdBySsoI extends TK implements API {
 
 		if (json.length() != 0) {
 			
-			String msg=StringUtils.decodeUnicode(getMsg(re));
-			String code=getCode(re);
+			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;
@@ -110,46 +107,33 @@ public class getUserIdBySsoI extends TK implements API {
 						+ jp.getString("msg") + ".";
 			}
 			
-			if(data.get("custom") != null && jp.getString("data")!=null){
-				String custom=data.get("custom").toString();
-				String[] ArrayString=StringUtils.getArrayString(custom,",");
-				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(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("0".equals(code)){
-				
-					
-				
-				String token=jp.getString("data.token");
-				tk_token = MapUtil.killQuotes(token, "\"");//保存token
-				System.out.println("tk_token=====" + tk_token);
-				//是否验证数据库
-				if (!isProduct) {
-					
-									
-//							if(phone.length()<60){
-//								if(!(dataPhone.equals(act_phone) && (dataPhone.equals(phone)))){
-//									result = result && false;
-//									failReason = failReason + "t_user info phone is not in DB;";
-//								}
-//							}
-//							
-//							if(login_type.length()<60){
-//								if(!(datalogin_type.equals(act_login_type) && (datalogin_type.equals(login_type)))){
-//									result = result && false;
-//									failReason = failReason + "t_user info system is not in DB;";
-//								}
-//							}
-						}
-						
-					} 
-				}
+			if("接口响应成功！".equals(msg)){
 			
+			}
+		}
 		if (result)
 			return "Pass";
 		else

tiku_App/src/com/offcn/api/tk/app3/deleteNote.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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 67.删除题本中的题目
+ * 
+ * @author puhui
+ *
+ */
+public class deleteNote extends TK implements API {
+public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_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();
+		item_id = MapUtil.getParameter(parameter, "item_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 ((!item_id.equals("")) && item_id.equals("code")) {
+			item_id=item_id_L;
+			parameter = parameter.replace("\"item_id\":code", "\"item_id\":\""+ item_id + "\"");
+		}
+		if ((!id.equals("")) && id.equals("code")) {
+			id="629";
+			parameter = parameter.replace("\"id\":code", "\"id\":\""+ id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		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)){
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/deleteNoteFromQuestion.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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 65-2.在做题的时候删除：
+ * 
+ * @author puhui
+ *
+ */
+public class deleteNoteFromQuestion extends TK implements API {
+public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_id;//考试项目id
+	public String question_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();
+		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+		question_id = MapUtil.getParameter(parameter, "question_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 ((!item_id.equals("")) && item_id.equals("code")) {
+			item_id=item_id_L;
+			parameter = parameter.replace("\"item_id\":code", "\"item_id\":\""+ item_id + "\"");
+		}
+		if ((!question_id.equals("")) && question_id.equals("code")) {
+			question_id=question_id_L;
+			parameter = parameter.replace("\"question_id\":code", "\"question_id\":\""+ question_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		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)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getEstimateInfo.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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 85、获取估分考试
+ * 
+ * @author puhui
+ *
+ */
+public class getEstimateInfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试项目id
+	public String question_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_get(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter_get(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 );
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Get_token_all(data, Url, tk_token);
+		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)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getEstimatePaperJson.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.MyDateUtil;
+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.BasicsGM;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 89.增加获取估分试卷json url和做题记录的接口
+ * 
+ * 返回 recordId
+ *
+ */
+public class getEstimatePaperJson extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String paper_id;//
+	public String record_id;//
+	public String examine_paper_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();
+		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		examine_paper_id = MapUtil.getParameter(parameter, "examine_paper_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 ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id=paper_id_L;
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		if ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id=record_id_L;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
+		}
+		if ((!examine_paper_id.equals("")) && examine_paper_id.equals("code")) {
+			examine_paper_id=examine_paper_id_L;//查询examine_paper表，examine_paper_id列，并且examine_id列存在
+			parameter = parameter.replace("\"examine_paper_id\":code", "\"examine_paper_id\":\""+ examine_paper_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		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)){
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getMyNotebookByCate.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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 63.我的题本（分类）接口
+ * 
+ * @author puhui
+ *
+ */
+public class getMyNotebookByCate extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_id;//考试项目id
+	public String subtype_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();
+		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+		subtype_id = MapUtil.getParameter(parameter, "subtype_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 ((!item_id.equals("")) && item_id.equals("code")) {
+			item_id="88";
+			parameter = parameter.replace("\"item_id\":code", "\"item_id\":\""+ item_id + "\"");
+		}
+		if ((!subtype_id.equals("")) && subtype_id.equals("code")) {
+			subtype_id="3";
+			parameter = parameter.replace("\"subtype_id\":code", "\"subtype_id\":\""+ subtype_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		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)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getMyNotebookByCateId.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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 69.我的题本中根据分类id拿取对应题目
+ * 
+ * @author puhui
+ *
+ */
+public class getMyNotebookByCateId extends TK implements API {
+public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_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();
+		item_id = MapUtil.getParameter(parameter, "item_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 ((!item_id.equals("")) && item_id.equals("code")) {
+			item_id=item_id_L;
+			parameter = parameter.replace("\"item_id\":code", "\"item_id\":\""+ item_id + "\"");
+		}
+		if ((!id.equals("")) && id.equals("code")) {
+			id=question_id_L;
+			parameter = parameter.replace("\"id\":code", "\"id\":\""+ id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		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)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getMyNotebookByTime.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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 64.我的题本（时间）接口
+ * 
+ * @author puhui
+ *
+ */
+public class getMyNotebookByTime extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_id;//考试项目id
+	public String subtype_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();
+		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+		subtype_id = MapUtil.getParameter(parameter, "subtype_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 ((!item_id.equals("")) && item_id.equals("code")) {
+			item_id="88";
+			parameter = parameter.replace("\"item_id\":code", "\"item_id\":\""+ item_id + "\"");
+		}
+		if ((!subtype_id.equals("")) && subtype_id.equals("code")) {
+			subtype_id="3";
+			parameter = parameter.replace("\"subtype_id\":code", "\"subtype_id\":\""+ subtype_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		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)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.io.File;
+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.TestUnti.aliOCR;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 100.图片搜题
+ * 
+ * @author puhui
+ *
+ */
+public class searchQuestionDetailByImage extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_id;//考试项目id
+	public String question_id;//练习册类别id
+	public String image;//图片
+
+	@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();
+		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+		question_id = MapUtil.getParameter(parameter, "question_id").trim();
+		image = MapUtil.getParameter(parameter, "image").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 ((!item_id.equals("")) && item_id.equals("code")) {
+			item_id="88";
+			parameter = parameter.replace("\"item_id\":code", "\"item_id\":\""+ item_id + "\"");
+		}
+		if ((!question_id.equals("")) && question_id.equals("code")) {
+			question_id=question_id_L;
+			parameter = parameter.replace("\"question_id\":code", "\"question_id\":\""+ question_id + "\"");
+		}
+		if ((!image.equals("")) && image.equals("code")) {
+			image=aliOCR.encodeImgageToBase64(new File("out/tiku1.jpg"));
+			parameter = parameter.replace("\"image\":code", "\"image\":\""+ image + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		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)){
+				image_id_L=jp.getString("data.image_id");
+				image_id_L=image_id_L.substring(1, image_id_L.length()-1);
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}