更新秘钥

.classpath

@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

src/test/java/com/mjitech/qa/test/DeleteImageError.java

@@ -17,7 +17,7 @@ public class DeleteImageError {
 	JSONObject json = JSONObject.fromObject("{}");
 	@Test
 	public void delete_image_error() {
-		String url = "http://preprod.mjitech.com/web/delete_image_error.action";
+		String url = "http://test.mjitech.com/web/delete_image_error.action";
 		String body = "{\"fileId\":\"3213\",\"errorId\":\"432\",\"type\":\"KN\"}";
 		try {
 			JSONObject result = service.httpPostFlat(url, body);

src/test/java/com/mjitech/qa/test/FlagInterface.java

@@ -25,7 +25,7 @@ public class FlagInterface {
 	@Test
 	public void sendOrder() {
 		String url = "http://test.mjitech.com/web/pad_warehouse/getMachineData.action";
-		String body = "{\"storeId\":\"13\"}";
+		String body = "{\"storeId\":\"17\"}";
 		
 		
 		

src/test/java/com/mjitech/qa/test/GetMachineData.java

@@ -21,7 +21,11 @@ public class GetMachineData {
 	@Test
 	public void getMachineData() {
 		String url = "http://test.mjitech.com/web/pad_warehouse/getMachineData.action" ;
+<<<<<<< HEAD
 		String body = "{\"storeId\":\"50\"}";
+=======
+		String body = "{\"storeId\":\"17\"}";
+>>>>>>> 4fff4323617d768dd0e82788992eeda74e1d0966
 		try {
 			JSONObject result = service.httpPostFlat(url, body);
 			String code = result.getJSONObject("meta").getString("code");

src/test/java/com/mjitech/qa/test/GetMachineData27.java

@@ -26,8 +26,8 @@ public class GetMachineData27 {
 	 * */
 	@Test
 	public void getMachineData13() {		
-		String url = "http://www.mjitech.com/web/machine_api/get_mainpage_data.action" ;
-		json.put("storeId", "13");
+		String url = "http://test.mjitech.com/web/machine_api/get_mainpage_data.action" ;
+		json.put("storeId", "17");
 		try {
 			String startTime = df.format(new Date());
 			System.out.println("华贸商业街获取首页接口start time："+startTime);
@@ -53,8 +53,8 @@ public class GetMachineData27 {
 	 * */
 //	@Test
 	public void getMachineData22() {		
-		String url = "http://www.mjitech.com/web/machine_api/get_mainpage_data.action" ;
-		json.put("storeId", "22");
+		String url = "http://test.mjitech.com/web/machine_api/get_mainpage_data.action" ;
+		json.put("storeId", "17");
 		try {
 			JSONObject result = service.httppostCartReturnJson27(url, service.postParameter(json));
 			System.out.println("获取首页信息接口："+result);
@@ -74,7 +74,7 @@ public class GetMachineData27 {
 	 * */
 //	@Test
 	public void getMachineData20() {		
-		String url = "http://www.mjitech.com/web/machine_api/get_mainpage_data.action" ;
+		String url = "http://test.mjitech.com/web/machine_api/get_mainpage_data.action" ;
 		json.put("storeId", "20");
 		try {
 			JSONObject result = service.httppostCartReturnJson27(url, service.postParameter(json));

src/test/java/com/mjitech/qa/test/GetPagedMainpageData.java

@@ -16,7 +16,11 @@ public class GetPagedMainpageData {
 	BaseService service = new BaseService();
 	@Test
 	public void test_login_with_openid() {
+<<<<<<< HEAD
 		String url = "http://test.mjitech.com/web/buyer_api/test_login_with_openid.action" ;
+=======
+		String url = "http://test.mjtestritech.com/web/buyer_api/test_login_with_openid.action" ;
+>>>>>>> 4fff4323617d768dd0e82788992eeda74e1d0966
 		String body = "{\"openid\":\"o41Mgv5qXayH9P9C6IGYhN1Ujz3g\"}";
 		try {
 			long startTime = System.currentTimeMillis();

src/test/java/com/mjitech/qa/test/OrderDetail.java

@@ -10,7 +10,7 @@ import com.mjitech.qa.service.BaseService;
 import net.sf.json.JSONObject;
 
 public class OrderDetail {
-	String url = "http://www.mjitech.com/web/buyer_api/order_detail_new" ;
+	String url = "http://test.mjitech.com/web/buyer_api/order_detail_new" ;
 	BaseService service = new BaseService() ;
 	JSONObject json = JSONObject.fromObject("{}");
 	@Test

src/test/java/com/mjitech/qa/test/PickUpGoodsTest.java

@@ -116,7 +116,15 @@ public class PickUpGoodsTest {
 				+ "JSESSIONID=" + JSESSIONID;
 		System.out.println("CookiesValues=" + cookiesValues);
 		OkHttpClient client = new OkHttpClient();
+<<<<<<< HEAD
 		Request request = new Request.Builder().url("https://test.mjitech.com/web/pick_up_goods/50/80595").get()
+=======
+		Request request = new Request.Builder().url("http://test.mjitech.com/web/pick_up_goods/52/86547").get()
+				// .addHeader("Cookie",
+				// "mjitech_username='gangwang@mjitech.com';
+				// _ga=GA1.2.1640278628.1537349020;
+				// JSESSIONID=E0430372DC47BC880A93537AF0387924")
+>>>>>>> 4fff4323617d768dd0e82788992eeda74e1d0966
 				.addHeader("Cookie", cookiesValues).addHeader("cache-control", "no-cache")
 				.addHeader("Postman-Token", "ee590a55-6c93-413b-b60b-21b4a88f38fe").build();
 		try {