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

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

@@ -84,7 +84,7 @@ public class checkCode_web extends TK implements API {
 		jsonAsMap.put("appid", tikuString);
 		
 		MyRequest myRequest=new MyRequest();
-		myRequest.setUrl(Url);
+		myRequest.setUrl("/apiv3/mock/webcheck/checkCode");
 		myRequest.setHeaders(headers);
 		myRequest.setFormParameter(jsonAsMap);		
 		myRequest.setRequest(Request);

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

@@ -125,7 +125,7 @@ public class editUserName extends TK implements API {
 							String date_nicknameString = jp.getString("data.nickname");
 							
 							
-							if(!(date_nicknameString.equals(act_nickname) && date_nicknameString.equals(nickname))){
+							if(!(date_nicknameString.equals(act_nickname))){
 									result = result && false;
 									failReason = failReason + "nickname is not in DB;";
 							}

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

@@ -77,7 +77,7 @@ public class getCode_web extends TK implements API {
 		jsonAsMap.put("appid", tikuString);
 		
 		MyRequest myRequest=new MyRequest();
-		myRequest.setUrl(Url);
+		myRequest.setUrl("/apiv3/mock/webcheck/getCode");
 		myRequest.setHeaders(headers);
 		myRequest.setFormParameter(jsonAsMap);		
 		myRequest.setRequest(Request);

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

@@ -40,7 +40,7 @@ public class signUpMock extends TK implements API {
 	public String parameter;//参数集合
 	
 	public String exam_id;//考试项目id
-	public String user_id;//用户id
+	public String phone;//手机号
 	public String mock_sub_id;//子模考id
 	public String mock_id;//模考id
 
@@ -56,7 +56,7 @@ public class signUpMock extends TK implements API {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
 		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
-		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		phone = MapUtil.getParameter(parameter, "phone").trim();
 		mock_sub_id = MapUtil.getParameter(parameter, "mock_sub_id");
 		mock_id = MapUtil.getParameter(parameter, "mock_id");						
 		
@@ -65,9 +65,9 @@ public class signUpMock extends TK implements API {
 //			exam_id="83";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
-		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 ((!phone.equals("")) && phone.equals("code")) {
+			phone = phoneNeb;
+			parameter = parameter.replace("\"phone\":code","\"phone\":\""+phone+"\"");
 		}
 		if ((!mock_sub_id.equals("")) && mock_sub_id.equals("code")){
 			mock_sub_id = L_mock_sub_id;
@@ -94,7 +94,7 @@ public class signUpMock extends TK implements API {
 		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
 		tikuString = MapUtil.killQuotes(tikuString, "\"");
 		jsonAsMap.put("exam_id", exam_id);
-		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("phone", phone);
 		jsonAsMap.put("mock_sub_id", mock_sub_id);
 		jsonAsMap.put("mock_id", mock_id);
 		jsonAsMap.put("appid", tikuString);

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

@@ -39,7 +39,7 @@ public class uploadUserAvator extends TK implements API {
 	public String parameter;//参数集合
 	
 	public String user_id;//用户id
-	public String image;//考试项目id
+	public String image;//头像图片文本域名称
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {