Commit 89080b3c by wff66504

Merge branch 'master' of

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

Conflicts:
	tiku_App/src/com/offcn/api/tk/app3/getPaperStatusNwn.java
	tiku_App/src/com/offcn/api/tk/app3/getUserIdBySsoId.java
	tiku_App/src/com/offcn/api/tk/app3/releaseScoreToStudent.java
parents 6b207261 9b994848
......@@ -39,7 +39,9 @@ import net.sf.json.JSONObject;
*/
public class getPaperStatusNwn extends TK implements API {
public String parameter;//参数集合
public String record_id_excel;//试卷使用记录id
public String record_id;//试卷使用记录id
public String status;//试卷状态(默认值:0)
......@@ -48,17 +50,33 @@ public class getPaperStatusNwn extends TK implements API {
if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
cleanUser_FromDB();//清除注册用户根据user_id
}
try {
String sql = "SELECT use_id FROM `t_paper_use_record` WHERE is_statis = 2 AND is_done =1 AND is_release =0 AND channel <>1 LIMIT 1";
ResultSet rs_bankcard = this.sqlFromDB(sql);
rs_bankcard.last();
record_id =rs_bankcard.getString("use_id");
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
// 获取parameter对应的内容
parameter = MapUtil.getValue("parameter", data);
record_id = MapUtil.getParameter(parameter, "record_id").trim();
record_id_excel = MapUtil.getParameter(parameter, "record_id").trim();
status = MapUtil.getParameter(parameter, "status").trim();
if ((!record_id.equals("")) && record_id.equals("code")) {
record_id= nwn_record_id;
if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) {
parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
}
data.put("parameter", parameter);
......
package com.offcn.api.tk.app3;
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.TestUnti.ListUtil;
import net.sf.json.JSONObject;
/**
* .IIP获取user_id及token接口
*
* @author lyy
*
*/
public class getUserIdBySsoId extends TK implements API {
public String parameter;//参数集合
public String sso_id;//用户id
public String phone;//用户手机号
public String code;//手机验证码
public String login_type;//第三方登录方式
@Override
public void initialize(HashMap<String, Object> data) {
}
@Override
public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
// 获取parameter对应的内容
parameter = MapUtil.getValue("parameter", data);
sso_id = MapUtil.getParameter(parameter, "sso_id").trim();
if ((!sso_id.equals("")) && sso_id.equals("code")) {
sso_id="3620016";
parameter = parameter.replace("\"sso_id\":code", "\"sso_id\":\""+ sso_id + "\"");
}
data.put("parameter", parameter);
return data;
}
@Override
public Response SendRequest(HashMap<String, Object> data, String Url,
String Request) {
//Response re = RequestDataUtils.Post_token(data, Url,tk_token);
Response re = RequestDataUtils.Post_NOToken(data, Url);
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("0".equals(code)){
String token=jp.getString("data.token");
tk_token = MapUtil.killQuotes(token, "\"");//保存token
System.out.println("tk_token=====" + tk_token);
//是否验证数据库
if (!isProduct) {
// if(phone.length()<60){
// if(!(dataPhone.equals(act_phone) && (dataPhone.equals(phone)))){
// result = result && false;
// failReason = failReason + "t_user info phone is not in DB;";
// }
// }
//
// if(login_type.length()<60){
// if(!(datalogin_type.equals(act_login_type) && (datalogin_type.equals(login_type)))){
// result = result && false;
// failReason = failReason + "t_user info system is not in DB;";
// }
// }
}
}
}
if (result)
return "Pass";
else
return "Fail:" + failReason;
}
}
......@@ -39,7 +39,9 @@ import net.sf.json.JSONObject;
public class releaseScoreToStudent extends TK implements API {
public String parameter;//参数集合
public String record_id_excel;//试卷使用记录id
public String record_id;//试卷使用记录id
......@@ -48,17 +50,32 @@ public class releaseScoreToStudent extends TK implements API {
if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
cleanUser_FromDB();//清除注册用户根据user_id
}
try {
String sql = "SELECT use_id FROM `t_paper_use_record` WHERE is_statis = 2 AND is_done =1 AND is_release =0 AND channel <>1 LIMIT 1";
ResultSet rs_bankcard = this.sqlFromDB(sql);
rs_bankcard.last();
record_id =rs_bankcard.getString("use_id");
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
// 获取parameter对应的内容
parameter = MapUtil.getValue("parameter", data);
record_id_excel = MapUtil.getParameter(parameter, "record_id").trim();
record_id = MapUtil.getParameter(parameter, "record_id").trim();
if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) {
if ((!record_id.equals("")) && record_id.equals("code")) {
record_id= nwn_record_id;
parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
}
data.put("parameter", parameter);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment