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

tiku_App/src/com/offcn/api/tk/app3/cancelSign.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;
+
+
+
+/**
+ * 44.取消标记
+ * 
+ * @author puhui
+ *
+ */
+public class cancelSign 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("retcode") + ".";
+			}
+
+			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("retcode") + ".";
+			}
+			
+			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/changeObj.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;
+
+
+
+/**
+ * 84.模考大赛--切换比较对象
+ * 
+ * @author puhui
+ *
+ */
+public class changeObj 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="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 + "\"");
+		}
+		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/checkSubmit.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;
+
+
+
+/**
+ * 76.获取试卷的做题记录是否处理完毕状态
+ * 
+ * 返回 recordId
+ *
+ */
+public class checkSubmit extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String record_id;//
+	public String question_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
+		}
+		try {
+			Thread.sleep(15000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		question_id = MapUtil.getParameter(parameter, "question_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 ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id=record_id_L;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_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 ((!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/checkUrl.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;
+
+
+
+/**
+ * 70.二维码扫描，URL校验接口
+ * 
+ * @author puhui
+ *
+ */
+public class checkUrl extends TK implements API {
+public String parameter;//参数集合
+	
+	public String userId;//用户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);
+		userId = MapUtil.getParameter(parameter, "userId").trim();
+		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+		id = MapUtil.getParameter(parameter, "id").trim();
+		
+		if ((!userId.equals("")) && userId.equals("code")) {
+			userId=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"userId\":code", "\"userId\":\""+ userId + "\"");
+		}
+		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/expoundingSubmitPaper.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;
+
+
+
+/**
+ * 111.App申论试卷交卷接口
+ * 
+ * @author puhui
+ *
+ */
+public class expoundingSubmitPaper extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String record_id;//练习册类别id
+	public String paper_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();
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		paper_id = MapUtil.getParameter(parameter, "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 ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id=record_id_L;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
+		}
+		if ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id=paper_id_L;
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ 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/getAbilitys.java → tiku_App/src/com/offcn/api/tk/app3/getAllRealPaperList.java

@@ -30,18 +30,17 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 48.数据报告----能力图谱接口
+ * 114.App获取全部真题试卷的列表页
  * 
  * @author puhui
  *
  */
-public class getAbilitys extends TK implements API {
+public class getAllRealPaperList extends TK implements API {
 	public String parameter;//参数集合
 	
 	public String user_id;//用户id
-	public String exam_id;//考试id
-	public String is_position;//是否通过职位信息对比
-	public String user_position_id;//用户职位信息id
+	public String exam_id;//考试项目id
+	public String all_type;//练习册类别id
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
@@ -56,20 +55,19 @@ public class getAbilitys extends TK implements API {
 		parameter = MapUtil.getValue("parameter", data);
 		user_id = MapUtil.getParameter(parameter, "user_id").trim();
 		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
-		is_position = MapUtil.getParameter(parameter, "is_position").trim();
-		user_position_id = MapUtil.getParameter(parameter, "user_position_id").trim();
+		all_type = MapUtil.getParameter(parameter, "all_type").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;
+			exam_id="88";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
-		if ((!user_position_id.equals("")) && user_position_id.equals("code")) {
-			user_position_id=L_position_id;
-			parameter = parameter.replace("\"user_position_id\":code", "\"user_position_id\":\""+ user_position_id + "\"");
+		if ((!all_type.equals("")) && all_type.equals("code")) {
+			all_type="1";
+			parameter = parameter.replace("\"all_type\":code", "\"all_type\":\""+ all_type + "\"");
 		}
 		data.put("parameter", parameter);
 		return data;

tiku_App/src/com/offcn/api/tk/app3/getExamPaperNav.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;
+
+
+
+/**
+ * 
+ * @Description:   41.真题试卷-获取考试下试卷tab结构信息接口
+ * @author: wff    
+ * @date: 2019年6月26日 下午4:47:07   
+ * @version V1.0
+ */
+public class getExamPaperNav 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) {
+		parameter = MapUtil.getValue("parameter", data);
+		String sign = MapUtil.getParameter(parameter, "sign").trim();
+		exam_id = MapUtil.killQuotes(exam_id, "\"");//去掉双引号的education
+		
+		Map<String,String> m=new HashMap<String,String>();
+		m.put("exam_id", exam_id);
+		m.put("appid","tiku");
+		m.put("sign", sign);
+		
+		Response re = RequestDataUtils.post_form_data(data,tk_token, Url,m);
+//		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)){
+				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_tab_id=jp.getString("data["+i+"].id");
+					}
+					
+				}
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

@@ -58,7 +58,7 @@ public class getExpoundingPaperBlocks extends TK implements API {
 			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 		}	
 		if ((!paper_id.equals("")) && paper_id.equals("code")) {
-			paper_id = "4321";
+			paper_id = paper_id_L;
 			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
 		}
 		if ((!exam_id.equals("")) && exam_id.equals("code")) {

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

@@ -61,15 +61,18 @@ public class getExpoundingStepExplain extends TK implements API {
 			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 		}
 		if ((!record_id.equals("")) && record_id.equals("code")) {
-			record_id = nwn_record_id;
+			record_id = L_record_sub_id;
+//			record_id = "1";
 			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
 		}
 		if ((!exam_id.equals("")) && exam_id.equals("code")) {
 			exam_id = L_exam_id;
+//			exam_id = "1";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
 		if ((!origin_id.equals("")) && origin_id.equals("code")) {
 			origin_id = paper_id_L;
+//			origin_id = "1";
 			parameter = parameter.replace("\"origin_id\":code", "\"origin_id\":\""+ origin_id + "\"");
 		}
 		data.put("parameter", parameter);

tiku_App/src/com/offcn/api/tk/app3/getMockInfo.java → tiku_App/src/com/offcn/api/tk/app3/getMockPastList.java

@@ -30,18 +30,18 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 45.数据报告----模考追踪
+ * 73. 往期模考--全部=======
  * 
  * @author puhui
  *
  */
-public class getMockInfo extends TK implements API {
+public class getMockPastList extends TK implements API {
 	public String parameter;//参数集合
 	
 	public String user_id;//用户id
-	public String exam_id;//考试id
-	public String is_position;//是否通过职位信息对比
-	public String user_position_id;//用户职位id
+	public String exam_id;//考试项目id
+	public String page;//用户id
+	public String pagesize;//考试项目id
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
@@ -56,21 +56,15 @@ public class getMockInfo extends TK implements API {
 		parameter = MapUtil.getValue("parameter", data);
 		user_id = MapUtil.getParameter(parameter, "user_id").trim();
 		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
-		is_position = MapUtil.getParameter(parameter, "is_position").trim();
-		user_position_id = MapUtil.getParameter(parameter, "user_position_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;
+			exam_id="54";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
-		if ((!user_position_id.equals("")) && user_position_id.equals("code")) {
-			user_position_id=L_position_id;
-			parameter = parameter.replace("\"user_position_id\":code", "\"user_position_id\":\""+ user_position_id + "\"");
-		}
 		data.put("parameter", parameter);
 		return data;
 	}
@@ -109,14 +103,14 @@ public class getMockInfo extends TK implements API {
 				result = result && false;
 				failReason = failReason + "code is expected "
 						+ data.get("code").toString() + " but actually "
-						+ jp.getString("code") + ".";
+						+ jp.getString("retcode") + ".";
 			}
 
 			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") + ".";
+						+ jp.getString("retcode") + ".";
 			}
 			
 			if(data.get("custom") != null && json!=null){
@@ -142,7 +136,7 @@ public class getMockInfo extends TK implements API {
 				}
 			}
 			
-			if("接口响应成功！".equals(msg)){
+			if("0".equals(code)){
 				
 			}
 		}

tiku_App/src/com/offcn/api/tk/app3/getNormalPaperRecordid.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;
+
+
+
+/**
+ * 61-1.App获取真题试卷做题记录id接口
+ * 
+ * @author puhui
+ *
+ */
+public class getNormalPaperRecordid extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String orgin_id;//考试项目id
+	public String channel;//练习册类别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();
+		orgin_id = MapUtil.getParameter(parameter, "orgin_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").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 ((!orgin_id.equals("")) && orgin_id.equals("code")) {
+			orgin_id="88";
+			parameter = parameter.replace("\"orgin_id\":code", "\"orgin_id\":\""+ orgin_id + "\"");
+		}
+		if ((!channel.equals("")) && channel.equals("code")) {
+			channel="3";
+			parameter = parameter.replace("\"channel\":code", "\"channel\":\""+ channel + "\"");
+		}
+		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/getPaperQuestionsByQR.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;
+
+
+
+/**
+ * 87. 模考-扫描二维码获取试题信息
+ * 
+ * @author puhui
+ *
+ */
+public class getPaperQuestionsByQR extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String paper_id;//用户id
+	public String mock_subject_id;//考试项目id
+	public String is_return;//考试项目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();
+		mock_subject_id = MapUtil.getParameter(parameter, "mock_subject_id").trim();
+		is_return = MapUtil.getParameter(parameter, "is_return").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="2";
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		if ((!mock_subject_id.equals("")) && mock_subject_id.equals("code")) {
+			mock_subject_id="800";
+			parameter = parameter.replace("\"mock_subject_id\":code", "\"mock_subject_id\":\""+ mock_subject_id + "\"");
+		}
+		if ((!is_return.equals("")) && is_return.equals("code")) {
+			is_return="1";
+			parameter = parameter.replace("\"is_return\":code", "\"is_return\":\""+ is_return + "\"");
+		}
+		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);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setHeaders(headers);
+		myRequest.setRequest(Request);
+		myRequest.setUrl(Url);
+		myRequest.setParameter(parameter);
+		
+		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("retcode") + ".";
+			}
+
+			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("retcode") + ".";
+			}
+			
+			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)){
+				
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

@@ -40,6 +40,8 @@ import net.sf.json.JSONObject;
 public class getPaperStatusNwn extends TK implements API {
 	public String parameter;//参数集合
 
+	public String record_id_excel;//试卷使用记录id
+
 	public String record_id;//试卷使用记录id
 	public String status;//试卷状态（默认值：0）
 
@@ -48,17 +50,33 @@ public class getPaperStatusNwn extends TK implements API {
 		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
 			cleanUser_FromDB();//清除注册用户根据user_id
 		}
+
+		try {
+			String sql = "SELECT use_id FROM `t_paper_use_record` WHERE  is_statis = 2 AND is_done =1 AND is_release =0 AND channel <>1 LIMIT 1";
+			ResultSet rs_bankcard = this.sqlFromDB(sql);
+
+			rs_bankcard.last();
+				
+			record_id =rs_bankcard.getString("use_id");	
+					
+		} catch (Exception e) {
+			
+			e.printStackTrace();
+		}
+
+
 	}
 
 	@Override
 	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
-		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		record_id_excel = MapUtil.getParameter(parameter, "record_id").trim();
 		status = MapUtil.getParameter(parameter, "status").trim();
 		
-		if ((!record_id.equals("")) && record_id.equals("code")) {
-			record_id= nwn_record_id;
+
+		if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) {
+			
 			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
 		}
 		data.put("parameter", parameter);

tiku_App/src/com/offcn/api/tk/app3/positioninfo.java → tiku_App/src/com/offcn/api/tk/app3/getPracticeExerRecord.java

@@ -30,19 +30,17 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 82.用户报考职位信息保存
+ * 102.获取我的-做题记录中的练习记录详情的接口
  * 
  * @author puhui
  *
  */
-public class positioninfo extends TK implements API {
+public class getPracticeExerRecord extends TK implements API {
 	public String parameter;//参数集合
 	
 	public String user_id;//用户id
-	public String exam_id;//考试id
-	public String office_id;//招录机关id
-	public String department_id;//用人司局id
-	public String position_id;//报考职位id
+	public String item_id;//考试项目id
+	public String question_id;//练习册类别id
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
@@ -56,30 +54,20 @@ public class positioninfo extends TK implements API {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
 		user_id = MapUtil.getParameter(parameter, "user_id").trim();
-		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
-		office_id = MapUtil.getParameter(parameter, "office_id").trim();
-		department_id = MapUtil.getParameter(parameter, "department_id").trim();
-		position_id = MapUtil.getParameter(parameter, "position_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 ((!exam_id.equals("")) && exam_id.equals("code")) {
-			exam_id=L_exam_id;
-			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		if ((!item_id.equals("")) && item_id.equals("code")) {
+			item_id="88";
+			parameter = parameter.replace("\"item_id\":code", "\"item_id\":\""+ item_id + "\"");
 		}
-		if ((!office_id.equals("")) && office_id.equals("code")) {
-			office_id=L_office_id;
-			parameter = parameter.replace("\"office_id\":code", "\"office_id\":\""+ office_id + "\"");
-		}
-		if ((!department_id.equals("")) && department_id.equals("code")) {
-			department_id=L_department_id;
-			parameter = parameter.replace("\"department_id\":code", "\"department_id\":\""+ department_id + "\"");
-		}
-		if ((!position_id.equals("")) && position_id.equals("code")) {
-			position_id=L_position_id;
-			parameter = parameter.replace("\"position_id\":code", "\"position_id\":\""+ position_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;
@@ -109,6 +97,7 @@ public class positioninfo extends TK implements API {
 					+ String.valueOf(re.getStatusCode()) + ". ";
 		}
 
+		
 		if (json.length() != 0) {
 			
 			String msg=jp.getString("message");
@@ -152,10 +141,7 @@ public class positioninfo extends TK implements API {
 				}
 			}
 			
-			if("数据库添加成功".equals(msg)){
-				position_id = MapUtil.killQuotes(position_id, "\"");
-				L_position_id=position_id;
-			
+			if("接口响应成功！".equals(msg)){
 			}
 		}
 		if (result)

tiku_App/src/com/offcn/api/tk/app3/getSubjectiveAnalysis.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;
+
+
+
+/**
+ * 92.主观题获取解析的接口
+ * 
+ * 返回 recordId
+ *
+ */
+public class getSubjectiveAnalysis 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/getUserIdBySsoId.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;
+
+
+
+/**
+ * .IIP获取user_id及token接口
+ * 
+ * @author lyy
+ *
+ */
+public class getUserIdBySsoId extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String sso_id;//用户id
+	public String phone;//用户手机号
+	public String code;//手机验证码
+	public String login_type;//第三方登录方式
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		
+		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 + "\"");
+		}
+		
+				
+		
+		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);
+		Response re = RequestDataUtils.Post_NOToken(data, Url);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = 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=StringUtils.decodeUnicode(getMsg(re));
+			String code=getCode(re);
+			
+			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,",");
+				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(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 (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getUserMock.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;
+
+
+
+/**
+ * 74. 往期模考--已参加=========
+ * 
+ * @author puhui
+ *
+ */
+public class getUserMock extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试项目id
+	public String page;//用户id
+	public String pagesize;//考试项目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 + "\"");
+		}
+		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);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setHeaders(headers);
+		myRequest.setRequest(Request);
+		myRequest.setUrl(Url);
+		myRequest.setParameter(parameter);
+		
+		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("retcode") + ".";
+			}
+
+			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("retcode") + ".";
+			}
+			
+			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)){
+				
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getGrowths.java → tiku_App/src/com/offcn/api/tk/app3/getWrongQuestion.java

@@ -30,18 +30,20 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 54.数据报告----成长轨迹接口
+ * 55.解析接口（包括错误解析及我的题本解析）
  * 
  * @author puhui
  *
  */
-public class getGrowths extends TK implements API {
+public class getWrongQuestion extends TK implements API {
 	public String parameter;//参数集合
 	
 	public String user_id;//用户id
-	public String exam_id;//考试id
-	public String is_position;//是否通过职位信息对比
-	public String user_position_id;//用户职位信息id
+	public String item_id;//考试id（channel=1时，必须传，channel=2时，可不传或传空值）
+	public String questionIds;//试题的id（可传入多个，规则是  逗号 隔开的字符串）
+	public String record_id;//练习册类别id
+	public String origin;//来源id
+	public String channel;//做题平台来源，1：题库（默认值，可不传），2：NWN
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
@@ -55,21 +57,20 @@ public class getGrowths extends TK implements API {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
 		user_id = MapUtil.getParameter(parameter, "user_id").trim();
-		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
-		is_position = MapUtil.getParameter(parameter, "is_position").trim();
-		user_position_id = MapUtil.getParameter(parameter, "user_position_id").trim();
+		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+		record_id = MapUtil.getParameter(parameter, "record_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 + "\"");
+			parameter = parameter.replace("\"user_id\":code", "\"userId\":\""+ 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 + "\"");
+		if ((!item_id.equals("") && item_id.equals("code"))) {
+			item_id="1";
+			parameter = parameter.replace("\"item_id\":code", "\"itemId\":\""+ item_id + "\"");
 		}
-		if ((!user_position_id.equals("")) && user_position_id.equals("code")) {
-			user_position_id=L_position_id;
-			parameter = parameter.replace("\"user_position_id\":code", "\"user_position_id\":\""+ user_position_id + "\"");
+		if ((!record_id.equals("") && record_id.equals("code"))) {
+			record_id="11";
+			parameter = parameter.replace("\"record_id\":code", "\"recordId\":\""+ record_id + "\"");
 		}
 		data.put("parameter", parameter);
 		return data;

tiku_App/src/com/offcn/api/tk/app3/getWrongRecordList.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;
+
+
+
+/**
+ * 101.获取我的-做题记录中的错题列表接口
+ * 
+ * @author puhui
+ *
+ */
+public class getWrongRecordList 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="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 + "\"");
+		}
+		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/isJoin.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 isJoin 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/releaseScoreToStudent.java

@@ -40,6 +40,8 @@ import net.sf.json.JSONObject;
 public class releaseScoreToStudent extends TK implements API {
 	public String parameter;//参数集合
 
+	public String record_id_excel;//试卷使用记录id
+
 	public String record_id;//试卷使用记录id
 	
 	
@@ -48,17 +50,32 @@ public class releaseScoreToStudent extends TK implements API {
 		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
 			cleanUser_FromDB();//清除注册用户根据user_id
 		}
+
+		
+		try {
+			String sql = "SELECT use_id FROM `t_paper_use_record` WHERE  is_statis = 2 AND is_done =1 AND is_release =0 AND channel <>1 LIMIT 1";
+			ResultSet rs_bankcard = this.sqlFromDB(sql);
+
+			rs_bankcard.last();
+			
+				
+			record_id =rs_bankcard.getString("use_id");	
+					
+		} catch (Exception e) {
+			
+			e.printStackTrace();
+		}
+
 	}
 
 	@Override
 	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
+		record_id_excel = MapUtil.getParameter(parameter, "record_id").trim();
 		
-		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) {
 		
-		if ((!record_id.equals("")) && record_id.equals("code")) {
-			record_id= nwn_record_id;
 			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
 		}
 		data.put("parameter", parameter);

tiku_App/src/com/offcn/api/tk/app3/submitEstimateRecord.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;
+
+
+
+/**
+ * 90.提交主观题估分记录的接口
+ * 
+ * @author puhui
+ *
+ */
+public class submitEstimateRecord extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_id;//考试项目id
+	public String orgin_id;//试卷id
+	public String record_id;//做题记录id
+	public String data_ex;//data_ex
+
+	@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, "data").trim();
+//		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+//		question_id = MapUtil.getParameter(parameter, "question_id").trim();
+		
+		data_ex="{\"user_id\": code,\"examine_id\":43,\"examine_paper_id\":54,\"record_id\":6,\"questions\":[{\"question_id\":1,\"question_number\":1,\"user_score\":15,\"question_score\":20},{\"question_id\":2,\"question_number\":2,\"user_score\":15,\"question_score\":20},{\"question_id\":3,\"question_number\":3,\"user_score\":15,\"question_score\":20},{\"question_id\":5,\"question_number\":4,\"user_score\":15,\"question_score\":20},{\"question_id\":6,\"question_number\":5,\"user_score\":15,\"question_score\":20}]}";
+		
+		if (data_ex.contains("\"user_id\": code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = data_ex.replace("\"user_id\": code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if (data_ex.contains("\"orgin_id\": code")) {
+			orgin_id=paper_id_L;
+			parameter = data_ex.replace("\"orgin_id\": code", "\"orgin_id\":\""+ orgin_id + "\"");
+		}
+		if (data_ex.contains("\"record_id\": code")) {
+			record_id=question_id_L;
+			parameter = data_ex.replace("\"record_id\": code", "\"record_id\":\""+ record_id + "\"");
+		}
+		data.put("parameter", "\"data\":"+parameter+",\"appid\":\"tiku\"");
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		String parameter1 = MapUtil.getValue("parameter", data);
+		Map<String,String> m=new HashMap<String,String>();
+		m.put("data", parameter);
+		m.put("appid", "tiku");
+		m.put("sign", GetSignValue(parameter1));
+		
+		Response re = RequestDataUtils.post_form_data(data,tk_token, Url,m);
+//		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/submitExpoundingExercise.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;
+
+
+
+/**
+ * 113.申论试卷提交做题信息接口
+ * 
+ * @author puhui
+ *
+ */
+public class submitExpoundingExercise extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_id;//用户id
+	public String orgin;//用户id
+	public String orgin_id;//用户id
+	public String record_id;//用户id
+	public String data1;//练习册类别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();
+		data1 = MapUtil.getParameter(parameter, "data").trim();
+		
+		if ((!data1.equals("")) && data1.equals("code")) {
+			data1="\"channel\": 1,\"user_id\":code,\"item_id\":code,\"orgin\":code,\"orgin_id\":code,\"record_id\":code,\"questions\":[{\"question_id\": 97835,\"question_number\": 1,\"is_hf\": 0,\"user_answer\": \"\",\"duration\": 30,\"is_signed\": 0,\"type\": 1 }]";
+			
+			user_id=ListUtil.getListValue(user_idList,0);
+			data1 = data1.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+			data1 = data1.replace("\"item_id\":code", "\"item_id\":\""+ item_id_L + "\"");
+			data1 = data1.replace("\"orgin\":code", "\"orgin\":\""+ 1 + "\"");
+			data1 = data1.replace("\"orgin_id\":code", "\"orgin_id\":\""+ paper_id_L + "\"");
+			data1 = data1.replace("\"record_id\":code", "\"record_id\":\""+ recordId_L + "\"");
+			
+			parameter = parameter.replace("\"data\":code", "\"data\":{"+ data1 +"}");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		parameter = MapUtil.getValue("parameter", data);
+		String sign = MapUtil.getParameter(parameter, "sign").trim();
+		
+		Map<String,String> m=new HashMap<String,String>();
+		m.put("data", "{"+data1+"}");
+		m.put("appid","tiku");
+		m.put("sign", sign);
+		
+		Response re = RequestDataUtils.post_form_data(data,tk_token, Url,m);
+//		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/submitMockExpounding.java

@@ -23,6 +23,7 @@ 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;
@@ -53,15 +54,15 @@ public class submitMockExpounding extends TK implements API {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
 		user_id = MapUtil.getParameter(parameter, "user_id").trim();
-		parameterData = MapUtil.getParameter(parameter, "parameterData").trim();
+		parameterData = MapUtil.getParameter(parameter, "data").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 ((!parameterData.equals("")) && parameterData.equals("code")) {
-			parameterData="{\\\"channel\\\":\\\"1\\\",\\\"orgin\\\":\\\"3\\\",\\\"orgin_id\\\":\\\"4362\\\",\\\"record_id\\\":\\\"458\\\",\\\"is_final\\\":\\\"1\\\",\\\"user_id\\\":\\\"11292\\\",\\\"questions\\\":[{\\\"question_number\\\":\\\"1\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"作为中国城镇化推进过程中的一个实验性物种，特色小镇外溢出了不小的经济价值。\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"31\\\",\\\"question_id\\\":\\\"109015\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"2\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"南有周庄，北有周窝\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"71\\\",\\\"question_id\\\":\\\"109016\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"3\\\",\\\"user_answer\\\":[],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"999\\\",\\\"question_id\\\":\\\"109017\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"4\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"呵呵就不给机会\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"23\\\",\\\"question_id\\\":\\\"109018\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"}],\\\"exam_id\\\":\\\"51\\\"}";
-			parameter = parameter.replace("\"parameterData\":code", "\"data\":\""+ parameterData+"\"" );
+			parameterData="{\\\"channel\\\":\\\"1\\\",\\\"orgin\\\":\\\"3\\\",\\\"orgin_id\\\":\\\"4362\\\",\\\"record_id\\\":\\\"458\\\",\\\"is_final\\\":\\\"1\\\",\\\"user_id\\\":"+ListUtil.getListValue(user_idList,0)+",\\\"questions\\\":[{\\\"question_number\\\":\\\"1\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"作为中国城镇化推进过程中的一个实验性物种，特色小镇外溢出了不小的经济价值。\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"31\\\",\\\"question_id\\\":\\\"109015\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"2\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"南有周庄，北有周窝\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"71\\\",\\\"question_id\\\":\\\"109016\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"3\\\",\\\"user_answer\\\":[],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"999\\\",\\\"question_id\\\":\\\"109017\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"4\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"呵呵就不给机会\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"23\\\",\\\"question_id\\\":\\\"109018\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"}],\\\"exam_id\\\":\\\"51\\\"}";
+			parameter = parameter.replace("\"data\":code", "\"data\":\""+ parameterData.replace("\\\"", "")+"\"" );
 		}
 		data.put("parameter", parameter);
 		return data;
@@ -70,6 +71,23 @@ public class submitMockExpounding extends TK implements API {
 	@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("data", parameterData);
+		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);
 		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
 		return re;
 	}

tiku_App/src/com/offcn/api/tk/app3/submitPaperRecord.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;
+
+
+
+/**
+ * 75.用户提交模考和真题试卷和客观题估分做题记录接口优化
+ * 
+ * @author puhui
+ *
+ */
+public class submitPaperRecord extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String item_id;//考试项目id
+	public String orgin_id;//试卷id
+	public String record_id;//做题记录id
+	public String data_ex;//data_ex
+
+	@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, "data").trim();
+//		item_id = MapUtil.getParameter(parameter, "item_id").trim();
+//		question_id = MapUtil.getParameter(parameter, "question_id").trim();
+		
+		data_ex="[{\"channel\": 1,\"user_id\": code,\"is_final\": 1,\"item_id\": 88,\"orgin\": 1,\"orgin_id\": 629,\"upload_time\": 1535606252,\"record_id\": code,\"appid\":\"tiku\",\"questions\": [{\"question_number\": 1,\"question_id\": 29964,\"duration\": 3,\"is_signed\": 1,\"type\": 1,\"user_answer\": 237276}]}]";
+		
+		if (parameter.contains("orgin")) {
+			data_ex = data_ex.replace("\"orgin\": 1", "\"orgin\":"+ 3 );
+		}
+		
+		if (data_ex.contains("\"user_id\": code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = data_ex.replace("\"user_id\": code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if (data_ex.contains("\"record_id\": code")) {
+			parameter = parameter.replace("\"record_id\": code", "\"record_id\":\""+ record_id_L + "\"");
+		}
+		data.put("parameter", "\"data\":"+parameter+",\"appid\":\"tiku\"");
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		String parameter1 = MapUtil.getValue("parameter", data);
+		Map<String,String> m=new HashMap<String,String>();
+		m.put("data", parameter);
+		m.put("appid", "tiku");
+		m.put("sign", GetSignValue(parameter1));
+		
+		Response re = RequestDataUtils.post_form_data(data,tk_token, Url,m);
+//		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/updateConsumeTime.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-1.更新模考用时
+ * 
+ * @author puhui
+ *
+ */
+public class updateConsumeTime extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String recordId;//考试项目id
+	public String consumetime;//练习册类别id
+	public String origin;//1：真题 3：模考
+
+	@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();
+		recordId = MapUtil.getParameter(parameter, "recordId").trim();
+		consumetime = MapUtil.getParameter(parameter, "consumetime").trim();
+		origin = MapUtil.getParameter(parameter, "origin").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 ((!recordId.equals("")) && recordId.equals("code")) {
+			recordId="88";
+			parameter = parameter.replace("\"recordId\":code", "\"recordId\":\""+ recordId + "\"");
+		}
+		if ((!consumetime.equals("")) && consumetime.equals("code")) {
+			consumetime="3";
+			parameter = parameter.replace("\"consumetime\":code", "\"consumetime\":\""+ consumetime + "\"");
+		}
+		if ((!origin.equals("")) && origin.equals("code")) {
+			origin="3";
+			parameter = parameter.replace("\"origin\":code", "\"origin\":\""+ origin + "\"");
+		}
+		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/test/APITest_tk.java

@@ -90,7 +90,7 @@ public class APITest_tk extends BasicsGM{
 	  
 	  //数据回写
 //	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-//	  SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
+//	  SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
 //	  sheet.writeExcel(
 //			  		data.get("NO").toString(),
 //				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),

tiku_App/src/makeTestCase/MakeTestCases.java

@@ -35,7 +35,7 @@ public class MakeTestCases {
 	
 	public static void main(String[] args) {
 
-		make("TestData/CaseMakeWff.xls","Sheet1","post","tk_3");
+		make("TestData/CaseMakeMr.xls","Sheet1","post","tk_3");
 	}
 	
 	
@@ -319,7 +319,7 @@ public class MakeTestCases {
 //		System.out.println(nameList);
 		
 		for(int i=0;i<MakeTestCases.state;i++){
-			List<Set<String>> a=TestCase_N("TestData/CaseMakeWff.xls",SheetList.get(i),nameList.get(i));
+			List<Set<String>> a=TestCase_N("TestData/CaseMakeMr.xls",SheetList.get(i),nameList.get(i));
 			listt.add(a.get(0));
 			listf.add(a.get(1));
 		}	

tiku_App/src/resources/test.properties

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