add api

nwn_Api_auto_test/src/DefectTest.xml

@@ -6,7 +6,7 @@
     <classes>
       <class name="com.puhui.test.RenMai_APITest">
         <methods>
-          <include name="f" invocation-numbers="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 "/>
+          <include name="f" invocation-numbers="0 1 2 3 4 5 6 7 8 "/>
         </methods>
       </class>
     </classes>

nwn_Api_auto_test/src/com/offcn/TestUnti/RequestDataUtils.java

@@ -681,15 +681,17 @@ public class RequestDataUtils {
         com.offcn.system.system tem=(com.offcn.system.system)(BasicsGM.map.get(system));
 
 
+        
 		parameter=parameter.substring(1, parameter.length()-1);
         Log.logInfo(data.get("Description").toString()+","+data.get("TCNO").toString()+",Parameter="+parameter);
 
         int state=0;
         Response re=null;
         RequestDataUtils rdu=new RequestDataUtils();
-        while(state<5){
+        while(state < 5){
             try {
                 state++;
+                
                 if(parameter != null && !"".equals(parameter)) {
 					re = rdu.getRMEnv(tem).given()
 							.cookie(cookie1Name,cookie1value)

nwn_Api_auto_test/src/com/offcn/api/nwn/md5/nwngetsign.java

@@ -7,7 +7,7 @@ import com.offcn.process.NWN;
 public class nwngetsign {
 		
     public static String nwnGetSign (String parameter) {
-    	StringBuffer sb=new StringBuffer();
+    	StringBuffer sortstring=new StringBuffer();
     	 	//方法1
     	    	
     	//parameter = "appid=jiaowu&template_id=[473,475]&timestamp="+NWN.timestamp;
@@ -19,13 +19,13 @@ public class nwngetsign {
   			//System.out.println(arr[i].substring(arr[i].indexOf("=")+1));
   	  		arr[i]=arr[i].substring(arr[i].indexOf("=")+1);
   	  		
-  	  		sb.append(arr[i]);
-  	  	
+  	  		sortstring.append(arr[i]);
+  	  		System.out.println(sortstring);
 					
 		}
-  		sb.toString();
-  		System.out.println("sb====" + sb);
-  		String str = sb.toString();
+  		sortstring.toString();
+  		System.out.println("sortstring====" + sortstring);
+  		String str = sortstring.toString();
   		
   		
   		str = str + "bf2h3%^j?ljkj3706kji88697"; //教务的加密，规则固定需要加 

nwn_Api_auto_test/src/com/offcn/api/nwn/service/addStuden.java

+package com.offcn.api.nwn.service;
+
+
+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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 添加学员信息
+ * 
+ * @author liyy
+ *
+ */
+public class addStuden extends NWN implements API {
+	
+	public String parameter;//参数集合
+	
+	public String template_id_1;//母板ID
+
+//	public String phone;//层级包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);
+		template_id_1 = MapUtil.getParameter_get(parameter, "template_id").trim();
+		timestamp = MapUtil.getParameter_get(parameter, "timestamp").trim();
+		
+		if ((!template_id_1.equals("")) && template_id_1.equals("template_id")) {
+			template_id_1 = "["+ template_id +","+(Integer.parseInt(template_id)-1)+"]";
+			parameter = parameter.replace("template_id=template_id", "template_id="+ template_id_1 );
+		}
+		
+		
+		if ((!timestamp.equals("")) && timestamp.equals("timestamp")) {
+			Long timeString= System.currentTimeMillis();
+			timestamp = timeString.toString().substring(0, 10);
+			parameter = parameter.replace("timestamp=timestamp", "timestamp="+ timestamp );
+		}
+				
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+//		Map<String,String> m=new HashMap<String,String>();
+//		m.put("user_info", parameter);
+		//Response re = RequestDataUtils.Post_cooike_form_data(data, Url,"PHPSESSID",PHPSESSID,m);	
+		Response re = RequestDataUtils.Get_one_cookie_pre(data, Url, "PHPSESSID",PHPSESSID);
+		//Response re = RequestDataUtils.Get_one_cookie(data, serviceURL, cookie1Name, cookie1value)   //只能无参
+//		Response re = RequestDataUtils.Get_token(data, Url, "");
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		System.out.println( "jp===="+ jp);
+		boolean result = true;
+		String failReason = "";
+
+		String json = re.asString();
+		System.out.println("response=========="+StringUtils.decodeUnicode(json));
+
+		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("retcode") + ".";
+			}
+
+			/*System.out.println((data.get("msg") != null));
+			System.out.println((msg != null));
+			System.out.println(data.get("msg").toString().length());
+			System.out.println(msg.length());
+			*/
+			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(",");
+					System.out.println(strCustomStrings.length);
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			
+			
+			if("0".equals(code)){
+				
+			
+				//是否验证数据库
+				/*if (!isProduct) {
+					
+					String data_res=jp.getString("data").substring(0,jp.getString("data").length());
+					
+					System.out.println("data_res====="+ data_res );
+					try {
+						String sql="SELECT MAX(id) AS  id   FROM `n_package`  WHERE template_id = " + template_id;
+						//SELECT  id FROM  n_template ORDER BY id DESC LIMIT 1
+						ResultSet rs_bankcard = this.sqlFromDB(sql);
+						rs_bankcard.last();
+						System.out.println("after findedupack ============"+ rs_bankcard.getString("id"));
+						if(Integer.parseInt(rs_bankcard.getString("id")) >= Integer.parseInt("1"))
+						{
+							n_package_idList.add(rs_bankcard.getString("id"));
+						}else {
+							result = result && false;
+							failReason = failReason + "edupack info in DB is wrong;";
+						}
+						
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify edupack info in DB;";
+						e.printStackTrace();
+					}
+				}
+		*/
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/service/createEduPackage.java

+package com.offcn.api.nwn.service;
+
+
+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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 创建班级(手动)
+ * 
+ * @author liyy
+ *
+ */
+public class createEduPackage extends NWN implements API {
+	
+	public String parameter;//参数集合
+	
+	public String template_id_1;//母板ID
+
+	public String edu_pack_num;//层级包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);
+		template_id_1 = MapUtil.getParameter_get(parameter, "template_id").trim();
+		edu_pack_num = MapUtil.getParameter_get(parameter, "edu_pack_num").trim();
+		timestamp = MapUtil.getParameter_get(parameter, "timestamp").trim();
+		
+		if ((!template_id_1.equals("")) && template_id_1.equals("template_id")) {
+			template_id_1 =  template_id;
+			parameter = parameter.replace("template_id=template_id", "template_id="+ template_id_1 );
+		}
+		
+		if ((!timestamp.equals("")) && timestamp.equals("timestamp")) {
+			Long timeString= System.currentTimeMillis();
+			timestamp = timeString.toString().substring(0, 10);
+			parameter = parameter.replace("timestamp=timestamp", "timestamp="+ timestamp );
+		}
+				
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+//		Map<String,String> m=new HashMap<String,String>();
+//		m.put("user_info", parameter);
+		//Response re = RequestDataUtils.Post_cooike_form_data(data, Url,"PHPSESSID",PHPSESSID,m);	
+		Response re = RequestDataUtils.Get_one_cookie_pre(data, Url, "PHPSESSID",PHPSESSID);
+		//Response re = RequestDataUtils.Get_one_cookie(data, serviceURL, cookie1Name, cookie1value)   //只能无参
+//		Response re = RequestDataUtils.Get_token(data, Url, "");
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		System.out.println( "jp===="+ jp);
+		boolean result = true;
+		String failReason = "";
+
+		String json = re.asString();
+		System.out.println("response=========="+StringUtils.decodeUnicode(json));
+
+		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("retcode") + ".";
+			}
+
+			/*System.out.println((data.get("msg") != null));
+			System.out.println((msg != null));
+			System.out.println(data.get("msg").toString().length());
+			System.out.println(msg.length());
+			*/
+			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(",");
+					System.out.println(strCustomStrings.length);
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			
+			
+			if("0".equals(code)){
+				
+				//创建后数据库在哪个表
+				//是否验证数据库
+				if (!isProduct) {
+					
+					/*template_id=jp.getString("data.id").substring(0,jp.getString("data.id").length());
+					
+					System.out.println("template_id====="+ template_id );*/
+					try {
+						String sql="SELECT   MAX(id) as id, (MAX(id)-MIN(id)) as rownum FROM  n_package WHERE template_id=" + template_id;
+						//SELECT  id FROM  n_template ORDER BY id DESC LIMIT 1
+						ResultSet rs_bankcard = this.sqlFromDB(sql);
+						rs_bankcard.last();
+						System.out.println("after db_package id============"+ rs_bankcard.getString("id"));
+						if(Integer.parseInt(rs_bankcard.getString("rownum")) == Integer.parseInt(edu_pack_num) )
+						{
+							n_package_idList.add(rs_bankcard.getString("id"));
+							System.out.println("n_package_idList.size ==========" + n_package_idList.size());
+							
+						}else {
+							result = result && false;
+							failReason = failReason + "rownum of  edu_pack_num cannot verify info in DB;";
+						}
+						
+										
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "after createEduPackage cannot verify package_id info in DB;";
+						e.printStackTrace();
+					}
+				}
+			
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/service/delEduPackage.java

+package com.offcn.api.nwn.service;
+
+
+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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 添加母版层级
+ * 
+ * @author liyy
+ *
+ */
+public class delEduPackage extends NWN implements API {
+	
+	public String parameter;//参数集合
+	
+	public String template_id_1;//母板ID
+	public String  package_id;
+	public String  del_package_id;
+//	public String phone;//层级包id
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		
+		try {
+			String sql="SELECT  MAX(id) AS id  FROM `n_package`  WHERE  deleted_at IS NOT NULL ";
+			//SELECT  id FROM  n_template ORDER BY id DESC LIMIT 1
+			ResultSet rs_bankcard = this.sqlFromDB(sql);
+			rs_bankcard.last();
+			
+			del_package_id = rs_bankcard.getString("id");
+			System.out.println("del_package_id====" + del_package_id);
+		} catch (Exception e) {
+			
+			e.printStackTrace();
+		}
+		
+		
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		template_id_1 = MapUtil.getParameter_get(parameter, "template_id").trim();
+		timestamp = MapUtil.getParameter_get(parameter, "timestamp").trim();
+		package_id = MapUtil.getParameter_get(parameter, "package_id").trim();
+		if ((!template_id_1.equals("")) && template_id_1.equals("template_id")) {
+			template_id_1 =  template_id;
+			parameter = parameter.replace("template_id=template_id", "template_id="+ template_id_1 );
+		}
+		if ((!package_id.equals("")) && package_id.equals("package_id")) {
+			package_id=ListUtil.getListValue(n_package_idList, 0);
+			parameter = parameter.replace("package_id=package_id", "package_id="+ package_id );
+		}
+		if ((!package_id.equals("")) && package_id.equals("del_package_id")) {
+			
+			parameter = parameter.replace("package_id=del_package_id", "package_id="+ del_package_id );
+		}
+		
+		if ((!timestamp.equals("")) && timestamp.equals("timestamp")) {
+			Long timeString= System.currentTimeMillis();
+			timestamp = timeString.toString().substring(0, 10);
+			parameter = parameter.replace("timestamp=timestamp", "timestamp="+ timestamp );
+		}
+				
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+//		Map<String,String> m=new HashMap<String,String>();
+//		m.put("user_info", parameter);
+		//Response re = RequestDataUtils.Post_cooike_form_data(data, Url,"PHPSESSID",PHPSESSID,m);	
+		Response re = RequestDataUtils.Get_one_cookie_pre(data, Url, "PHPSESSID",PHPSESSID);
+		//Response re = RequestDataUtils.Get_one_cookie(data, serviceURL, cookie1Name, cookie1value)   //只能无参
+//		Response re = RequestDataUtils.Get_token(data, Url, "");
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		System.out.println( "jp===="+ jp);
+		boolean result = true;
+		String failReason = "";
+
+		String json = re.asString();
+		System.out.println("response=========="+StringUtils.decodeUnicode(json));
+
+		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("retcode") + ".";
+			}
+
+			/*System.out.println((data.get("msg") != null));
+			System.out.println((msg != null));
+			System.out.println(data.get("msg").toString().length());
+			System.out.println(msg.length());
+			*/
+			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(",");
+					System.out.println(strCustomStrings.length);
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			
+			
+			if("0".equals(code)){
+				
+				//创建后数据库在哪个表
+				//是否验证数据库
+				if (!isProduct) {
+					
+					/*template_id=jp.getString("data.id").substring(0,jp.getString("data.id").length());
+					
+					System.out.println("template_id====="+ template_id );*/
+					try {
+						String sql="SELECT  deleted_at  FROM `n_package`  WHERE  id =  " + del_package_id;
+						//SELECT  id FROM  n_template ORDER BY id DESC LIMIT 1
+						ResultSet rs_bankcard = this.sqlFromDB(sql);
+						rs_bankcard.last();
+						System.out.println("after deleted_packate ============"+ rs_bankcard.getString("deleted_at"));
+						if(rs_bankcard.getString("deleted_at").contains("2019") )
+						{
+							
+							
+						}else {
+							result = result && false;
+							failReason = failReason + "deleted_packate  is wrong;";
+						}
+						
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify template_id info in DB;";
+						e.printStackTrace();
+					}
+				}
+			
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/service/findEdupack.java

+package com.offcn.api.nwn.service;
+
+
+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.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 添加母版层级
+ * 
+ * @author liyy
+ *
+ */
+public class findEdupack extends NWN implements API {
+	
+	public String parameter;//参数集合
+	
+	public String template_id_1;//母板ID
+
+//	public String phone;//层级包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);
+		template_id_1 = MapUtil.getParameter_get(parameter, "template_id").trim();
+		timestamp = MapUtil.getParameter_get(parameter, "timestamp").trim();
+		
+		if ((!template_id_1.equals("")) && template_id_1.equals("template_id")) {
+			template_id_1 = "["+ template_id +","+(Integer.parseInt(template_id)-1)+"]";
+			parameter = parameter.replace("template_id=template_id", "template_id="+ template_id_1 );
+		}
+		
+		if ((!timestamp.equals("")) && timestamp.equals("timestamp")) {
+			Long timeString= System.currentTimeMillis();
+			timestamp = timeString.toString().substring(0, 10);
+			parameter = parameter.replace("timestamp=timestamp", "timestamp="+ timestamp );
+		}
+				
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+//		Map<String,String> m=new HashMap<String,String>();
+//		m.put("user_info", parameter);
+		//Response re = RequestDataUtils.Post_cooike_form_data(data, Url,"PHPSESSID",PHPSESSID,m);	
+		Response re = RequestDataUtils.Get_one_cookie_pre(data, Url, "PHPSESSID",PHPSESSID);
+		//Response re = RequestDataUtils.Get_one_cookie(data, serviceURL, cookie1Name, cookie1value)   //只能无参
+//		Response re = RequestDataUtils.Get_token(data, Url, "");
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		System.out.println( "jp===="+ jp);
+		boolean result = true;
+		String failReason = "";
+
+		String json = re.asString();
+		System.out.println("response=========="+StringUtils.decodeUnicode(json));
+
+		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("retcode") + ".";
+			}
+
+			/*System.out.println((data.get("msg") != null));
+			System.out.println((msg != null));
+			System.out.println(data.get("msg").toString().length());
+			System.out.println(msg.length());
+			*/
+			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(",");
+					System.out.println(strCustomStrings.length);
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			
+			
+			if("0".equals(code)){
+				
+			
+				//是否验证数据库
+				if (!isProduct) {
+					
+					String data_res=jp.getString("data").substring(0,jp.getString("data").length());
+					
+					System.out.println("data_res====="+ data_res );
+					try {
+						String sql="SELECT MAX(id) AS  id   FROM `n_package`  WHERE template_id = " + template_id;
+						//SELECT  id FROM  n_template ORDER BY id DESC LIMIT 1
+						ResultSet rs_bankcard = this.sqlFromDB(sql);
+						rs_bankcard.last();
+						System.out.println("after findedupack ============"+ rs_bankcard.getString("id"));
+						if(Integer.parseInt(rs_bankcard.getString("id")) >= Integer.parseInt("1"))
+						{
+							n_package_idList.add(rs_bankcard.getString("id"));
+						}else {
+							result = result && false;
+							failReason = failReason + "edupack info in DB is wrong;";
+						}
+						
+						
+					} catch (Exception e) {
+						result = result && false;
+						failReason = failReason + "cannot verify edupack info in DB;";
+						e.printStackTrace();
+					}
+				}
+		
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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("DataAll.xls", "Output");
 	  sheet.writeExcel(
 			  		data.get("NO").toString(),
 				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
@@ -127,8 +127,8 @@ public class APITest_nwn extends NWN{
 					msgORerrmsy,
 					result,
 					time
-					);
-	  */
+					);*/
+	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();
 		  String Expect2=data.get("msg")==null?"":data.get("msg").toString();

nwn_Api_auto_test/src/resources/system.xml

@@ -81,6 +81,22 @@
 		<sqlpwd>Beta@&amp;123</sqlpwd>
 	</system>
 	
+	<system name="nwn_service"><!-- 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>