Merge branch 'master' of

git@gitlab.eoffcn.com:ys65701/nwn_Api_auto_test.git

Conflicts:
	nwn_Api_auto_test/src/resources/class.properties

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/resources/class.properties

 xyzb=com.offcn.api.xyzb.
 tk=com.offcn.api.tk.
-nwn_service=com.offcn.api.nwn.service.
 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
 tkht=com.offcn.api.tk.ht
\ No newline at end of file

nwn_Api_auto_test/src/resources/system.xml

@@ -65,7 +65,7 @@
 		<sqlpwd>PFQ6nJ7YlG8Y</sqlpwd>
 	</system>
 	
-		<system name="nwn"><!-- nwn -->
+	<system name="nwn"><!-- 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>
@@ -79,8 +79,7 @@
 		<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>
 	
 	<system name="nwn_service"><!-- nwn -->
 		<access_token_uri>http://106.75.5.205:8082/uaa/oauth/token</access_token_uri>
@@ -98,7 +97,7 @@
 		<sqlpwd>Beta@&amp;123</sqlpwd>
 	</system>
 	
-	<system name="nwn_template"><!-- nwn -->
+	<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>
@@ -109,12 +108,12 @@
 		<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_template?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull</sqlurl>
+		<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_package"><!-- nwn -->
+	<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>
 		<client_secret>bestbuy-acceptance</client_secret>
@@ -125,7 +124,7 @@
 		<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_pack?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull</sqlurl>
+		<sqlurl>jdbc:mysql://39.105.124.219:3312/nwn_template?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull</sqlurl>
 		<sqlname>nwnBeta</sqlname>
 		<sqlpwd>Beta@&amp;123</sqlpwd>
 	</system>