Merge branch 'master' of

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

Conflicts:
	tiku_App/src/com/offcn/test/APITest_tk.java
	tiku_App/src/makeTestCase/MakeTestCases.java
	tiku_App/src/resources/test.properties

tiku_App/src/com/offcn/api/tk/app3/visitor.java

@@ -31,24 +31,25 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 游客模式登录
+ * 77. 获取模考科目的状态=======
  * 
  * @author puhui
  *
  */
 public class visitor extends TK implements API {
-	public String parameter;//
+	public String parameter;//参数集合
 	
-	public String device_id;//
-	public String platform;//
-	public String version;//
+	public String device_id;//设备ID ，用于识别游客设备身份
+	public String platform;//默认只有iphone有游客模式
+	public String version;//版本
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
-//		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
-//			cleanUser_FromDB();
-//		}
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
 		}
+	}
+
 
 	@Override
 	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {

tiku_App/src/com/offcn/test/APITest_tk.java

@@ -90,7 +90,7 @@ public class APITest_tk extends BasicsGM{
 	  
 	  //数据回写
 //	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-//	  SheetUtils sheet = new SheetUtils("DataAllMr.xls", "Output");
+//	  SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
 //	  sheet.writeExcel(
 //			  		data.get("NO").toString(),
 //				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
@@ -103,7 +103,7 @@ public class APITest_tk extends BasicsGM{
 //					result,
 //					time
 //					);
-
+//	  
 	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();

tiku_App/src/makeTestCase/MakeTestCases.java

@@ -319,7 +319,7 @@ public class MakeTestCases {
 //		System.out.println(nameList);
 		
 		for(int i=0;i<MakeTestCases.state;i++){
-			List<Set<String>> a=TestCase_N("TestData/CaseMake.xls",SheetList.get(i),nameList.get(i));
+			List<Set<String>> a=TestCase_N("TestData/CaseMakeWff.xls",SheetList.get(i),nameList.get(i));
 			listt.add(a.get(0));
 			listf.add(a.get(1));
 		}	

tiku_App/src/resources/test.properties

-xls=DataAllMr.xls
-sheet=TestCase1
+xls=DataAllWff.xls
+sheet=Sheet1
 mysql_local_Online=local
 Percentage=60

tiku_App/src/test/t1.java

@@ -3,13 +3,15 @@ package test;
 import java.util.Iterator;
 import java.util.Set;
 
+import com.offcn.TestUnti.MyDateUtil;
+
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 
 public class t1 {
 
-	public static void main(String[] args) {
+	public static void main1(String[] args) {
 		
 		
 		String str="{\"houseBasicInfo\": {\"address\": \"***&*&*&87\",\"area\": \"北京市\",\"cardPic\": \"cardpiccardpiccardpic\",\"city\": \"北京市\",\"contract\": \"contract\",\"contractNo\": \"100000004\",\"idNo\": \"11022119811222061X\",\"name\": \"姚帅\",\"payAmount\": 10000,\"phone\": \"13910960649\",\"rentBegin\": \"2017-07-21\",\"rentEnd\": \"2018-07-21\",\"rental\": 5000,\"rentalType\": 1,\"roomId\": \"11\",\"roomNum\": \"1101室\",\"suiteId\": \"111\",\"termNum\": 12,\"thirdUserId\": \"1\",\"timeStamp\": \"123123123\"},\"merchantName\": \"蛋壳第一商户\",\"receiveContractInfo\": {\"area\": \"北京\",\"attachment\": \"attachment\",\"city\": \"北京\",\"contractNo\": \"0000001231231231\",\"endTime\": \"2017-07-21\",\"personIdNo\": \"110102198907132328\",\"personName\": \"小五\",\"rentalAddress\": \"北京市朝阳区银河SOHO1101室\",\"startTime\": \"2018-07-21\",\"subCompany\": \"蛋壳租房\"},\"source\": 0}";
@@ -53,4 +55,8 @@ public class t1 {
 //         System.out.println(jo1.get("phone"));
          
 	}
+	
+	public static void main(String[] args) {
+		System.out.println(MyDateUtil.getTime_php(2,0,0));
+	}
 }