Merge branch 'master' of

https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git

Conflicts:
	tiku_App/src/com/offcn/api/tk/app3/visitor.java

tiku_App/src/com/offcn/api/tk/app3/addOrEditPhone.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.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+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;
+
+
+
+/**
+ * 用户绑定或修改手机号
+ * 
+ * @author puhui
+ *
+ */
+public class addOrEditPhone extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String phone;//手机
+
+	@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();
+		phone = MapUtil.getParameter(parameter, "phone").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 ((!phone.equals("")) && phone.equals("random")) {
+			phone="1391"+(new Random().nextInt(9000000)+ 1000000);
+			parameter = parameter.replace("\"phone\":random", "\"phone\":\""+ phone + "\"");
+		}
+		
+		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 = 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) {
+			
+//			System.out.println(jp.getString("message"));
+//			String msg=StringUtils.decodeUnicode(getMsg(re));
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				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("接口响应成功！".equals(msg)){
+			
+				phoneNeb=phone;
+				
+				//是否验证数据库
+				if (!isProduct) {
+					
+					try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_user u ",
+								" u.user_id = '" + user_id + "' ");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+							
+							String act_phone=rs_bankcard.getString("phone").equals("null ")?"null":rs_bankcard.getString("phone");
+							
+							parameter = MapUtil.getValue("parameter", data);
+							phone = MapUtil.getParameter(parameter, "phone").trim();
+							phone = MapUtil.killQuotes(phone, "\"");
+							
+							if(phone.length()<60){
+								if(!(phone.equals(act_phone))){
+									result = result && false;
+									failReason = failReason + "t_user info phone is not in DB;";
+								}
+							}
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_user info in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/bindThirdLoginByUserId.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 org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+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;
+
+
+
+/**
+ * 个人中心绑定第三方账号接口
+ * 
+ * @author puhui
+ *
+ */
+public class bindThirdLoginByUserId extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String open_id;//第三方登录openId
+	public String nickname;//昵称
+	public String avatar;//第三方登录用户头像
+	public String union_id;//微信登录的unionId(仅在微信登录时必填)
+	public String login_type;//第三方登录类型（当前登录方式:phone手机登录;weibo微博登录;weixin微信登录;qq腾讯登录）
+	
+	public String user_id;//用户id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		union_id = MapUtil.getParameter(parameter, "union_id").trim();
+		open_id = MapUtil.getParameter(parameter, "open_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		
+		if ((!union_id.equals("")) && union_id.equals("code")) {
+			union_id=union_id_str;
+			parameter = parameter.replace("\"union_id\":code", "\"union_id\":\""+ union_id + "\"");
+		}
+		
+		if ((!open_id.equals("")) && open_id.equals("code")) {
+			open_id=open_id_str;
+			parameter = parameter.replace("\"open_id\":code", "\"open_id\":\""+ open_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 = 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) {
+			
+//			System.out.println(jp.getString("message"));
+//			String msg=StringUtils.decodeUnicode(getMsg(re));
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				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("绑定成功".equals(msg)){
+				
+				//是否验证数据库
+				if (!isProduct) {
+					
+					try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_user u ",
+								" u.user_id = '" + user_id + "' ");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+							
+//							String act_union_id=rs_bankcard.getString("union_id").equals("null ")?"null":rs_bankcard.getString("nickname");;
+							String act_union_id=rs_bankcard.getString("union_id");
+							
+							String act_weibo_id=rs_bankcard.getString("weibo_id");
+							String act_qq_id=rs_bankcard.getString("qq_id");
+							String act_weixin_id=rs_bankcard.getString("weixin_id");
+							
+							String act_weibo_nickname=rs_bankcard.getString("weibo_nickname");
+							String act_qq_nickname=rs_bankcard.getString("qq_nickname");
+							String act_weixin_nickname=rs_bankcard.getString("weixin_nickname");
+							
+							String act_weibo_avatar=rs_bankcard.getString("weibo_avatar");
+							String act_qq_avatar=rs_bankcard.getString("qq_avatar");
+							String act_weixin_avatar=rs_bankcard.getString("weixin_avatar");
+							
+							String act_login_type=rs_bankcard.getString("login_type");
+							
+							String act_open_id="";
+							String act_nickname="";
+							String act_avatar="";
+							if("qq".equals(act_login_type)){
+								act_open_id=act_qq_id;
+								act_nickname=act_qq_nickname;
+								act_avatar=act_qq_avatar;
+							}else if("weibo".equals(act_login_type)){
+								act_open_id=act_weibo_id;
+								act_nickname=act_weibo_nickname;
+								act_avatar=act_weibo_avatar;
+							}else if("weixin".equals(act_login_type)){
+								act_open_id=act_weixin_id;
+								act_nickname=act_weixin_nickname;
+								act_avatar=act_weixin_avatar;
+							}
+							
+//							System.out.println((dataPhone.equals(act_phone)));
+//							System.out.println((dataPhone.equals(phone)));
+							parameter = MapUtil.getValue("parameter", data);
+							union_id = MapUtil.getParameter(parameter, "union_id").trim();
+							union_id = MapUtil.killQuotes(union_id, "\"");
+							
+							open_id = MapUtil.getParameter(parameter, "open_id").trim();
+							open_id = MapUtil.killQuotes(open_id, "\"");
+							
+							nickname = MapUtil.getParameter(parameter, "nickname").trim();
+							nickname = MapUtil.killQuotes(nickname, "\"");
+							
+							login_type = MapUtil.getParameter(parameter, "login_type").trim();
+							login_type = MapUtil.killQuotes(login_type, "\"");
+							
+							avatar = MapUtil.getParameter(parameter, "avatar").trim();
+							avatar = MapUtil.killQuotes(avatar, "\"");
+							
+							if(union_id.length()<60){
+								if(!(union_id.equals(act_union_id))){
+									result = result && false;
+									failReason = failReason + "t_user info  union_id is not in DB;";
+								}
+							}
+							if(login_type.length()<60){
+								if(!(login_type.equals(act_login_type))){
+									result = result && false;
+									failReason = failReason + "t_user info  login_type is not in DB;";
+								}
+							}
+							
+							if(nickname.length()<60){
+								if(!(nickname.equals(act_nickname))){
+									result = result && false;
+									failReason = failReason + "t_user info  nickname is not in DB;";
+								}
+							}
+							
+							
+							if(avatar.length()<60){
+								if(!(avatar.equals(act_avatar))){
+									result = result && false;
+									failReason = failReason + "t_user info  avatar is not in DB;";
+								}
+							}
+							
+							if(open_id.length()<60){
+								if(!(open_id.equals(act_open_id))){
+									result = result && false;
+									failReason = failReason + "t_user info  open_id is not in DB;";
+								}
+							}
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_user info in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/bindUserByPhone.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;
+
+
+
+/**
+ * .第三方登录接口绑定手机号
+ * 
+ * @author puhui
+ *
+ */
+public class bindUserByPhone extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_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);
+		phone = MapUtil.getParameter(parameter, "phone").trim();
+		code = MapUtil.getParameter(parameter, "code").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		login_type = MapUtil.getParameter(parameter, "login_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 ((!phone.equals("")) && phone.equals("code")) {
+			phone=phoneNeb;
+			parameter = parameter.replace("\"phone\":code", "\"phone\":\""+ phone + "\"");
+		}
+		
+		if ((!code.equals("")) && code.equals("code")) {
+			code=phone_code;
+			parameter = parameter.replace("\"code\":code", "\"code\":\""+ code + "\"");
+		}
+		
+		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 = 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("绑定成功".equals(msg)){
+				
+				String dataPhone=jp.getString("data.phone");
+				dataPhone = MapUtil.killQuotes(dataPhone, "\"");
+				
+				String datalogin_type=jp.getString("data.login_type");
+				datalogin_type = MapUtil.killQuotes(datalogin_type, "\"");
+				
+				String token=jp.getString("data.token");
+				tk_token = MapUtil.killQuotes(token, "\"");//保存token
+				
+				//是否验证数据库
+				if (!isProduct) {
+					
+					try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_user u ",
+								" u.user_id = '" + user_id + "' ");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+							phone = MapUtil.killQuotes(phone, "\"");
+							phoneNeb=phone;
+							
+							String act_phone=rs_bankcard.getString("phone").equals("null ")?"null":rs_bankcard.getString("phone");
+							String act_login_type=rs_bankcard.getString("login_type").equals("null ")?"null":rs_bankcard.getString("login_type");
+							
+//							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;";
+//								}
+//							}
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_user info in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+			
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/checkCode.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.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 校验手机验证码
+ * 
+ * @author puhui
+ *
+ */
+public class checkCode extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//用户id
+	public String code;//验证码
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();
+		code = MapUtil.getParameter(parameter, "code").trim();
+
+		
+		if ((!phone.equals("")) && phone.equals("code")) {
+			phone=phoneNeb;
+			parameter = parameter.replace("\"phone\":code", "\"phone\":\""+ phone + "\"");
+		}
+		
+		if ((!code.equals("")) && code.equals("code")) {
+			code=phone_code;
+			parameter = parameter.replace("\"code\":code", "\"code\":\""+ code + "\"");
+		}
+		
+		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 = 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 (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/checkCode_web.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;
+
+
+
+/**
+ * 52、校验验证码
+ * 
+ * @author mr
+ *
+ */
+public class checkCode_web extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//手机号
+	public String code;//手机验证码
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();	
+		code = MapUtil.getParameter(parameter, "code").trim();
+		
+		if ((!phone.equals("")) && phone.equals("code")) {
+			phone = phoneNeb;
+			parameter = parameter.replace("\"phone\":code","\"phone\":\""+phone+"\"");
+		}
+		if ((!code.equals("")) && code.equals("code")) {
+			code = phone_code;	
+			parameter = parameter.replace("\"code\":code","\"code\":\""+code+"\"");
+		}
+
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("phone", phone);
+		jsonAsMap.put("code", code);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+				phone_code=jp.getString("data.code");
+				System.out.println(phone_code);
+
+				//是否验证数据库
+//				if (!isProduct) {
+//					
+//					try {
+//						ResultSet rs_bankcard = this.selectFromDB(
+//								" t_code c ",
+//								" c.phone = '" + phone + "' ");
+//						rs_bankcard.last();
+//						
+//						if(rs_bankcard.getRow()>=1){
+////							code = MapUtil.killQuotes(code, "\"");
+////							phone_code=code;
+//														
+////							parameter = MapUtil.getValue("parameter", data);
+//													
+//							String act_code=rs_bankcard.getString("code");							
+//																										
+//							if(!act_code.equals(phone_code)){
+//								result = result && false;
+//								failReason = failReason + "t_code info  code is not in DB;";
+//							}
+//							
+//						}
+//						
+//					} catch (Exception e) {
+//						result = result && false;
+//						failReason = failReason + "cannot verify t_code info in DB;";
+//						e.printStackTrace();
+//					}
+//				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/checkUserPhoneIfExist.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;
+
+
+
+/**
+ * 73.检测手机号是否已注册
+ * 
+ * @author mr
+ *
+ */
+public class checkUserPhoneIfExist extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//手机号
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();	
+		
+		if ((!phone.equals("")) && phone.equals("code")) {
+			phone = phoneNeb;
+			parameter = parameter.replace("\"phone\":code","\"phone\":\""+phone+"\"");
+		}
+
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+//		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+//		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("appid", "tiku");
+		
+		if(parameter.contains("phone")){
+			phone = MapUtil.killQuotes(phone, "\"");
+			jsonAsMap.put("phone", phone);
+		}		
+
+		String sign = MapUtil.getParameter(parameter, "sign").trim();
+		sign = MapUtil.killQuotes(sign, "\"");
+		jsonAsMap.put("sign",sign);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/department.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;
+
+
+/**
+ * 79.获取用人司局
+ * 
+ * @author mr
+ * 
+ */
+
+public class department extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String office_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);
+		office_id = MapUtil.getParameter(parameter, "office_id").trim();
+		
+		if ((!office_id.equals("")) && office_id.equals("code")) {
+			office_id = L_office_id;
+			parameter = parameter.replace("\"office_id\":code","\"office_id\":\""+office_id+"\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("appid", tikuString);
+		
+//		office_id = MapUtil.killQuotes(office_id, "\"");
+		jsonAsMap.put("office_id", office_id);
+			
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("0".equals(code)){
+				L_department_id=jp.getString("data.departments.list.id");
+				L_department_id = L_department_id.replace("[", "").replace("]", "").trim();
+				System.out.println(L_department_id);
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.util.HashMap;
+
+import com.offcn.TestUnti.ListUtil;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+
+/**
+ * 
+ * @author wufeifei
+ * 修改用户名称
+ *
+ */
+public class editUserName extends TK implements API {
+	
+	public String parameter;//参数集合
+	public String user_id;//用户id
+	public String nickname;//用户名
+	
+	
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// TODO Auto-generated method stub
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		nickname = MapUtil.getParameter(parameter, "nickname").trim();
+		nickname = MapUtil.killQuotes(nickname, "\"");
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id = ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		// TODO Auto-generated method stub
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+//		System.out.println(re.asString());
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		// TODO Auto-generated method stub
+		
+		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("接口响应成功！".equals(msg)){
+				
+				//是否验证数据库
+				if(!isProduct){
+					try {
+						
+						String sql="SELECT nickname FROM t_user where user_id ='"+user_id+"'";
+						
+						ResultSet rs_bankcard = this.sqlFromDB(sql);
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+							
+							
+							String act_nickname=rs_bankcard.getString("nickname").equals("null ")?"null":rs_bankcard.getString("nickname");
+							String date_nicknameString = jp.getString("data.nickname");
+							
+							
+							if(!(date_nicknameString.equals(act_nickname) && date_nicknameString.equals(nickname))){
+									result = result && false;
+									failReason = failReason + "nickname is not in DB;";
+							}
+							
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_user info in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}
+	
+	

tiku_App/src/com/offcn/api/tk/app3/getAllFutureMock.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;
+
+
+
+/**
+ * 56、获取其他模考
+ * 
+ * @author wz
+ *
+ */
+public class getAllFutureMock extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//user_id
+	
+	public String exam_id;//exam_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);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+				phone_code=jp.getString("data.code");
+				System.out.println(phone_code);
+
+				//是否验证数据库
+				if (!isProduct) {
+					
+					try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_code c ",
+								" c.phone = '" + user_id + "' ");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+//							code = MapUtil.killQuotes(code, "\"");
+//							phone_code=code;
+														
+//							parameter = MapUtil.getValue("parameter", data);
+													
+							String act_code=rs_bankcard.getString("code");							
+																										
+							if(!act_code.equals(phone_code)){
+								result = result && false;
+								failReason = failReason + "t_code info  code is not in DB;";
+							}
+							
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_code info in DB;";
+						e.printStackTrace();
+					}
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getAppInfo.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;
+
+
+
+/**
+ * 33-1.获取app版本更新信息
+ * 
+ * @author puhui
+ *
+ */
+public class getAppInfo 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/getCode.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.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 获取验证码
+ * 
+ * @author puhui
+ *
+ */
+public class getCode extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//用户手机号
+
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();
+
+		if ((!phone.equals("")) && phone.equals("random")) {
+			phone="1391"+(new Random().nextInt(9000000)+ 1000000);
+			parameter = parameter.replace("\"phone\":random", "\"phone\":\""+ phone + "\"");
+		}
+		
+		if ((!phone.equals("")) && phone.equals("code")) {
+			phone=phoneNeb;
+			parameter = parameter.replace("\"phone\":code", "\"phone\":\""+ phone + "\"");
+		}
+		
+		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 = 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("验证码发送".equals(msg)){
+				
+				//是否验证数据库
+				if (!isProduct) {
+					parameter = MapUtil.getValue("parameter", data);
+					phone = MapUtil.getParameter(parameter, "phone").trim();
+					phone = MapUtil.killQuotes(phone, "\"");
+					phoneNeb=phone;
+					
+					String data_code=jp.getString("data.code");
+					phone_code=data_code;
+					
+					try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_code u ",
+								" u.phone = '" + phone + "'");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+							
+							String act_phone=rs_bankcard.getString("phone").equals("null ")?"null":rs_bankcard.getString("phone");
+							String act_code=rs_bankcard.getString("code").equals("null ")?"null":rs_bankcard.getString("code");
+							
+							if(!(act_phone.equals(phone))){
+									result = result && false;
+									failReason = failReason + "phone  is not in DB;";
+							}
+							if(!(data_code.equals(act_code))){
+								result = result && false;
+								failReason = failReason + "code  is not in DB;";
+							}
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "not find t_code  in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+			
+			
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getCode_web.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;
+
+
+
+/**
+ * 51、h5获取验证码
+ * 
+ * @author mr
+ *
+ */
+public class getCode_web extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//手机号
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();					
+		
+		if ((!phone.equals("")) && phone.equals("code")) {
+			phone = phoneNeb;
+			parameter = parameter.replace("\"phone\":code","\"phone\":\""+phone+"\"");
+		}
+
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("phone", phone);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+				phone_code=jp.getString("data.code");
+				System.out.println(phone_code);
+
+				//是否验证数据库
+				if (!isProduct) {
+					
+					try {
+						String sql = "SELECT t.`code` from t_code t WHERE phone = "+phone+" ORDER BY t.id DESC LIMIT 1";
+						ResultSet rs_bankcard = this.sqlFromDB(sql);
+//						ResultSet rs_bankcard = this.selectFromDB(
+//								" t_code c ",
+//								" id = (SELECT MAX(id) FROM t_code WHERE c.phone = '" + phone + "') ");
+						rs_bankcard.last();
+						if(rs_bankcard.getRow()>=1){
+							
+							String act_code=rs_bankcard.getString("code");	
+							
+							phone_code = act_code;
+																										
+//							if(!act_code.equals(phone_code)){
+//								result = result && false;
+//								failReason = failReason + "t_code info  code is not in DB;";
+//							}
+							
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_code info in DB;";
+						e.printStackTrace();
+					}
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

@@ -6,6 +6,7 @@ import io.restassured.response.Response;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import com.offcn.TestUnti.MapUtil;
 import com.offcn.TestUnti.RequestDataUtils;
 import com.offcn.TestUnti.StringUtils;
@@ -19,8 +20,8 @@ import com.offcn.TestUnti.ListUtil;
 /**
  * 
  * @Description: 11.真题试卷-申论真题获取试卷模块信息
- * @author: wff    
- * @date: 2019年6月11日 上午11:26:23   
+ * @author: wff->mr    
+ * @date: 2019年7月31日 上午11:26:23   
  * @version V1.0
  */
 
@@ -31,6 +32,7 @@ public class getExpoundingPaperBlocks extends TK implements API {
 	public String paper_id;//试卷id
 	public String exam_id;//考试id(nwn可传0)
 	public String channel;//做题平台来源（1：题库；2：NWN）,不传默认为1
+	public String nwn_paper_id;//nwn系统试卷id
 	
 
 	@Override
@@ -45,12 +47,28 @@ public class getExpoundingPaperBlocks extends TK implements API {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
 		
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
 		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		nwn_paper_id = MapUtil.getParameter(parameter, "nwn_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;
+			paper_id = "4321";
 			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_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 ((!nwn_paper_id.equals("")) && nwn_paper_id.equals("code")) {
+			nwn_paper_id= "4321";
+			parameter = parameter.replace("\"nwn_paper_id\":code", "\"nwn_paper_id\":\""+ nwn_paper_id + "\"");
+		}
 		data.put("parameter", parameter);
 		return data;
 	}
@@ -67,7 +85,11 @@ public class getExpoundingPaperBlocks extends TK implements API {
 		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
 		tikuString = MapUtil.killQuotes(tikuString, "\"");
 		
+		jsonAsMap.put("user_id", user_id);
 		jsonAsMap.put("paper_id", paper_id);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("nwn_paper_id", nwn_paper_id);
 		jsonAsMap.put("appid", tikuString);
 		
 		MyRequest myRequest=new MyRequest();
@@ -139,27 +161,18 @@ public class getExpoundingPaperBlocks extends TK implements API {
 				}
 			}
 			
-			if("接口响应成功！".equals(msg)){
-				List<String> list=jp.getList("data.children.children");
-				System.out.println(list);
-				if (list!=null && list.size()>0 && list.get(0)!=null) {
-					for(int i=0;i<list.size();i++){
-						String shelfIds =jp.getString("data.children.children[0].shelf_id");
-						String[] shelfId = shelfIds.split(",");
-						for (String string : shelfId) {
-							L_shelf_id = string.replace("[", "").replace("]", "").trim();
-//							 System.out.println(string.replace("[", "").replace("]", ""));
-						}
-					}
-//					
-				}
+			if("success".equals(msg)){
+					L_record_id=jp.getString("data.recordId");	
+
 				conn=ConnectionsMap.get("tk");
 			}
-		}
+		
 		if (result)
 			return "Pass";
 		else
 			return "Fail:" + failReason;
+		}
+		return json;
 	}
 
 }

tiku_App/src/com/offcn/api/tk/app3/getMockList_2.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;
+
+
+
+/**
+ * 48.模考web报名页获取模考列表
+ * 
+ * @author mr
+ *
+ */
+public class getMockList_2 extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_id;//考试项目id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl("/apiv3/mock/mockweb/getMockList");
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+//				L_mock_sub_id=jp.getString("data.mock.mocklist.mock_sub_id[0]");
+//				L_mock_id=jp.getString("data.mock.mocklist.mock_id[0]");
+//				System.out.println(L_mock_sub_id);
+//				System.out.println(L_mock_id);
+//				List<String> list=jp.getList("data.mock.mocklist.mock_sub_id");
+//				System.out.println(list);
+//				if (list!=null && list.size()>0 && list.get(0)!=null) {
+//					for(int i=0;i<list.size();i++){
+//						String mock_subIds =jp.getString("data.mock.mocklist.mock_sub_id");
+//						String[] mock_subId = mock_subIds.split(",");
+//						for (String string : mock_subId) {
+//							L_mock_sub_id = string.replace("[", "").replace("]", "").trim();
+//						}
+//					}					
+//				}
+				
+				List<String> list=jp.getList("data.mock.mocklist.mock_sub_id");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+					for(int i=0;i<list.size();i++){
+						L_mock_sub_id=jp.getString("data.mock.mocklist.mock_sub_id["+i+"]");
+						L_mock_id=jp.getString("data.mock.mocklist.mock_id["+i+"]");
+					}						
+				}
+				System.out.println(L_mock_sub_id);
+				System.out.println(L_mock_id);
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

tiku_App/src/com/offcn/api/tk/app3/loginByPhoneCode.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;
+
+
+
+/**
+ * 58. 手机号、验证码登陆（中公杯使用）
+ * 
+ * @author mr
+ *
+ */
+public class loginByPhoneCode extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//手机号
+	public String appid;//使用平台
+	public String code;//验证码
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();
+		appid = MapUtil.getParameter(parameter, "appid").trim();
+		code = MapUtil.getParameter(parameter, "code").trim();
+		
+		
+		if ((!phone.equals("")) && phone.equals("code")) {
+			phone = phoneNeb;
+			parameter = parameter.replace("\"phone\":code","\"phone\":\""+phone+"\"");
+		}
+
+		if ((!code.equals("")) && code.equals("code")) {
+			code = phone_code;
+			parameter = parameter.replace("\"code\":code","\"code\":\""+code+"\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+//		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+//		tikuString = MapUtil.killQuotes(tikuString, "\"");
+//		jsonAsMap.put("appid", tikuString);
+		
+		phone = MapUtil.killQuotes(phone, "\"");
+		jsonAsMap.put("phone", phone);
+		
+		code = MapUtil.killQuotes(code, "\"");
+		jsonAsMap.put("code", code);
+		
+		if(parameter.contains("appid")){
+			appid = MapUtil.killQuotes(appid, "\"");
+			jsonAsMap.put("appid", appid);
+		}
+		
+		String sign = MapUtil.getParameter(parameter, "sign").trim();
+		sign = MapUtil.killQuotes(sign, "\"");
+		jsonAsMap.put("sign",sign);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){				
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/office.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;
+
+
+/**
+ * 78. 获取招录机关（v1 . 78）
+ * 
+ * @author mr
+ * 
+ */
+
+public class office 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();
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("appid", tikuString);
+		
+		exam_id = MapUtil.killQuotes(exam_id, "\"");
+		jsonAsMap.put("exam_id", exam_id);
+			
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				List<String> list=jp.getList("data.offices.list");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+						L_office_id=jp.getString("data.offices.list[0].id[0]");
+						System.out.println(L_office_id);										
+				}
+									
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/phoneRegister.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;
+
+
+
+/**
+ * 57. 手机号（无密码）注册（中公杯使用）
+ * 
+ * @author mr
+ *
+ */
+public class phoneRegister extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//手机号
+	public String user_from;//用户来源
+	public String appid;//使用平台
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();	
+		user_from = MapUtil.getParameter(parameter, "user_from").trim();
+		appid = MapUtil.getParameter(parameter, "appid").trim();
+		
+
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		
+		phone = MapUtil.killQuotes(phone, "\"");
+		jsonAsMap.put("phone", phone);
+		
+		if(parameter.contains("user_from")){
+			user_from = MapUtil.killQuotes(user_from, "\"");
+			jsonAsMap.put("user_from", user_from);
+		}
+		
+		if(parameter.contains("appid")){
+			appid = MapUtil.killQuotes(appid, "\"");
+			jsonAsMap.put("appid", appid);
+		}
+		
+		
+		String sign = MapUtil.getParameter(parameter, "sign").trim();
+		sign = MapUtil.killQuotes(sign, "\"");
+		jsonAsMap.put("sign",sign);
+		
+				
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);
+		//myRequest.setParameter(parameter);
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+				phone = MapUtil.killQuotes(phone, "\"");
+				phoneNeb = phone;
+				
+				String user_id=jp.getString("data.userinfo.user_id");
+				user_id = MapUtil.killQuotes(user_id, "\"");
+				user_idList.add(user_id);
+				
+				String dataPhone=jp.getString("data.userinfo.phone");
+				dataPhone = MapUtil.killQuotes(dataPhone, "\"");
+				
+				String token=jp.getString("data.token");
+				tk_token = MapUtil.killQuotes(token, "\"");//保存token
+				
+				//是否验证数据库
+				if (!isProduct) {
+					
+					try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_user u ",
+								" u.user_id = '" + user_id + "' ");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+														
+							parameter = MapUtil.getValue("parameter", data);												
+							
+							String act_phone=rs_bankcard.getString("phone");													
+							
+							if(phone.length()<12){
+								if(!(dataPhone.equals(act_phone) && (dataPhone.equals(phone)))){
+									result = result && false;
+									failReason = failReason + "t_user info phone is not in DB;";
+								}
+							}
+							
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_user info in DB;";
+						e.printStackTrace();
+					}
+				}
+				if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+					try {
+						deleteFromDB("t_user", "phone", phoneNeb);
+					} catch (Exception e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/position.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;
+
+
+/**
+ * 80.获取职位信息
+ * 
+ * @author mr
+ * 
+ */
+
+public class position extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String department_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);
+		department_id = MapUtil.getParameter(parameter, "department_id").trim();
+		
+		if ((!department_id.equals("")) && department_id.equals("code")) {
+			department_id = L_department_id;
+			parameter = parameter.replace("\"department_id\":code","\"department_id\":\""+department_id+"\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("appid", tikuString);
+		
+//		office_id = MapUtil.killQuotes(office_id, "\"");
+		jsonAsMap.put("department_id", department_id);
+			
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("0".equals(code)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/recordPushToken.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;
+
+
+
+/**
+ * .记录push token
+ * 
+ * @author puhui
+ *
+ */
+public class recordPushToken extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String device_id;//用户设备id
+	public String pushtoken;//pushtoken
+	public String platform;//设备平台Iphone、Android
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		pushtoken = MapUtil.getParameter(parameter, "pushtoken").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 ((!pushtoken.equals("")) && pushtoken.equals("random")) {
+			pushtoken="1391"+(new Random().nextInt(9000000)+ 1000000);
+			parameter = parameter.replace("\"pushtoken\":random", "\"pushtoken\":\""+ pushtoken + "\"");
+		}
+		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 = 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("接口响应成功！".equals(msg)){
+				
+				//是否验证数据库
+				if (!isProduct) {
+
+				}
+			}
+			
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/resetpasswd.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.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+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;
+
+
+
+/**
+ * 重置密码
+ * 
+ * @author puhui
+ *
+ */
+public class resetpasswd extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String phone;//手机号
+	public String system;//手机系统
+	public String platform;//手机平台
+	public String version;//版本号
+	public String device_id;//设备id
+	public String passwd;//密码
+	public String passcode;//密码明文
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		phone = MapUtil.getParameter(parameter, "phone").trim();
+		
+		if ((!phone.equals("")) && phone.equals("code")) {
+			parameter = parameter.replace("\"phone\":code", "\"phone\":\""+ phoneNeb + "\"");
+		}
+		
+		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 = 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) {
+			
+//			System.out.println(jp.getString("message"));
+//			String msg=StringUtils.decodeUnicode(getMsg(re));
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				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("接口响应成功！".equals(msg)){
+			
+				phoneNeb=phone;
+				
+				//是否验证数据库
+				if (!isProduct) {
+					
+					try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_user u ",
+								" u.phone = '" + phoneNeb + "' ");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+							
+							String act_phone=rs_bankcard.getString("phone").equals("null ")?"null":rs_bankcard.getString("phone");
+							
+							parameter = MapUtil.getValue("parameter", data);
+							phone = MapUtil.getParameter(parameter, "phone").trim();
+							phone = MapUtil.killQuotes(phone, "\"");
+							
+							if(phone.length()<60){
+								if(!(phone.equals(act_phone))){
+									result = result && false;
+									failReason = failReason + "t_user info phone is not in DB;";
+								}
+							}
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_user info in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/signUpMock.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;
+
+
+
+/**
+ * 49.模考web报名页报名
+ * 
+ * @author mr
+ *
+ */
+public class signUpMock extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_id;//考试项目id
+	public String phone;//手机号
+	public String mock_sub_id;//子模考id
+	public String mock_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();
+		phone = MapUtil.getParameter(parameter, "phone").trim();
+		mock_sub_id = MapUtil.getParameter(parameter, "mock_sub_id");
+		mock_id = MapUtil.getParameter(parameter, "mock_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 ((!phone.equals("")) && phone.equals("code")) {
+			phone = phoneNeb;
+			parameter = parameter.replace("\"phone\":code","\"phone\":\""+phone+"\"");
+		}
+		if ((!mock_sub_id.equals("")) && mock_sub_id.equals("code")){
+			mock_sub_id = L_mock_sub_id;
+			parameter = parameter.replace("\"mock_sub_id\":code","\"mock_sub_id\":\""+mock_sub_id+"\"" );
+		}
+		if ((!mock_id.equals("")) && mock_id.equals("code")) {
+			mock_id=L_mock_id;
+			parameter = parameter.replace("\"mock_id\":code", "\"mock_id\":\""+ mock_id + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("phone", phone);
+		jsonAsMap.put("mock_sub_id", mock_sub_id);
+		jsonAsMap.put("mock_id", mock_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+//				L_mock_sub_id=jp.getString("data.mocklist.mock_sub_id[0]");
+//				L_mock_id=jp.getString("data.mocklist.mock_id[0]");
+//				List<String> list=jp.getList("data.mocklist");
+//				System.out.println(list);
+//				if (list!=null && list.size()>0 && list.get(0)!=null) {
+//					for(int i=0;i<list.size();i++){
+//						String mock_sub_id =jp.getString("data.mocklist[0].mock_sub_id");
+//						String[] shelfId = mock_sub_id.split(",");
+//						for (String string : shelfId) {
+//							L_mock_sub_id = string.replace("[", "").replace("]", "").trim();
+//						}
+//					}
+////					
+//				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/uploadUserAvator.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;
+
+
+
+/**
+ * 41:App用户上传头像接口
+ * 
+ * @author puhui
+ *
+ */
+public class uploadUserAvator extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String image;//考试项目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();
+		image = MapUtil.getParameter(parameter, "image").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!image.equals("")) && image.equals("code")) {
+			image="88";
+			parameter = parameter.replace("\"image\":code", "\"image\":\""+ image + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+//		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		
+		Map<String,String> m=new HashMap<String,String>();
+		m.put("user_id", user_id);
+		m.put("image", user_id);
+		m.put("appid","tiku");
+		m.put("sign", TK.GetSignValue(parameter));
+		
+		Response re = RequestDataUtils.Post_file2(data, Url, tk_token,"image","1.png",m);
+//		Response re = RequestDataUtils.post_form_data(data,tk_token, Url,m);
+		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/userLogout.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;
+
+
+
+/**
+ * 81、用户退出
+ * 
+ * @author wz
+ *
+ */
+public class userLogout extends TK implements API {
+	public String parameter;//参数集合
+
+	@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) {
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+//		myRequest.setFormParameter(jsonAsMap);	
+		myRequest.setParameter(parameter);
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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)){
+				phone_code=jp.getString("data.code");
+				System.out.println(phone_code);
+
+				//是否验证数据库
+				if (!isProduct) {
+					
+					/*try {
+						ResultSet rs_bankcard = this.selectFromDB(
+								" t_code c ",
+								" c.phone = '" + user_id + "' ");
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+//							code = MapUtil.killQuotes(code, "\"");
+//							phone_code=code;
+														
+//							parameter = MapUtil.getValue("parameter", data);
+													
+							String act_code=rs_bankcard.getString("code");							
+																										
+							if(!act_code.equals(phone_code)){
+								result = result && false;
+								failReason = failReason + "t_code info  code is not in DB;";
+							}
+							
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify t_code info in DB;";
+						e.printStackTrace();
+					}*/
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

@@ -31,6 +31,7 @@ import net.sf.json.JSONObject;
 
 
 /**
+<<<<<<< HEAD
  * 77. 获取模考科目的状态=======
  * 
  * @author puhui
@@ -157,6 +158,117 @@ public class visitor extends TK implements API {
 						}
 					}
 				}else{//如果只有一个希望结果，就直接包含比较。
+=======
+ * 游客模式登录
+ * 
+ * @author puhui
+ *
+ */
+public class visitor extends TK implements API {
+	public String parameter;//
+	
+	public String device_id;//
+	public String platform;//
+	public String version;//
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+//		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+//			cleanUser_FromDB();
+//		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 
+		parameter = MapUtil.getValue("parameter", data);
+		device_id = MapUtil.getParameter(parameter, "device_id").trim();
+		platform = MapUtil.getParameter(parameter, "platform").trim();
+		version = MapUtil.getParameter(parameter, "version").trim();
+		
+		if ((!device_id.equals("")) && device_id.equals("code")) {
+			device_id= "09F959041C5B4F469E4B3D58FBBCD04A";
+			parameter = parameter.replace("\"device_id\":code", "\"device_id\":\""+ device_id + "\"");
+		}
+		if ((!platform.equals("")) && platform.equals("code")) {
+			platform="iphone";
+			parameter = parameter.replace("\"platform\":code", "\"platform\":\""+ platform + "\"");
+		}
+		if ((!version.equals("")) && version.equals("code")) {
+			version="1.0";
+			parameter = parameter.replace("\"version\":code", "\"version\":\""+ version + "\"");
+		}
+		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.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setParameter(parameter);
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("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{//
+>>>>>>> branch 'master' of https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git
 					if(!json.contains(data.get("custom").toString())){
 						result = result && false;
 						failReason = failReason + "custom is expected "

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

@@ -72,6 +72,9 @@ public class TK extends BasicsGM{
 //	tiku3接口数据
 	public static String L_shelf_id="";//书架id
 	public static String nwn_record_id="";//nwn使用的   试卷使用记录id
+	public static String L_office_id="";//招录机关id
+	public static String L_department_id="";//用人司局id
+	
 	
 	
 	
@@ -179,7 +182,16 @@ public class TK extends BasicsGM{
 		Arrays.sort(arr);
 		parameter=Arrays.toString(arr);
 		parameter=parameter.toString().replace(", ", "&");
-		parameter=(parameter.substring(1,parameter.length()-1))+"&123456";
+		
+		
+		if(parameter.contains("cup")){
+		
+			parameter=(parameter.substring(1,parameter.length()-1))+"&838296179";
+		}else{
+			parameter=(parameter.substring(1,parameter.length()-1))+"&123456";
+		}
+			
+		
 		return MD5keyUtil.getMD5Str(parameter);
 	}
 	

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

@@ -88,21 +88,21 @@ public class APITest_tk extends BasicsGM{
 	  
 	  
 	  //数据回写
-	/*  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-	  SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
-	  sheet.writeExcel(
-			  		data.get("NO").toString(),
-				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
-				  	data.get("Description").toString(),
-				  	parameter.length()>1000?"内容超长。":parameter, 
-					JSONObject.fromObject(ExpectResult).toString(),
-					StringUtils.decodeUnicode(re.asString().length()>10000?"内容超长。状态码："+re.getStatusCode():re.asString()),
-					codeORerrcode,
-					msgORerrmsy,
-					result,
-					time
-					);
-	  */
+//	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
+//	  SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
+//	  sheet.writeExcel(
+//			  		data.get("NO").toString(),
+//				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
+//				  	data.get("Description").toString(),
+//				  	parameter.length()>1000?"内容超长。":parameter, 
+//					JSONObject.fromObject(ExpectResult).toString(),
+//					StringUtils.decodeUnicode(re.asString().length()>10000?"内容超长。状态码："+re.getStatusCode():re.asString()),
+//					codeORerrcode,
+//					msgORerrmsy,
+//					result,
+//					time
+//					);
+//	  
 	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();

tiku_App/src/makeTestCase/MakeTestCases.java

@@ -34,8 +34,8 @@ public class MakeTestCases {
 	public static List<List<String>> list_all=new ArrayList<List<String>>();//缺失字段，最后判断是否应该算正向还是反向
 	
 	public static void main(String[] args) {
-
-		make("TestData/CaseMake.xls","Sheet1","post","tk_3");
+ 
+		make("TestData/CaseMakeWff.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/CaseMake.xls",SheetList.get(i),nameList.get(i));
+			List<Set<String>> a=TestCase_N("TestData/CaseMakeWff.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
-sheet=TestCase1
+xls=DataAllWff.xls
+sheet=Sheet1
 mysql_local_Online=local
 Percentage=60
\ No newline at end of file

tiku_App/src/test/t1.java

@@ -3,13 +3,15 @@ package test;
 import java.util.Iterator;
 import java.util.Set;
 
+import com.offcn.TestUnti.MyDateUtil;
+
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 
 public class t1 {
 
-	public static void main(String[] args) {
+	public static void main1(String[] args) {
 		
 		
 		String str="{\"houseBasicInfo\": {\"address\": \"***&*&*&87\",\"area\": \"北京市\",\"cardPic\": \"cardpiccardpiccardpic\",\"city\": \"北京市\",\"contract\": \"contract\",\"contractNo\": \"100000004\",\"idNo\": \"11022119811222061X\",\"name\": \"姚帅\",\"payAmount\": 10000,\"phone\": \"13910960649\",\"rentBegin\": \"2017-07-21\",\"rentEnd\": \"2018-07-21\",\"rental\": 5000,\"rentalType\": 1,\"roomId\": \"11\",\"roomNum\": \"1101室\",\"suiteId\": \"111\",\"termNum\": 12,\"thirdUserId\": \"1\",\"timeStamp\": \"123123123\"},\"merchantName\": \"蛋壳第一商户\",\"receiveContractInfo\": {\"area\": \"北京\",\"attachment\": \"attachment\",\"city\": \"北京\",\"contractNo\": \"0000001231231231\",\"endTime\": \"2017-07-21\",\"personIdNo\": \"110102198907132328\",\"personName\": \"小五\",\"rentalAddress\": \"北京市朝阳区银河SOHO1101室\",\"startTime\": \"2018-07-21\",\"subCompany\": \"蛋壳租房\"},\"source\": 0}";
@@ -53,4 +55,8 @@ public class t1 {
 //         System.out.println(jo1.get("phone"));
          
 	}
+	
+	public static void main(String[] args) {
+		System.out.println(MyDateUtil.getTime_php(2,0,0));
+	}
 }