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

tiku_App/src/com/offcn/api/tk/app/getExamList.java

+package com.offcn.api.tk.app;
+
+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;
+
+
+
+
+public class getExamList extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String parent_id;//考试父级id
+	//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);
+		parent_id = MapUtil.getParameter(parameter, "parent_id").trim();
+		//appid = MapUtil.getParameter_get(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);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("parent_id", parent_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("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				List<String> list=jp.getList("data");
+				if (list!=null && list.size()>0 && list.get(0)!=null) {
+					for(int i=0;i<list.size();i++){
+						item_id_L=jp.getString("data["+i+"].id");
+						System.out.println(item_id_L);
+					}
+					
+				}
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app/register.java

@@ -9,6 +9,7 @@ import java.sql.Statement;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.json.simple.JSONArray;
 
@@ -19,6 +20,7 @@ import com.offcn.TestUnti.StringUtils;
 import com.offcn.TestUnti.VerificationMethod;
 import com.offcn.interfaces.API;
 import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
 import com.offcn.TestUnti.ListUtil;
 
 import net.sf.json.JSONObject;
@@ -40,6 +42,8 @@ public class register extends TK implements API {
 	public String platform;//手机平台
 	public String version;//版本号
 	public String device_id;//设备号
+	public String appid;//标识
+//	public String sign;//标识
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
@@ -54,13 +58,20 @@ public class register extends TK implements API {
 		// 获取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 + "\"");
-		}
-		
-		phone = MapUtil.getParameter(parameter, "phone").trim();
-		
+		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();
+		appid = MapUtil.getParameter(parameter, "appid").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, "\"");
+//		appid = MapUtil.killQuotes(appid, "\"");
 		data.put("parameter", parameter);
 		return data;
 	}
@@ -68,7 +79,22 @@ public class register extends TK implements API {
 	@Override
 	public Response SendRequest(HashMap<String, Object> data, String Url,
 			String Request) {
-		Response re = RequestDataUtils.Post_NOtokenNOcookie(data, Url);
+//		Response re = RequestDataUtils.Post_NOtokenNOcookie(data, Url);
+//		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+//		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", appid);
+//		jsonAsMap.put("sign", GetSignValue(parameter));
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setParameter(parameter);
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
 		return re;
 	}
 
@@ -187,6 +213,7 @@ public class register extends TK implements API {
 //							String act_passwd=rs_bankcard.getString("passwd").equals("")?"null":rs_bankcard.getString("passwd");
 							String act_passwd=rs_bankcard.getString("passwd");
 							
+							
 //							System.out.println((dataPhone.equals(act_phone)));
 //							System.out.println((dataPhone.equals(phone)));
 							

tiku_App/src/com/offcn/api/tk/app/setUserExam.java

+package com.offcn.api.tk.app;
+
+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;
+
+
+
+
+public class setUserExam extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String id;//考试id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		id = MapUtil.getParameter(parameter, "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 ((!id.equals("")) && id.equals("code")) {
+			parameter = parameter.replace("\"id\":code", "\"id\":\""+ item_id_L + "\"");
+		}
+
+		user_id = MapUtil.killQuotes(user_id, "\"");
+		id = MapUtil.killQuotes(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("id", 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("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/resources/system.xml

@@ -39,14 +39,14 @@
 		<client_secret>bestbuy-acceptance</client_secret>
 		<grant_type>client_credentials</grant_type>
 		<isProduct>false</isProduct>
-		<RM_URI>http://test.tiku.eoffcn.com</RM_URI>
+		<RM_URI>http://tiku.t.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/tiku?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull</sqlurl>
-		<sqlname>testTest</sqlname>
-		<sqlpwd>7b467efW#$%f5c50aa3d</sqlpwd>
+		<sqlurl>jdbc:mysql://rm-2zevlk47ul0ovuci80o.mysql.rds.aliyuncs.com:3306/tiku?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull</sqlurl>
+		<sqlname>pre_tiku</sqlname>
+		<sqlpwd>ufNie8h9ywWCfewcXqyOQsaDf8TEJH</sqlpwd>
 	</system>
 	
 	<system name="tknewApp"><!-- 题库新接口 -->