2019-0222

nwn_Api_auto_test/src/com/offcn/api/nwn/ht/baseToImg.java

+package com.offcn.api.nwn.ht;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.interfaces.API;
+import com.offcn.process.NWN;
+import com.offcn.system.MyRequest;
+
+
+
+
+/**
+ * 55.base64位转图片
+ * 
+ * @author wufeifei
+ *
+ */
+public class baseToImg extends NWN implements API {
+	public String parameter;//参数集合
+	public String base_code;//学习包id
+	
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		base_code = MapUtil.getParameter_get(parameter, "base_code").trim();
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String,String> cookies=new HashMap<String,String>();
+		cookies.put("admin_31_encode", admin_31_encode);
+		cookies.put("PHPSESSID", PHPSESSID);
+		cookies.put("admin_login_ssid", admin_login_ssid);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setCookies(cookies);
+		myRequest.setRequest(Request);
+		myRequest.setParameter(parameter);;
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = 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;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/ht/delOutline.java

+package com.offcn.api.nwn.ht;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+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.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.interfaces.API;
+import com.offcn.process.NWN;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 删除层级或组件
+ * 
+ * @author wufeifei
+ *
+ */
+public class delOutline extends NWN implements API {
+	public String parameter;//参数集合
+	
+	
+	public String template_id;//母版id 
+	public String module_type;//组件类型
+	public String id_db;//组件id_db
+	public String id;//组件id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		
+		String sql="SELECT id FROM n_template_menu_35 WHERE template_id = 35 AND level_name = \"飞飞飞\" "
+				+ "AND deleted_at is NULL ORDER BY id DESC LIMIT 1";
+//		
+		ResultSet rs_bankcard;
+		try {
+			rs_bankcard = this.sqlFromDB_template(sql);
+			rs_bankcard.last();
+			if(rs_bankcard.getRow()>=1){
+				id_db=rs_bankcard.getString("id").equals("null ")?"null":rs_bankcard.getString("id");
+				System.out.println(id);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		template_id = MapUtil.getParameter_get(parameter, "template_id").trim();
+		module_type = MapUtil.getParameter_get(parameter, "module_type").trim();
+		id = MapUtil.getParameter_get(parameter, "id").trim();
+		
+		if ((!template_id.equals("")) && template_id.equals("code")) {
+			template_id="35";
+			parameter = parameter.replace("template_id=code", "template_id="+ template_id );
+		}
+		if ((!module_type.equals("")) && module_type.equals("code")) {
+			module_type = "0";
+			parameter = parameter.replace("module_type=code", "module_type="+ module_type );
+		}
+		if ((!id.equals("")) && id.equals("code")) {
+			parameter = parameter.replace("id=code", "id="+ id_db );
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+//		Response re = RequestDataUtils.Get_two_cookie2(data, Url,"admin_31_encode",admin_31_encode,"PHPSESSID",PHPSESSID);
+//		return re;
+		Map<String,String> cookies=new HashMap<String,String>();
+		cookies.put("admin_31_encode", admin_31_encode);
+		cookies.put("PHPSESSID", PHPSESSID);
+		cookies.put("admin_login_ssid", admin_login_ssid);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setCookies(cookies);
+		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 = 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);
+					
+//					remark = MapUtil.getParameter_get(parameter, "remark").trim();
+//					package_id = MapUtil.getParameter_get(parameter, "package_id").trim();
+//					intro = MapUtil.getParameter_get(parameter, "intro").trim();
+//					cover = MapUtil.getParameter_get(parameter, "cover").trim();
+//					pack_name = MapUtil.killQuotes(pack_name, "\"");
+//					for_year = MapUtil.killQuotes(for_year, "\"");
+//					product = MapUtil.killQuotes(product, "\"");
+//					intro = MapUtil.killQuotes(intro, "\"");
+//					cover = MapUtil.killQuotes(cover, "\"");
+					
+					try {
+						
+//						String sql="select * from n_package where id='"+package_id+"'";
+//						
+//						ResultSet rs_bankcard = this.sqlFromDB(sql);
+//						rs_bankcard.last();
+//						
+//						if(rs_bankcard.getRow()>=1){
+////							
+////							
+////							String atc_remark=rs_bankcard.getString("remark").equals("null ")?"null":rs_bankcard.getString("remark");
+//							String atc_package_id=rs_bankcard.getString("id").equals("null ")?"null":rs_bankcard.getString("id");
+//							String act_intro=rs_bankcard.getString("intro").equals("null ")?"null":rs_bankcard.getString("intro");
+//							String act_cover=rs_bankcard.getString("cover").equals("null ")?"null":rs_bankcard.getString("cover");
+////							
+////							System.out.println("atc_remark==" + atc_remark);
+//							System.out.println("act_pack_name==" + atc_package_id);
+//							System.out.println("act_intro==" + act_intro);
+//							System.out.println("act_cover==" + act_cover);
+//							/*if(!(remark.equals(atc_remark)) && remark != null && !remark.equals("")){
+//									result = result && false;
+//									failReason = failReason + "t_exam_area info pack_name is not in DB;";
+//							}*/
+//							
+//						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify n_package info in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+			
+			
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/ht/editPackage.java

+package com.offcn.api.nwn.ht;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+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.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.interfaces.API;
+import com.offcn.process.NWN;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 编辑教务包
+ * 
+ * @author wufeifei
+ *
+ */
+public class editPackage extends NWN implements API {
+	public String parameter;//参数集合
+	
+	
+	public String remark;//备注
+	public String package_id;//学习包id
+	public String intro;//简介
+	public String cover;//封面
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		remark = MapUtil.getParameter_get(parameter, "remark").trim();
+		package_id = MapUtil.getParameter_get(parameter, "package_id").trim();
+		intro = MapUtil.getParameter_get(parameter, "intro").trim();
+		cover = MapUtil.getParameter_get(parameter, "cover").trim();
+		
+		if ((!package_id.equals("")) && package_id.equals("code")) {
+			package_id=ListUtil.getListValue(n_package_idList, 0);
+			parameter = parameter.replace("package_id=code", "package_id="+ package_id );
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+//		Response re = RequestDataUtils.Get_two_cookie2(data, Url,"admin_31_encode",admin_31_encode,"PHPSESSID",PHPSESSID);
+//		return re;
+		Map<String,String> cookies=new HashMap<String,String>();
+		cookies.put("admin_31_encode", admin_31_encode);
+		cookies.put("PHPSESSID", PHPSESSID);
+		cookies.put("admin_login_ssid", admin_login_ssid);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setCookies(cookies);
+		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 = 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);
+					
+//					remark = MapUtil.getParameter_get(parameter, "remark").trim();
+					package_id = MapUtil.getParameter_get(parameter, "package_id").trim();
+					intro = MapUtil.getParameter_get(parameter, "intro").trim();
+					cover = MapUtil.getParameter_get(parameter, "cover").trim();
+//					pack_name = MapUtil.killQuotes(pack_name, "\"");
+//					for_year = MapUtil.killQuotes(for_year, "\"");
+//					product = MapUtil.killQuotes(product, "\"");
+//					intro = MapUtil.killQuotes(intro, "\"");
+//					cover = MapUtil.killQuotes(cover, "\"");
+					
+					try {
+						
+						String sql="select * from n_package where id='"+package_id+"'";
+//						
+						ResultSet rs_bankcard = this.sqlFromDB(sql);
+						rs_bankcard.last();
+						
+						if(rs_bankcard.getRow()>=1){
+//							
+//							
+//							String atc_remark=rs_bankcard.getString("remark").equals("null ")?"null":rs_bankcard.getString("remark");
+							String atc_package_id=rs_bankcard.getString("id").equals("null ")?"null":rs_bankcard.getString("id");
+							String act_intro=rs_bankcard.getString("intro").equals("null ")?"null":rs_bankcard.getString("intro");
+							String act_cover=rs_bankcard.getString("cover").equals("null ")?"null":rs_bankcard.getString("cover");
+//							
+//							System.out.println("atc_remark==" + atc_remark);
+							System.out.println("act_pack_name==" + atc_package_id);
+							System.out.println("act_intro==" + act_intro);
+							System.out.println("act_cover==" + act_cover);
+							/*if(!(remark.equals(atc_remark)) && remark != null && !remark.equals("")){
+									result = result && false;
+									failReason = failReason + "t_exam_area info pack_name is not in DB;";
+							}*/
+							if(!(package_id.equals(atc_package_id))){
+								result = result && false;
+								failReason = failReason + "t_exam_area info for_year is not in DB;";
+							}
+							if(!(intro.equals(act_intro))){
+								result = result && false;
+								failReason = failReason + "t_exam_area info intro is not in DB;";
+							}
+							
+							if(!(cover.equals(act_cover))){
+								result = result && false;
+								failReason = failReason + "t_exam_area info intro is not in DB;";
+							}
+						}
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify n_package info in DB;";
+						e.printStackTrace();
+					}
+				}
+			}
+			
+			
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/ht/getPackageTree.java

+package com.offcn.api.nwn.ht;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.interfaces.API;
+import com.offcn.process.NWN;
+import com.offcn.system.MyRequest;
+
+
+
+
+/**
+ * 编辑教务包
+ * 
+ * @author wufeifei
+ *
+ */
+public class getPackageTree extends NWN implements API {
+	public String parameter;//参数集合
+	
+	public String package_id;//学习包id
+	public String practice_id;//练习册id
+	
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		parameter = MapUtil.getValue("parameter", data);
+		package_id = MapUtil.getParameter_get(parameter, "package_id").trim();
+		practice_id = MapUtil.getParameter_get(parameter, "practice_id").trim();
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String,String> cookies=new HashMap<String,String>();
+		cookies.put("admin_31_encode", admin_31_encode);
+		cookies.put("PHPSESSID", PHPSESSID);
+		cookies.put("admin_login_ssid", admin_login_ssid);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setCookies(cookies);
+		myRequest.setRequest(Request);
+		
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+//		Response re = RequestDataUtils.Get_two_cookie2(data, Url,"admin_31_encode",admin_31_encode,"PHPSESSID",PHPSESSID);
+		
+		
+		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;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/process/code.java

@@ -69,10 +69,15 @@ public class code extends NWN implements API {
 				failReason = failReason + "custom is expected "
 						+ data.get("custom").toString() + " but actually "
 						+ body + ".";
-			}else{
-				MapUtil.showMap_String(re.getCookies());
-				admin_login_ssid=re.getCookie("admin_login_ssid");
+//				admin_login_ssid=re.getCookie("admin_login_ssid");
 				admin_31_encode=re.getCookie("admin_31_encode");
+			}else{
+				
+				System.out.println(re.asString());
+//				System.out.println(MapUtil.showMap_String(re.getCookies()));
+//				System.out.println(re.getHeaders().toString());
+//				admin_login_ssid=re.getCookie("admin_login_ssid");
+//				admin_31_encode=re.getCookie("admin_31_encode");
 			}
 		}
 			

nwn_Api_auto_test/src/com/offcn/api/nwn/process/packagelist.java

@@ -98,6 +98,9 @@ public class packagelist extends NWN implements API {
 							+ data.get("custom").toString() + " but actually "
 							+ jp.getString("url") + ".";
 				}else{
+//					System.out.println(re.asString());
+//					System.out.println(MapUtil.showMap_String(re.getCookies()));
+//					System.out.println(re.getHeaders().toString());
 					nwn_url=url;
 					PHPSESSID=re.getCookie("PHPSESSID");
 				}

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

+package com.offcn.system;
+
+import java.util.Map;
+
+public class MyRequest {
+
+	private String Request;
+	private String Url;
+	private Map<String, String> Cookies;
+	private Map<String,String> headers;
+	private String Parameter; //json请求方式的参数
+	private Map<String, String> formParameter;//form_data请求方式的参数、或file请求方式的参数
+	private String file;
+	public String getRequest() {
+		return Request;
+	}
+	public void setRequest(String request) {
+		Request = request;
+	}
+	public String getUrl() {
+		return Url;
+	}
+	public void setUrl(String url) {
+		Url = url;
+	}
+	public Map<String, String> getCookies() {
+		return Cookies;
+	}
+	public void setCookies(Map<String, String> cookies) {
+		Cookies = cookies;
+	}
+	public Map<String, String> getHeaders() {
+		return headers;
+	}
+	public void setHeaders(Map<String, String> headers) {
+		this.headers = headers;
+	}
+	public String getParameter() {
+		return Parameter;
+	}
+	public void setParameter(String parameter) {
+		Parameter = parameter;
+	}
+	public Map<String, String> getFormParameter() {
+		return formParameter;
+	}
+	public void setFormParameter(Map<String, String> formParameter) {
+		this.formParameter = formParameter;
+	}
+	public String getFile() {
+		return file;
+	}
+	public void setFile(String file) {
+		this.file = file;
+	}
+	public MyRequest(String request, String url, Map<String, String> cookies,
+			Map<String, String> headers, String parameter,
+			Map<String, String> formParameter, String file) {
+		super();
+		Request = request;
+		Url = url;
+		Cookies = cookies;
+		this.headers = headers;
+		Parameter = parameter;
+		this.formParameter = formParameter;
+		this.file = file;
+	}
+	public MyRequest() {
+	}
+	
+}

nwn_Api_auto_test/src/com/offcn/test/APITest_nwn.java

@@ -113,7 +113,7 @@ public class APITest_nwn extends NWN{
 	  
 	  //数据回写
 	 // HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-	 /* SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
+	  SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
 	  sheet.writeExcel(
 			  		data.get("NO").toString(),
 				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
@@ -127,7 +127,7 @@ public class APITest_nwn extends NWN{
 					msgORerrmsy,
 					result,
 					time
-					);*/
+					);
 	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();

nwn_Api_auto_test/src/makeTestCase/MakeTestCases.java

@@ -35,11 +35,11 @@ public class MakeTestCases {
 	
 	public static void main(String[] args) {
 
-		make("TestData/CaseMake.xls","Sheet1");
+		make("TestData/CaseMakeWff.xls","Sheet1","get","nwngg");
 	}
 	
 	
-	public static void make(String FilePath,String SheetName){
+	public static void make(String FilePath,String SheetName,String getOrPost,String qudao){
 		//获取用例
 		List<String> listSum=TestCase(FilePath,SheetName);
         Set<String> set=new HashSet<String>();         
@@ -47,9 +47,9 @@ public class MakeTestCases {
         listSum.clear();   
         listSum.addAll(set);
         
-        for (String string : listSum) {
-			System.out.println(string);	
-		}
+//        for (String string : listSum) {
+//			System.out.println(string);	
+//		}
 		
         List<String> TeseName= TestCaseName(listSum);
 //        System.out.println("用例数"+listSum.size());
@@ -76,13 +76,20 @@ public class MakeTestCases {
 		String jieKouMing=apipath[0];
 		//生成测试用例
 		for(int i=0;i<listSum.size();i++){
-			outCase(i,leiming,jieKouMing,TeseName.get(i),path,listSum.get(i),name,"OutPage");
+			String cases=listSum.get(i);
+			if("get".equals(getOrPost)){
+				cases=cases.replace(":", "=");
+				cases=cases.replace("\"", "");
+				cases=cases.replace(",", "&");
+			}
+			System.out.println(cases);	
+			outCase(i,leiming,jieKouMing,TeseName.get(i),path,cases,name,"OutPage",getOrPost,qudao);
 		}
-		
 				
 	}
 	//第一个参数是数量，第二个参数是接口类名，第三个参数是中文名
-	public static void outCase(int i,String leiming,String jieKouMing,String TeseName,String path,String cases,String wenjianming,String Sheet){
+	public static void outCase(int i,String leiming,String jieKouMing,String TeseName,
+			String path,String cases,String wenjianming,String Sheet,String getOrPost,String qudao){
 		
 		Date d = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -91,15 +98,15 @@ public class MakeTestCases {
 		//数据回写
 		  SheetUtils sheet = new SheetUtils(wenjianming,Sheet);
 		  sheet.writeExcel(
-
+//				  		s,
 				  		(i+1)+"",
 				  		leiming + "_" + (i+1),
 				  		(i+1)+"", 
 				  		jieKouMing+"-"+TeseName,
-				  		"nwn",
+				  		qudao,
 					  	path,
 						"N", 
-						"post",
+						getOrPost,
 						"200",
 						cases
 						);
@@ -317,7 +324,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));
 		}	
@@ -545,7 +552,7 @@ public class MakeTestCases {
 				if(w!=0){
 					linshi="\""+name+"\""+":"+w;
 				}else{
-					linshi="\""+name+"\""+":"+0;//字符串转换成int类型失败后，将字符串变为0
+					linshi="\""+name+"\""+":"+1;//字符串转换成int类型失败后，将字符串变为0
 //					System.out.println(linshi);
 				}
 			}else if("int".equals(obj[j])){

nwn_Api_auto_test/src/resources/class.properties

@@ -2,6 +2,7 @@ xyzb=com.offcn.api.xyzb.
 tk=com.offcn.api.tk.
 nwn=com.offcn.api.nwn.
 nwn_service=com.offcn.api.nwn.service.
+nwn_ht=com.offcn.api.nwn.ht.
 nwnht=com.offcn.api.nwn.
 nwngg=com.offcn.api.nwn.
 tkapp=com.offcn.api.tk.app

nwn_Api_auto_test/src/resources/system.xml

@@ -97,6 +97,22 @@
 		<sqlpwd>Beta@&amp;123</sqlpwd>
 	</system>
 	
+	<system name="nwn_ht"><!-- nwn -->
+		<access_token_uri>http://106.75.5.205:8082/uaa/oauth/token</access_token_uri>
+		<client_id>bestbuy-acceptance</client_id>
+		<client_secret>bestbuy-acceptance</client_secret>
+		<grant_type>client_credentials</grant_type>
+		<isProduct>false</isProduct>
+		<RM_URI>http://beta.alitest.eoffcn.com</RM_URI>
+		<RM_port></RM_port>
+		<RM_basePath></RM_basePath>
+		<redis_URI>10.10.229.48</redis_URI>
+		<redis_db_index>5</redis_db_index>
+		<sqlurl>jdbc:mysql://39.105.124.219:3312/nwn?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull</sqlurl>
+		<sqlname>nwnBeta</sqlname>
+		<sqlpwd>Beta@&amp;123</sqlpwd>
+	</system>
+	
 	<system name="nwn_template"><!-- nwn -->
 		<access_token_uri>http://106.75.5.205:8082/uaa/oauth/token</access_token_uri>
 		<client_id>bestbuy-acceptance</client_id>