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

nwn_Api_auto_test/src/DefectTest.xml

@@ -6,7 +6,7 @@
     <classes>
       <class name="com.puhui.test.RenMai_APITest">
         <methods>
-          <include name="f" invocation-numbers="0 1 2 3 4 5 6 7 8 "/>
+          <include name="f" invocation-numbers="0 1 2 3 "/>
         </methods>
       </class>
     </classes>

nwn_Api_auto_test/src/com/offcn/TestUnti/HttpRequest.java

+package com.offcn.TestUnti;
+
+
+
+import io.restassured.response.Response;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.List;
+import java.util.Map;
+
+public class HttpRequest {
+    /**
+     * 向指定URL发送GET方法的请求
+     * 
+     * @param url
+     *            发送请求的URL
+     * @param param
+     *            请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @return URL 所代表远程资源的响应结果
+     */
+	 public static void main(String[] args) {
+//		 Response s=HttpRequest.sendGet("http://beta.alitest.eoffcn.com/template/addStuden/sign/a75f95ec663ebda46b51f0429b8706ff",
+//	    			"user_info=[{\"package_id\":391634,\"username\":\"aaa\",\"phone\":15652333337,\"sso_id\":1}]&timestamp=1548839088&appid=jiaowu");
+				Response re = HttpRequest.sendGet("http://beta.alitest.eoffcn.com/template/addStudent/sign/1c7e3e07567efbcd42b2fa6cd936784e",
+	    			"user_info=[{\"package_id\":391634,\"username\":\"aaa\",\"phone\":15652333337,\"sso_id\":1}]&timestamp=1548841430&appid=jiaowu");
+
+		 
+		 System.out.println(re.getStatusCode());
+		 System.out.println(re.asString());
+		 //	    	try {
+//	    		String s1=new String(s.getBytes(),"utf-8");
+//				System.out.println(s1);
+//			} catch (UnsupportedEncodingException e) {
+//				e.printStackTrace();
+//			}
+	    }
+	
+    public static Response sendGet(String url, String param) {
+        String result = "";
+        String val="";
+        BufferedReader in = null;
+        Response re=null;
+        try {
+//            String urlNameString = url ;
+            String urlNameString = url + "?" + param;
+            URL realUrl = new URL(urlNameString);
+            // 打开和URL之间的连接
+            URLConnection connection = realUrl.openConnection();
+            // 设置通用的请求属性
+            connection.setRequestProperty("Authorization", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6NSwicGhvbmUiOiIxODUxMTg1MjA0OSIsImlhdCI6MTQ4NzEzMjU0OX0.2aZ8FcfE52CYpXc4VUYjdfzzLzXwVOE-J8CnMlhUPic");
+            connection.setRequestProperty("Content-Type", "application/json");
+            // 建立实际的连接
+            connection.connect();
+            // 获取所有响应头字段
+            Map<String, List<String>> map = connection.getHeaderFields();
+            // 遍历所有的响应头字段
+            for (String key : map.keySet()) {
+            	String va=map.get(key).toString();
+                //System.out.println(key + "--->" + va);
+                if(va.contains("HTTP/1.1")){
+                	val=va.toString().substring(10, va.toString().length()-4);
+                	//System.out.println(val);
+                	
+                }
+            }
+            // 定义 BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(
+                    connection.getInputStream()));
+           
+            
+            String line;
+            while ((line = in.readLine()) != null) {
+//            	 o.write(line+"\r\n");
+                result += line;
+                result += "\r\n";
+            }
+//            o.close();
+
+            IoResponse ir=new IoResponse();
+            re=ir.setResponseValue(val,result);
+            
+            
+        } catch (Exception e) {
+            System.out.println("发送GET请求出现异常！" + e);
+            e.printStackTrace();
+        }
+        // 使用finally块来关闭输入流
+        finally {
+            try {
+                if (in != null) {
+                    in.close();
+                }
+            } catch (Exception e2) {
+                e2.printStackTrace();
+            }
+        }
+        return re;
+    }
+
+    /**
+     * 向指定 URL 发送POST方法的请求
+     * 
+     * @param url
+     *            发送请求的 URL
+     * @param param
+     *            请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @return 所代表远程资源的响应结果
+     */
+   
+    public static String sendPost(String url, String param) {
+        PrintWriter out = null;
+        BufferedReader in = null;
+        String result = "";
+        try {
+            URL realUrl = new URL(url);
+            // 打开和URL之间的连接
+            URLConnection conn = realUrl.openConnection();
+            // 设置通用的请求属性
+            conn.setRequestProperty("Authorization", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6NSwicGhvbmUiOiIxODUxMTg1MjA0OSIsImlhdCI6MTQ4NzEzMjU0OX0.2aZ8FcfE52CYpXc4VUYjdfzzLzXwVOE-J8CnMlhUPic");
+            conn.setRequestProperty("Content-Type", "application/json");
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // 获取URLConnection对象对应的输出流
+            out = new PrintWriter(conn.getOutputStream());
+            // 发送请求参数
+            out.print(param);
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream()));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+                result += "\r\n";
+            }
+        } catch (Exception e) {
+            System.out.println("发送 POST 请求出现异常！"+e);
+            e.printStackTrace();
+        }
+        //使用finally块来关闭输出流、输入流
+        finally{
+            try{
+                if(out!=null){
+                    out.close();
+                }
+                if(in!=null){
+                    in.close();
+                }
+            }
+            catch(IOException ex){
+                ex.printStackTrace();
+            }
+        }
+        return result;
+    }    
+}

