Merge branch 'mabo'

src/test/java/base/Postman.java

@@ -28,7 +28,8 @@ public class Postman {
      final static String miriaUrlFindTestApp = "http://miria-aliyun.duibatest.com.cn/autoTest/findTestApp";
 
     //dingdingUrl="http://www.json.cn/";
-    private static Logger logger = LogManager.getLogger(Postman.class);
+//    private static Logger logger = LogManager.getLogger(Postman.class);
+    public static DuibaLog logger = DuibaLog.getLogger();
     public static void send2Dingding(Map result){
         System.out.println("Dingding:"+result);
         RestAssuredConfig config = RestAssured.config();
@@ -44,7 +45,7 @@ public class Postman {
             String[] name = DingdingResult.name;
             result.put("names",name);
             response=given().contentType(ContentType.JSON).body(result).post(dingdingUrl);
-            System.out.println("钉钉重试响应数据："+response.asString());
+            logger.info("钉钉重试响应数据："+response.asString());
         }
 
 
@@ -52,28 +53,28 @@ public class Postman {
     public static void sendTestPlatform(Map result){
 
         Response response=given().contentType(ContentType.JSON).body(result).post(testPlatformUrl);
-        System.out.println("自动化数据收集平台响应数据："+response.asString());
+        logger.info("自动化数据收集平台响应数据："+response.asString());
     }
     public static void sendFinish(Map result){
 
         Response response=given().params(result).get(miriaUrl);
-        System.out.println("jobName:"+result.get("jobName"));
-        System.out.println("miriaUrl:"+miriaUrl);
-        System.out.println("miria响应结果："+response.asString());
+        logger.info("jobName:"+result.get("jobName"));
+        logger.info("miriaUrl:"+miriaUrl);
+        logger.info("miria响应结果："+response.asString());
     }
     public static void sendTesting(Map result){
 
         Response response=given().params(result).get(miriaUrlTesting);
-        System.out.println("jobName:"+result.get("jobName"));
-        System.out.println("miriaUrl:"+miriaUrlTesting);
-        System.out.println("miria响应结果："+response.asString());
+        logger.info("jobName:"+result.get("jobName"));
+        logger.info("miriaUrl:"+miriaUrlTesting);
+        logger.info("miria响应结果："+response.asString());
     }
     public static String sendFindTestApp(Map result){
 
         Response response=given().params(result).get(miriaUrlFindTestApp);
-        System.out.println("jobName:"+result.get("jobName"));
-        System.out.println("miriaUrl:"+miriaUrlTesting);
-        System.out.println("miria响应结果："+response.asString());
+        logger.info("jobName:"+result.get("jobName"));
+        logger.info("miriaUrl:"+miriaUrlFindTestApp);
+        logger.info("miria响应结果："+response.asString());
         String value = response.jsonPath().getString("value");
         return value;
     }

src/test/java/ui/cases/Exchange/优惠券_ExchangeTest_ui.java

@@ -14,7 +14,7 @@ public class 优惠券_ExchangeTest_ui extends DuibaBaseUi{
     @Test
     public void 优惠券兑换_正常流程() throws Exception {
         open("http://dafuweng.duibatest.com.cn/user/index");
-        clickByTextEqual("4762");
+        clickByTextEqual("5074");
         switchWindow();
         sleep(2);
         clickByClass("btn-close");

src/test/java/ui/cases/Exchange/实物_ExchangeTest_ui.java

@@ -11,8 +11,8 @@ import static com.codeborne.selenide.Selenide.open;
 public class 实物_ExchangeTest_ui extends DuibaBaseUi{
     @Test
     public void 实物兑换_正常流程() throws Exception {
-        open("http://47.97.214.108/user/index");
-        clickByTextEqual("4762");
+        open("http://dafuweng.duibatest.com.cn/user/index");
+        clickByTextEqual("5074");
         switchWindow();
         sleep(2);
         clickByClass("btn-close");

src/test/java/ui/cases/Exchange/支付宝_ExchangeTest_ui.java

@@ -11,8 +11,8 @@ import static com.codeborne.selenide.Selenide.open;
 public class 支付宝_ExchangeTest_ui extends DuibaBaseUi{
     @Test
     public void  支付宝_正常流程() throws Exception {
-        open("http://47.97.214.108/user/index");
-        clickByTextEqual("4762");
+        open("http://dafuweng.duibatest.com.cn/user/index");
+        clickByTextEqual("5074");
         switchWindow();
         sleep(2);
         clickByClass("btn-close");

src/test/java/ui/common/WebDriverFactory.java

@@ -71,6 +71,9 @@ public class WebDriverFactory {
         String OS = prop.getProperty("os.name");
         boolean bl=OS.startsWith("Mac");
         String basePath=WebDriverType.class.getClassLoader().getResource("").getPath();
+        basePath = basePath.replaceAll("%20"," ");//repaceAll("%20",'');
+        File directory = new File("");
+        System.out.println("-----路径："+directory.getAbsolutePath());
         RemoteWebDriver browser=null;
         String driverPath=null;
         switch (driverType){