Merge branch 'master' of

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

Conflicts:
	tiku_App/TestData/CaseMake.xls
	tiku_App/src/com/offcn/api/tk/app2/getRecommend.java

tiku_App/src/com/offcn/api/tk/app2/getRecommend.java

-package com.offcn.api.tk.app2;
-
-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;
-
-
-
-/**
- * 8. 获取首页轮播图
- * 
- * @author liyy
- *
- */
-public class getRecommend extends TK implements API {
-	public String parameter;//参数集合
-
-	public String exam_id;//考试id
-
-	@Override
-	public void initialize(HashMap<String, Object> data) {
-		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
-			cleanUser_FromDB();//清除注册用户根据user_id
-		}
-	}
-
-	@Override
-	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
-		// 获取parameter对应的内容
-		parameter = MapUtil.getValue("parameter", data);
-		
-		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
-		
-		if ((!exam_id.equals("")) && exam_id.equals("exam_id")) {
-			exam_id="80";
-			parameter = parameter.replace("\"exam_id\":exam_id", "\"exam_id\":\""+ exam_id + "\"");
-		}
-		
-		data.put("parameter", parameter);
-		return data;
-	}
-
-	@Override
-	public Response SendRequest(HashMap<String, Object> data, String Url,
-			String Request) {
-		Map<String, String> headers=new HashMap<String, String>();
-		headers.put("Authorization", tk_token);
-		
-		MyRequest myRequest=new MyRequest();
-		myRequest.setHeaders(headers);
-		myRequest.setRequest(Request);
-		myRequest.setUrl(Url);
-		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 = StringUtils.decodeUnicode(re.asString());
-
-		if ((data.get("statusCode") != null)
-				&& (!data.get("statusCode").toString()
-						.equals(String.valueOf(re.getStatusCode())))) {
-			result = result && false;
-			failReason = failReason + "statusCode is expected "
-					+ data.get("statusCode").toString() + " but actually "
-					+ String.valueOf(re.getStatusCode()) + ". ";
-		}
-
-		if (json.length() != 0) {
-			
-			String msg=jp.getString("message");
-			String code=jp.getString("retcode");
-			
-			
-			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
-				result = result && false;
-				failReason = failReason + "code is expected "
-						+ data.get("code").toString() + " but actually "
-						+ jp.getString("retcode") + ".";
-			}
-
-			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
-				result = result && false;
-				failReason = failReason + "msg is expected "
-						+ data.get("msg").toString() + " but actually "
-						+ jp.getString("retcode") + ".";
-			}
-			System.out.println(data.get("custom"));
-			System.out.println(json);
-			if(data.get("custom") != null && json!=null){
-				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
-				if(data.get("custom").toString().contains(",")){
-					String [] strCustomStrings=data.get("custom").toString().split(",");
-					for(int i=0;i<strCustomStrings.length;i++){
-						if(!json.contains(strCustomStrings[i])){
-							result = result && false;
-							failReason = failReason + "custom is expected "
-									+ data.get("custom").toString() + " but actually "
-									+ strCustomStrings[i] + ".";
-							break;
-						}
-					}
-				}else{//如果只有一个希望结果，就直接包含比较。
-					if(!json.contains(data.get("custom").toString())){
-						result = result && false;
-						failReason = failReason + "custom is expected "
-								+ data.get("custom").toString() + " but actually "
-								+ data.get("custom").toString() + ".";
-					}
-				}
-			}
-			
-			if("0".equals(code)){
-				/*L_record_sub_id=jp.getString("data.record_sub_id");
-				L_mock_subject_id=jp.getString("data.mock_subject_id");*/
-			}
-		}
-		if (result)
-			return "Pass";
-		else
-			return "Fail:" + failReason;
-	}
-
-}