nwn_Api_auto_test/src/com/offcn/TestUnti/IoResponse.java

+package com.offcn.TestUnti;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import io.restassured.http.Cookie;
+import io.restassured.http.Cookies;
+import io.restassured.http.Headers;
+import io.restassured.mapper.ObjectMapper;
+import io.restassured.mapper.ObjectMapperType;
+import io.restassured.path.json.JsonPath;
+import io.restassured.path.json.config.JsonPathConfig;
+import io.restassured.path.xml.XmlPath;
+import io.restassured.path.xml.XmlPath.CompatibilityMode;
+import io.restassured.path.xml.config.XmlPathConfig;
+import io.restassured.response.Response;
+import io.restassured.response.ResponseBody;
+import io.restassured.response.ValidatableResponse;
+
+
+
+public class IoResponse {
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+
+	}
+	
+	public Response setResponseValue(final String StatusCode,final String asString){
+		Response re= new Response() {
+			
+			@Override
+			public ValidatableResponse then() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public long timeIn(TimeUnit arg0) {
+				// TODO Auto-generated method stub
+				return 0;
+			}
+			
+			@Override
+			public long time() {
+				// TODO Auto-generated method stub
+				return 0;
+			}
+			
+			@Override
+			public Response thenReturn() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String statusLine() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public int statusCode() {
+				// TODO Auto-generated method stub
+				return 0;
+			}
+			
+			@Override
+			public String sessionId() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Headers headers() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String header(String arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public long getTimeIn(TimeUnit arg0) {
+				// TODO Auto-generated method stub
+				return 0;
+			}
+			
+			@Override
+			public long getTime() {
+				// TODO Auto-generated method stub
+				return 0;
+			}
+			
+			@Override
+			public String getStatusLine() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public int getStatusCode() {
+				// TODO Auto-generated method stub
+				return Integer.valueOf(StatusCode);
+			}
+			
+			@Override
+			public String getSessionId() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Headers getHeaders() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String getHeader(String arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Cookies getDetailedCookies() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Cookie getDetailedCookie(String arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Map<String, String> getCookies() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String getCookie(String arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String getContentType() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public ResponseBody getBody() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Cookies detailedCookies() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Cookie detailedCookie(String arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Map<String, String> cookies() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String cookie(String arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String contentType() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public ResponseBody body() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Response andReturn() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String asString() {
+				// TODO Auto-generated method stub
+				return asString;
+			}
+			
+			@Override
+			public InputStream asInputStream() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public byte[] asByteArray() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public XmlPath xmlPath(CompatibilityMode arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public XmlPath xmlPath(XmlPathConfig arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public XmlPath xmlPath() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public <T> T path(String arg0, String... arg1) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public JsonPath jsonPath(JsonPathConfig arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public JsonPath jsonPath() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public XmlPath htmlPath() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public <T> T as(Class<T> arg0, ObjectMapper arg1) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public <T> T as(Class<T> arg0, ObjectMapperType arg1) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public <T> T as(Class<T> arg0) {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String print() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public String prettyPrint() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Response prettyPeek() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+			
+			@Override
+			public Response peek() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+		};
+		
+		return re;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/TestUnti/RequestDataUtils.java

@@ -1018,7 +1018,6 @@ public class RequestDataUtils {
         return re;
     }    
     
-    
     @SuppressWarnings("static-access")
     public static Response Get_one_cookie_pre(HashMap<String, Object> data,
                                           String serviceURL,
@@ -1186,4 +1185,5 @@ public class RequestDataUtils {
 		}
 		return re;
 	}
+  	
 }

nwn_Api_auto_test/src/com/offcn/api/nwn/editOutline.java

@@ -102,6 +102,7 @@ public class editOutline extends NWN implements API {
 			parameter = parameter.replace("id=id", "id="+ c_id );
 		}	
 		
+		
 		data.put("parameter", parameter);
 		return data;
 	}

nwn_Api_auto_test/src/com/offcn/api/nwn/md5/LMFMD5.java

 package com.offcn.api.nwn.md5;
 
+import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 public class LMFMD5 {
     //����һ����LMFMD5
-    public static String MD5(String sourceStr) {
+    public static String MD5(String str) {
+    	
+    	/*
         String result = "";
         try {
             MessageDigest md = MessageDigest.getInstance("MD5");
@@ -31,7 +34,37 @@ public class LMFMD5 {
         } catch (NoSuchAlgorithmException e) {
             System.out.println(e);
         }
-        return result;
+        return result;*/
+    	
+    	
+    
+            MessageDigest messageDigest = null;
+            try {
+                messageDigest = MessageDigest.getInstance("MD5");
+                messageDigest.reset();
+
+                messageDigest.update(str.getBytes("UTF-8"));
+            } catch (NoSuchAlgorithmException e) { // NOSONAR
+                System.out.println(e.getMessage());
+            } catch (UnsupportedEncodingException e) { // NOSONAR
+                System.out.println(e.getMessage());
+            }
+
+            byte[] byteArray = messageDigest.digest();
+
+            StringBuffer md5StrBuff = new StringBuffer();
+
+            for (int i = 0; i < byteArray.length; i++) {
+                if (Integer.toHexString(0xFF & byteArray[i]).length() == 1)
+                    md5StrBuff.append("0").append(Integer.toHexString(0xFF & byteArray[i]));
+                else
+                    md5StrBuff.append(Integer.toHexString(0xFF & byteArray[i]));
+            }
+
+//            return md5StrBuff.toString().toUpperCase();
+            return md5StrBuff.toString();
+        
+        
     }
 }
 

nwn_Api_auto_test/src/com/offcn/api/nwn/md5/nwngetsign.java

 package com.offcn.api.nwn.md5;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
+
 import com.offcn.process.NWN;
 public class nwngetsign {
 		
@@ -27,9 +30,9 @@ public class nwngetsign {
   		System.out.println("sortstring====" + sortstring);
   		String str = sortstring.toString();
   		  		
-  		
   		str = str + "bf2h3%^j?ljkj3706kji88697"; //教务的加密，规则固定需要加 
   		System.out.println("str===" + str);
+  		NWN.suprise_str = str;
     	//String str1 = "appid=tiku&avatar=http://thirdqq.qlogo.cn/qqapp/1106773681/5B50BBF83A00DC46B16B708F720A5D46/100&device_id=861837034477409&login_type=qq&nickname=hobo&open_id=1&platform=Android&version=1"+"&123456"; 
     String res = new LMFMD5().MD5(str);
     System.out.println("res===" +res);

nwn_Api_auto_test/src/com/offcn/api/nwn/service/addStudent.java

+package com.offcn.api.nwn.service;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.io.UnsupportedEncodingException;
+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.HttpRequest;
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.api.nwn.ifUpdatePackage;
+import com.offcn.api.nwn.md5.nwngetsign;
+import com.offcn.interfaces.API;
+import com.offcn.process.NWN;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+/**
+ * 添加学员信息
+ * 
+ * @author liyy
+ * 
+ */
+public class addStudent extends NWN implements API {
+
+	public String parameter;// 参数集合
+
+	public String package_id;// 母板ID
+
+	public String phone;//
+
+	public String user_info;//
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		// try {
+		// Thread.sleep(20000);
+		// } catch (InterruptedException e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		
+		timestamp = MapUtil.getParameter_get(parameter, "timestamp").trim();
+		user_info = MapUtil.getParameter_get(parameter, "user_info").trim();
+		
+		if ((!user_info.equals("")) && user_info.contains("package_id")) {
+			package_id=ListUtil.getListValue(n_package_idList, 0);
+			parameter = parameter.replace("\"package_id\":package_id", "\"package_id\":"
+					+ package_id);
+		}
+		
+		if ((!user_info.equals("")) && user_info.contains("phone")) {
+			phone = "1351" + (new Random().nextInt(9000000) + 1000000);
+			parameter = parameter.replace("\"phone\":phone", "\"phone\":"
+					+ phone);
+		}
+		if ((!user_info.equals("")) && user_info.contains("phone1")) {
+			phone = "1331" + (new Random().nextInt(9000000) + 1000000);
+			parameter = parameter.replace("\"phone\":phone1", "\"phone\":"
+					+ phone);
+		}
+		if ((!user_info.equals("")) && user_info.contains("phone2")) {
+			phone = "1321" + (new Random().nextInt(9000000) + 1000000);
+			parameter = parameter.replace("\"phone\":phone2", "\"phone\":"
+					+ phone);
+		}
+
+		if ((!timestamp.equals("")) && timestamp.equals("timestamp")) {
+			Long timeString = System.currentTimeMillis();
+			timestamp = timeString.toString().substring(0, 10);
+			parameter = parameter.replace("timestamp=timestamp", "timestamp="
+					+ timestamp);
+		}
+
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		System.out.println("url ===" + Url);
+		System.out.println("parameter ===" + parameter);
+		Response re = HttpRequest.sendGet("http://beta.alitest.eoffcn.com"
+				+ Url, parameter);
+
+		/*
+		 * System.out.println(re.getStatusCode());
+		 * System.out.println(re.asString());
+		 */
+		// http://beta.alitest.eoffcn.com/template/addStuden/sign/0e74b43cefd12b43705d22cfdd744efd
+		// user_info=[{"package_id":391634,"username":"aaa","phone":15652333337,"sso_id":1}]&timestamp=1548837998&appid=jiaowu
+		/*
+		 * Response re =HttpRequest.sendGet(
+		 * "http://beta.alitest.eoffcn.com/template/addStuden/sign/5d114486999208096dace001ae4bc45a"
+		 * ,
+		 * "user_info=[{\"package_id\":391634,\"username\":\"aaa\",\"phone\":15656333337,\"sso_id\":1}]&timestamp=1548828632&appid=jiaowu"
+		 * );
+		 */
+		// Response re =
+		// HttpRequest.sendGet("http://beta.alitest.eoffcn.com/template/addStudent/sign/2e90e16d93702c6d900577322063463c",
+		// "user_info=[{\"package_id\":391634,\"username\":\"aaa\",\"phone\":15652333337,\"sso_id\":1}]&timestamp=1548840818&appid=jiaowu");
+
+		return re;
+
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = new JsonPath(re.asString());
+		System.out.println("jp====" + jp);
+		boolean result = true;
+		String failReason = "";
+
+		String json = re.asString();
+		System.out.println("response=========="
+				+ StringUtils.decodeUnicode(json));
+		json = StringUtils.decodeUnicode(json);
+		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) {
+
+			if (!json.contains(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(",");
+					System.out.println(strCustomStrings.length);
+					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 (json.contains(data.get("msg").toString())) {
+
+				// 是否验证数据库
+				/*
+				 * if (!isProduct) {
+				 * 
+				 * String
+				 * data_res=jp.getString("data").substring(0,jp.getString(
+				 * "data").length());
+				 * 
+				 * System.out.println("data_res====="+ data_res ); try { String
+				 * sql
+				 * ="SELECT MAX(id) AS  id   FROM `n_package`  WHERE template_id = "
+				 * + template_id; //SELECT id FROM n_template ORDER BY id DESC
+				 * LIMIT 1 ResultSet rs_bankcard = this.sqlFromDB(sql);
+				 * rs_bankcard.last();
+				 * System.out.println("after findedupack ============"+
+				 * rs_bankcard.getString("id"));
+				 * if(Integer.parseInt(rs_bankcard.getString("id")) >=
+				 * Integer.parseInt("1")) {
+				 * n_package_idList.add(rs_bankcard.getString("id")); }else {
+				 * result = result && false; failReason = failReason +
+				 * "edupack info in DB is wrong;"; }
+				 * 
+				 * 
+				 * } catch (Exception e) { result = result && false; failReason
+				 * = failReason + "cannot verify edupack info in DB;";
+				 * e.printStackTrace(); } }
+				 */
+
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

nwn_Api_auto_test/src/com/offcn/api/nwn/service/delEduPackage.java

@@ -29,7 +29,7 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 添加母版层级
+ * 删除班级(教务包)
  * 
  * @author liyy
  *

nwn_Api_auto_test/src/com/offcn/api/nwn/service/findEdupack.java

@@ -29,7 +29,7 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 添加母版层级
+ *  查找母版下是否有对应的教务包
  * 
  * @author liyy
  *

nwn_Api_auto_test/src/com/offcn/api/nwn/service/addStuden.java → nwn_Api_auto_test/src/com/offcn/api/nwn/service/getOnePackInfo.java

@@ -29,21 +29,36 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 添加学员信息
+ * 获取单个班级信息
  * 
  * @author liyy
  *
  */
-public class addStuden extends NWN implements API {
+public class getOnePackInfo extends NWN implements API {
 	
 	public String parameter;//参数集合
 	
 	public String template_id_1;//母板ID
-
+	public String  package_id;
+	public String  del_package_id;
 //	public String phone;//层级包id
 	@Override
 	public void initialize(HashMap<String, Object> data) {
 		
+		try {
+			String sql="SELECT  MAX(id) AS id  FROM `n_package`  WHERE  deleted_at IS NOT NULL ";
+			//SELECT  id FROM  n_template ORDER BY id DESC LIMIT 1
+			ResultSet rs_bankcard = this.sqlFromDB(sql);
+			rs_bankcard.last();
+			
+			del_package_id = rs_bankcard.getString("id");
+			System.out.println("del_package_id====" + del_package_id);
+		} catch (Exception e) {
+			
+			e.printStackTrace();
+		}
+		
+		
 	}
 
 	@Override
@@ -52,12 +67,19 @@ public class addStuden extends NWN implements API {
 		parameter = MapUtil.getValue("parameter", data);
 		template_id_1 = MapUtil.getParameter_get(parameter, "template_id").trim();
 		timestamp = MapUtil.getParameter_get(parameter, "timestamp").trim();
-		
+		package_id = MapUtil.getParameter_get(parameter, "package_id").trim();
 		if ((!template_id_1.equals("")) && template_id_1.equals("template_id")) {
-			template_id_1 = "["+ template_id +","+(Integer.parseInt(template_id)-1)+"]";
+			template_id_1 =  template_id;
 			parameter = parameter.replace("template_id=template_id", "template_id="+ template_id_1 );
 		}
+		if ((!package_id.equals("")) && package_id.equals("package_id")) {
+			package_id=ListUtil.getListValue(n_package_idList, 0);
+			parameter = parameter.replace("package_id=package_id", "package_id="+ package_id );
+		}
+		if ((!package_id.equals("")) && package_id.equals("del_package_id")) {
 			
+			parameter = parameter.replace("package_id=del_package_id", "package_id="+ del_package_id );
+		}
 		
 		if ((!timestamp.equals("")) && timestamp.equals("timestamp")) {
 			Long timeString= System.currentTimeMillis();
@@ -153,35 +175,36 @@ public class addStuden extends NWN implements API {
 			
 			if("0".equals(code)){
 				
-			
+				//创建后数据库在哪个表
 				//是否验证数据库
-				/*if (!isProduct) {
+				if (!isProduct) {
 					
-					String data_res=jp.getString("data").substring(0,jp.getString("data").length());
+					/*template_id=jp.getString("data.id").substring(0,jp.getString("data.id").length());
 					
-					System.out.println("data_res====="+ data_res );
+					System.out.println("template_id====="+ template_id );*/
 					try {
-						String sql="SELECT MAX(id) AS  id   FROM `n_package`  WHERE template_id = " + template_id;
+						String sql="SELECT  deleted_at  FROM `n_package`  WHERE  id =  " + del_package_id;
 						//SELECT  id FROM  n_template ORDER BY id DESC LIMIT 1
 						ResultSet rs_bankcard = this.sqlFromDB(sql);
 						rs_bankcard.last();
-						System.out.println("after findedupack ============"+ rs_bankcard.getString("id"));
-						if(Integer.parseInt(rs_bankcard.getString("id")) >= Integer.parseInt("1"))
+						System.out.println("after deleted_packate ============"+ rs_bankcard.getString("deleted_at"));
+						if(rs_bankcard.getString("deleted_at").contains("2019") )
 						{
-							n_package_idList.add(rs_bankcard.getString("id"));
+							
+							
 						}else {
 							result = result && false;
-							failReason = failReason + "edupack info in DB is wrong;";
+							failReason = failReason + "deleted_packate  is wrong;";
 						}
 						
 						
 					} catch (Exception e) {
 						result = result && false;
-						failReason = failReason + "cannot verify edupack info in DB;";
+						failReason = failReason + "cannot verify template_id info in DB;";
 						e.printStackTrace();
 					}
 				}
-		*/
+			
 			
 			}
 		}

nwn_Api_auto_test/src/com/offcn/process/NWN.java

@@ -47,6 +47,7 @@ public class NWN extends BasicsGM{
 	public static List<String> user_id_List = new ArrayList<String>();//user_id
 	public static String template_id = "";
 	public static String timestamp;//时间戳 
+	public static String suprise_str;//特殊字符
 //	public static String phone_code = "";//手机号验证码
 //	
 //	

nwn_Api_auto_test/src/makeTestCase/MakeTestCases190131.java

+package makeTestCase;
+
+
+
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.offcn.TestUnti.SheetUtils;
+
+import net.sf.json.JSONObject;
+
+public class MakeTestCases190131 {
+	
+	public static int state=0;//代表有其他页面没有，0标示没有，1表示有一个，2表示有两个
+	
+	public static List<String> SheetList=new ArrayList<String>();//sheet页面的名称，里面存的是sheet2，sheet3之类的sheet页名称
+	
+	public static List<String> nameList=new ArrayList<String>();//包含sheet页面对应的字段名称
+	
+	public static List<String> List_1=new ArrayList<String>();//List_1
+	public static List<String> List_4=new ArrayList<String>();//List_4
+	public static List<String> List_5=new ArrayList<String>();//List_5
+	
+	public static List<List<String>> list_all=new ArrayList<List<String>>();//缺失字段，最后判断是否应该算正向还是反向
+	
+	public static void main(String[] args) {
+
+		make("TestData/CaseMake.xls","Sheet1");
+	}
+	
+	
+	public static void make(String FilePath,String SheetName){
+		//获取用例
+		List<String> listSum=TestCase(FilePath,SheetName);
+        Set<String> set=new HashSet<String>();         
+        set.addAll(listSum);
+        listSum.clear();   
+        listSum.addAll(set);
+        
+        for (String string : listSum) {
+			System.out.println(string);	
+		}
+		
+        List<String> TeseName= TestCaseName(listSum);
+//        System.out.println("用例数"+listSum.size());
+//        System.out.println("用例名字数"+TeseName.size());
+        
+		//获取接口全信息
+		String AllPath="";
+		try {
+			AllPath=new readExcels().readExcels_path(FilePath,SheetName);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		String[] apipath=AllPath.split("/");
+		
+		//获取接口类名
+		String leiming=apipath[apipath.length-1];
+		
+		//获取接口路径
+		int w=AllPath.indexOf("/");
+		String path=AllPath.substring(w);
+		
+		String name=FilePath.split("/")[1];
+		//获取接口名
+		String jieKouMing=apipath[0];
+		//生成测试用例
+		for(int i=0;i<listSum.size();i++){
+			outCase(i,leiming,jieKouMing,TeseName.get(i),path,listSum.get(i),name,"OutPage");
+		}
+		
+				
+	}
+	//第一个参数是数量，第二个参数是接口类名，第三个参数是中文名
+	public static void outCase(int i,String leiming,String jieKouMing,String TeseName,String path,String cases,String wenjianming,String Sheet){
+		
+		Date d = new Date();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String s = sdf.format(d);
+		
+		//数据回写
+		  SheetUtils sheet = new SheetUtils(wenjianming,Sheet);
+		  sheet.writeExcel(
+
+				  		(i+1)+"",
+				  		leiming + "_" + (i+1),
+				  		(i+1)+"", 
+				  		jieKouMing+"-"+TeseName,
+				  		"nwn",
+					  	path,
+						"N", 
+						"post",
+						"200",
+						cases
+						);
+	}
+	
+	//所有测试集合的用例名称
+	public static List<String> TestCaseName(List<String> list){
+		//所有测试集合的用例名称
+		List<String> listt=new ArrayList<String>();
+		
+		List<String> list1_4=zhengxiang(List_1,List_4);
+		List<String> list1_5=zhengxiang(List_1,List_5);
+		
+		
+		//先把测试用例遍历
+		for (int i=0;i<list.size();i++) {
+			String name="";
+//			System.out.println("用例名称："+listt.toString());
+//			System.out.println();
+//			System.out.println("测试用例："+list.get(i));
+//			System.out.println("字段："+List_1.toString());
+//			System.out.println("反向："+list1_5.toString());
+			
+			//每一条测试用例
+			//查看是否缺少字段
+			List<String> list_true=zhengxiang(list.get(i));
+			name=baohan(List_1,list_true);
+			if(!"未缺失".equals(name)){
+				listt.add(name);
+				continue;
+			}
+			
+			name=list1_5(list1_5,list.get(i));
+			if(!"正向用例".equals(name)){
+				listt.add(name);
+				continue;
+			}
+			
+			name=list1_4(list1_4,list.get(i));
+			listt.add(name);
+			
+		}
+		return listt;
+	}
+	
+	//获取正向所有精确字段
+	public static List<String> zhengxiang(String stra){
+		//预返回的集合
+		List<String> listt=new ArrayList<String>();
+		//循环获取到每一个字段的正确集合
+		String ziduan []=stra.split(",");
+		String zuo="";
+		
+		for(int i=0;i<ziduan.length;i++){
+			zuo=ziduan[i];
+			String zhong []=zuo.split(":");
+			// 获取到每一个字段的正确中的一个2，3，4，5，6，
+			if(zhong[0]!=null && zhong[0].length()>2){
+				String a1=zhong[0].substring(1,zhong[0].length()-1);
+				listt.add(a1);
+			}
+		}
+		return listt;
+	}
+	
+	//两个集合：list——1，list——4拼接成正向集合
+	public static List<String> zhengxiang(List<String> list_1,List<String> list_4){
+		//预返回的集合
+		List<String> listt=new ArrayList<String>();
+		String str="";
+		//循环获取到每一个字段的正确集合
+		for(int i=0;i<list_1.size();i++){
+			// 获取到每一个字段的正确中的一个2，3，4，5，6，
+			String zhengxiangfenjie []=list_4.get(i).split(",");
+			for(int j=0;j<zhengxiangfenjie.length;j++){
+				str="\""+list_1.get(i)+"\":"+zhengxiangfenjie[j];
+				listt.add(str);
+			}
+		}
+		return listt;
+	}
+	
+	//用例中是否包含list——5中的信息，如果包含返回"反向用例-XXX"
+	public static String list1_5(List<String> list1_5,String str){
+		String queshideziduan="";
+		for(int i=0;i<list1_5.size();i++){
+			if(str.contains(list1_5.get(i))){
+				queshideziduan=list1_5.get(i);
+			}
+		}
+		if("".equals(queshideziduan)){
+			return "正向用例";
+		}else{
+			return "反向用例-"+queshideziduan;
+		}
+	}
+	
+	
+	//用例中是否包含list——4中的信息，如果包含返回"正向用例"
+	public static String list1_4(List<String> list1_4,String str){
+		String fenjie[] =str.split(",");
+		//测试用例集合
+		List<String> listSum=new ArrayList<String>();
+		for(int i=0;i<fenjie.length;i++){
+			listSum.add(fenjie[i]);
+		}
+		
+		listSum.removeAll(list1_4);
+//		System.out.println(listSum.toString());
+		
+		if(listSum.isEmpty()){
+			return "正向用例";
+		}else{
+			return "反向用例-"+listSum.toString();
+		}
+	}
+	
+	//用例中是否包含list——1中的信息，如果没有返回XXXX字段缺失
+	public static String baohan(List<String> list_1,List<String> list_true){
+		//测试用例集合
+		List<String> listSum=new ArrayList<String>();
+		listSum.addAll(list_1);
+		
+		String queshideziduan="";
+//		System.out.println(listSum.size());
+//		System.out.println(list_true.size());list_all
+		
+		if(listSum.size()!=list_true.size()){
+			listSum.removeAll(list_true);
+			queshideziduan=listSum.toString();
+		}
+		
+		if("".equals(queshideziduan)){
+			return "未缺失";
+		}else{
+			queshideziduan=queshideziduan.substring(1, queshideziduan.length()-1);
+			for(int i=0;i<list_all.size();i++){
+				String NorY=list_all.get(i).toString();
+//				System.out.println(NorY);
+//				System.out.println((", "+queshideziduan+","));
+//				System.out.println(NorY.contains(", "+queshideziduan+","));
+//				System.out.println(NorY.contains(", N,"));
+				if(NorY.contains(", "+queshideziduan+",") && NorY.contains(", N,")){
+					return "正向用例-"+queshideziduan+"非必输项缺失";
+				}
+			}
+			return "反向用例-"+queshideziduan+"缺失";
+		}
+	}
+	
+	public static List<String> TestCase(String path,String Sheet){
+		//测试用例集合
+		List<String> listSum=new ArrayList<String>();
+		
+		readExcels readExcels= new readExcels();
+		List<List<String>> list=null;
+		try {
+			list=readExcels.readExcels_return(path,Sheet);
+			list_all.addAll(list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	
+		List<Set<String>> listt=new ArrayList<Set<String>>();
+		List<Set<String>> listf=new ArrayList<Set<String>>();
+		
+		for (int i=0;i<list.size();i++) {
+			List<String> li=list.get(i);
+			Set<String> sett=new HashSet<String>();
+			Set<String> setf=new HashSet<String>();
+			String name="";
+			Object [] objt=null;
+			Object [] objf=null;
+			for (int j=0;j<li.size();j++) {
+				if(j==1){
+					name=li.get(j).trim();
+					List_1.add(name);
+				}
+				
+				if(j==4){
+//					if("N".equals(li.get(j-1).trim())){
+//						String str=(li.get(j).trim()+",null");
+//						objt=str.split(",");
+//						List_4.add(li.get(j).trim());
+//						List_4.add(null);
+//					}else{
+						objt=li.get(j).trim().split(",");
+						List_4.add(li.get(j).trim());
+//					}
+				}
+				if(j==5){
+					String s="";
+					if("".equals(li.get(j).trim()) || li.get(j).trim()==null){
+						s=""+li.get(2).trim()+","+li.get(3).trim();
+						List_5.add(s);
+					}else{
+						s=""+li.get(j).trim()+","+li.get(2).trim()+","+li.get(3).trim();
+						List_5.add(s);
+					}
+					objf=s.split(",");
+				}
+			}
+			sett=getObject(name,objt,objt[0]+"");
+			setf=getObject(name,objf,objt[0]+"");
+					
+			listt.add(sett);
+			listf.add(setf);
+		}
+//		System.out.println("正向用例"+listt.toString());
+//		System.out.println("反向用例"+listf.toString());
+		
+		//如果random_String.state不等于0说明存在其他sheet页面，如果是2就说明有其他两个sheet页
+//		System.out.println(state);
+//		System.out.println(SheetList);
+//		System.out.println(nameList);
+		
+		for(int i=0;i<MakeTestCases190131.state;i++){
+			List<Set<String>> a=TestCase_N("TestData/CaseMake.xls",SheetList.get(i),nameList.get(i));
+			listt.add(a.get(0));
+			listf.add(a.get(1));
+		}	
+			
+		SheetList.clear();
+		nameList.clear();
+		
+//		System.out.println(listt);
+//		System.out.println(listf);
+		
+		//产生正向的用例
+		Set<String> sum1=getZReslut(listt);
+		Iterator it1 = sum1.iterator();
+		String yongli="";
+		while(it1.hasNext()){
+//			System.out.println(qudouhao(it1.next()+""));
+			yongli=(qudouhao(it1.next()+""));
+			yongli=yongli.replace("~", ",");//将用例所有的波浪线替换回来，替换成逗号
+			listSum.add(yongli);
+		}
+		
+		//产生反向的用例,第一个参数是正确的参数集合支取一个，第二个参数集合是错误的集合
+		for(int i=0;i<listf.size();i++){
+			Set<String> sum2=getFReslut(sum1,listf.get(i));
+//			System.out.println("sum2="+sum2);
+			Iterator it2 = sum2.iterator();
+			while(it2.hasNext()){
+//				System.out.println(qudouhao(it2.next()+""));
+				String ssss=(String) it2.next();
+//				System.out.println(ssss);
+				yongli=qudouhao(ssss+"");
+				yongli=yongli.replace("~", ",");//将用例所有的波浪线替换回来，替换成逗号
+//				System.out.println("yongli="+yongli);
+				
+				listSum.add(yongli);
+//				System.out.println("listSum="+listSum);
+			}
+		}
+//		System.out.println(listSum.toString());
+		return listSum;
+	}
+	
+	public static List<Set<String>> TestCase_N(String path,String Sheet,String ziduanname){
+		//测试用例集合
+		List<Set<String>> listSum=new ArrayList<Set<String>>();
+		
+		readExcels readExcels= new readExcels();
+		List<List<String>> list=null;
+		try {
+			list=readExcels.readExcels_return(path,Sheet);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		List<Set<String>> listt=new ArrayList<Set<String>>();
+		List<Set<String>> listf=new ArrayList<Set<String>>();
+		
+		for (int i=0;i<list.size();i++) {
+			List<String> li=list.get(i);
+			Set<String> sett=new HashSet<String>();
+			Set<String> setf=new HashSet<String>();
+			String name="";
+			Object [] objt=null;
+			Object [] objf=null;
+			for (int j=0;j<li.size();j++) {
+				if(j==1){
+					name=li.get(j).trim();
+				}
+				if(j==4){
+					objt=li.get(j).trim().split(",");
+				}
+				if(j==5){
+					String s="";
+					if("".equals(li.get(j).trim()) || li.get(j).trim()==null){
+						s=""+li.get(2).trim()+","+li.get(3).trim();
+					}else{
+						s=""+li.get(j).trim()+","+li.get(2).trim()+","+li.get(3).trim();
+					}
+					objf=s.split(",");
+				}
+//				System.out.println(objf.toString());
+			}
+			sett=getObject(name,objt,objt[0]+"");
+			setf=getObject(name,objf,objt[0]+"");
+					
+			listt.add(sett);
+			listf.add(setf);
+		}
+		System.out.println("正向用例"+listt.toString());
+		System.out.println("反向用例"+listf.toString());
+		
+		
+		//正确和错误的集合
+		Set<String> set_n_t=new HashSet<String>();
+		Set<String> set_n_f=new HashSet<String>();
+		//产生正向的用例
+		Set<String> sum1=getZReslut(listt);
+		Iterator it1 = sum1.iterator();
+		String linshiyongli="";
+		while(it1.hasNext()){
+//			System.out.println(qudouhao(it1.next()+""));
+			linshiyongli=qudouhao(it1.next()+"");
+			linshiyongli=linshiyongli.replace(",", "~");
+			set_n_t.add("\""+ziduanname+"\""+":{"+linshiyongli+"}");
+		}
+		
+		//产生反向的用例,第一个参数是正确的参数集合支取一个，第二个参数集合是错误的集合
+		for(int i=0;i<listf.size();i++){
+			Set<String> sum2=getFReslut(sum1,listf.get(i));
+			Iterator it2 = sum2.iterator();
+			while(it2.hasNext()){
+//				System.out.println(qudouhao(it2.next()+""));
+				linshiyongli=qudouhao(it2.next()+"");
+				linshiyongli=linshiyongli.replace(",", "~");
+				set_n_f.add("\""+ziduanname+"\""+":{"+linshiyongli+"}");
+			}
+		}
+		
+		listSum.add(set_n_t);
+		listSum.add(set_n_f);
+		return listSum;
+	}
+
+	//去掉逗号
+	public static String qudouhao(String str){
+		str=str.trim();
+		if(str.length()>0 && str.charAt(0)==','){
+			str=str.substring(1);
+		}else if(str.length()>0 && str.charAt(str.length()-1)==','){
+			str=str.substring(0,str.length()-1);
+		}
+		return str;
+		
+	}
+	
+	//生成正确的用例
+	public static Set<String> getZReslut(List<Set<String>> list){
+		String str="";
+		for(int i=0;i<list.size();i++){
+			String str1="";
+			Object[] obj=setjihe(list.get(i));
+			str1=Arrays.toString(obj).trim();
+			str=str+str1.substring(1, str1.length()-1)+"==".trim();
+			
+		}
+		str=str.substring(0, str.length()-2);
+		Set<String> result = HelloHongShu.getSet(str);
+		return result;
+	}
+	public static Object[] setjihe(Set<String> set){
+		Object[] obj=set.toArray();
+		return obj;
+	}
+	
+	//生成错误的用例
+	public static Set<String> getFReslut(Set<String> set1,Set<String> set2){
+		Set<String> set=new HashSet<String>();
+		Object[] obj1=set1.toArray();
+		Object[] obj2=set2.toArray();
+		
+		//获取正确用例的其中一个
+		String zhengque=obj1[0]+"";
+		String linshi="";
+		String cuowulinshi="";
+		Object [] zhengque1=zhengque.split(",");
+		StringBuffer sb=new StringBuffer();
+		for(int i=0;i<zhengque1.length;i++){
+			sb.append(zhengque1[i]);
+			sb.append(",");
+		}
+		String jihe=sb.toString().substring(0,sb.toString().length()-1);
+//		System.out.println(jihe);
+		
+		
+		//用正确的用例为模板，找到与错误部分相同的一节内容进行替换操作
+		for(int i=0;i<zhengque1.length;i++){
+//			System.out.println(11111111);
+//			for(int j=0;j<obj2.length;j++){
+			for(int j=(obj2.length-1);j>=0;j--){
+				//错误用例中分号前面的那段信息
+				String cuowu=obj2[j]+"";
+				cuowulinshi=cuowu.trim();
+				cuowu=(cuowu.split(":")[0]).trim();
+				
+				linshi=(zhengque1[i]+"").trim();
+				if(!linshi.contains(cuowu)){
+					break;
+				}
+				zhengque=jihe;
+//				System.out.println("被替代前="+zhengque);
+//				System.out.println("被替代内容="+linshi);
+//				System.out.println("替代为="+cuowulinshi);
+				zhengque=zhengque.replace(linshi, cuowulinshi);
+				zhengque=quchongfudouhao(zhengque);
+				set.add(zhengque);
+//				System.out.println("被替代后="+zhengque);
+//				System.out.println("set="+set);
+			}
+		}
+		return set;
+	}
+	public static String quchongfudouhao(String str){
+		return str.replace(",,", ",");
+	}
+	
+	//第一个参数是变量名，第二个参数是参数集合，第三个参数是正的需要被类型转换的参数
+	public static Set<String> getObject(String name , Object[] obj,String s){
+		
+		
+		
+//		Object w1[]=new Object[obj.length];
+		Set<String> set=new HashSet<String>();
+		String linshi="";
+		for(int j=0;j<obj.length;j++){
+			if(obj[j]==null || "code".equals(obj[j])){
+				linshi="\""+name+"\""+":"+obj[j];
+			}else if("Y".equals(obj[j])){
+				linshi="";
+			}else if("N".equals(obj[j])){
+				linshi="";
+//				continue;
+			}else if("String".equals(obj[j])){
+				Long w=StringToInt(s);
+//				System.out.println("w="+w);
+				if(w!=0){
+					linshi="\""+name+"\""+":"+w;
+				}else{
+					linshi="\""+name+"\""+":"+0;//字符串转换成int类型失败后，将字符串变为0
+//					System.out.println(linshi);
+				}
+			}else if("int".equals(obj[j])){
+				linshi="\""+name+"\""+":"+"\""+s+"\"";
+			}else{
+				linshi="\""+name+"\""+":"+""+obj[j]+"";
+			}
+//			System.out.println(linshi);
+			set.add(linshi);
+//			System.out.println(set);
+		}
+		return set;
+	}
+	
+	
+	public static Long StringToInt(String str){
+		Long a=0L;
+		try {
+			a=Long.parseLong(str);
+		} catch (Exception e) {
+//			System.out.println("转换异常");
+		}
+		return a;
+	}
+
+}

nwn_Api_auto_test/src/makeTestCase/readExcels.java

@@ -59,9 +59,9 @@ public class readExcels {
 				Cell cell = r.getCell(j);
 				String brandName = this.getCellValue(cell);
 				if(brandName.indexOf("Sheet")!=-1){//如果在文件里找到了包含Sheet的字段就不存储这一行数据
-					MakeTestCases.SheetList.add(brandName);//记录那个sheet页面
-					MakeTestCases.nameList.add(this.getCellValue(r.getCell(1)));//保存包含sheet页面的字段名称
-					++MakeTestCases.state;	   //状态执为true，代表还需要循环读取其他sheet页面
+					MakeTestCases190131.SheetList.add(brandName);//记录那个sheet页面
+					MakeTestCases190131.nameList.add(this.getCellValue(r.getCell(1)));//保存包含sheet页面的字段名称
+					++MakeTestCases190131.state;	   //状态执为true，代表还需要循环读取其他sheet页面
 					listData.clear();			   //清理这一行数据的存储
 					break;
 				}

nwn_Api_auto_test/src/resources/test.properties

 xls=DataAll.xls
-sheet=try
+sheet=TestCase4
 mysql_local_Online=local
\ No newline at end of file