From eee1beec1764e9fe0d7b0b3b1c9fa995e39939fd Mon Sep 17 00:00:00 2001
From: gangwang <gangwang@mjitech.com>
Date: Tue, 11 Jun 2019 16:16:41 +0800
Subject: [PATCH] 解决代码冲突
---
src/test/java/com/mjitech/qa/test/GetMachineData.java | 4 ----
src/test/java/com/mjitech/qa/test/GetPagedMainpageData.java | 4 ----
src/test/java/com/mjitech/qa/test/PickUpGoodsTest.java | 4 ----
3 files changed, 12 deletions(-)
diff --git a/src/test/java/com/mjitech/qa/test/GetMachineData.java b/src/test/java/com/mjitech/qa/test/GetMachineData.java
index 4f531ab..fc82d19 100644
--- a/src/test/java/com/mjitech/qa/test/GetMachineData.java
+++ b/src/test/java/com/mjitech/qa/test/GetMachineData.java
@@ -21,11 +21,7 @@ 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");
diff --git a/src/test/java/com/mjitech/qa/test/GetPagedMainpageData.java b/src/test/java/com/mjitech/qa/test/GetPagedMainpageData.java
index 2065c7d..899ce02 100644
--- a/src/test/java/com/mjitech/qa/test/GetPagedMainpageData.java
+++ b/src/test/java/com/mjitech/qa/test/GetPagedMainpageData.java
@@ -16,11 +16,7 @@ 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();
diff --git a/src/test/java/com/mjitech/qa/test/PickUpGoodsTest.java b/src/test/java/com/mjitech/qa/test/PickUpGoodsTest.java
index df2abd7..aa54013 100644
--- a/src/test/java/com/mjitech/qa/test/PickUpGoodsTest.java
+++ b/src/test/java/com/mjitech/qa/test/PickUpGoodsTest.java
@@ -116,15 +116,11 @@ 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 {
--
libgit2 0.26.0