From 3858f07436b17d719b2e14b565184632544d5a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=97=E9=A3=8E?= <2452618307@qq.com>
Date: Fri, 19 Jul 2024 18:21:19 +0800
Subject: [PATCH] .

---
 .../java/com/bonus/autoweb/base/AutoMain.java | 30 +++++++++----------
 .../com/bonus/autoweb/base/DutyLogIOp.java    |  4 +--
 .../com/bonus/autoweb/task/AutoWebTask.java   | 10 +++----
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/bonus/autoweb/base/AutoMain.java b/src/main/java/com/bonus/autoweb/base/AutoMain.java
index 24066b2..43e1e8c 100644
--- a/src/main/java/com/bonus/autoweb/base/AutoMain.java
+++ b/src/main/java/com/bonus/autoweb/base/AutoMain.java
@@ -34,22 +34,20 @@ public class AutoMain {
      */
     public void initDrive(int type) {
         // chromedriver服务地址
-        System.setProperty(DataConfig.DRIVE_NAME, DataConfig.drivePath);
-        ChromeOptions option = new ChromeOptions();
-        //添加浏览器地址
-//        option.setBinary("C:\\Program Files\\Mozilla Firefox\\firefox.exe");//个人本地
-//        option.setBinary("C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe");//个人本地
-        option.setBinary("C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe");
-//        option.setBinary("C:\\Users\\Administrator\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe");//宿州
-//        option.addArguments("start-fullscreen");
-        option.addArguments("--start-maximized");
-        option.addArguments("--force-device-scale-factor=0.75");
-        option.addArguments("disable-infobars");
-
-        //隐藏页面
-//        option.addArguments("--headless");
-//        webDriver = new FirefoxDriver(option);
-        webDriver = new ChromeDriver(option);
+        try{
+            System.setProperty(DataConfig.DRIVE_NAME, DataConfig.drivePath);
+            ChromeOptions option = new ChromeOptions();
+            //添加浏览器地址
+            option.setBinary("C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe");
+            option.addArguments("--start-maximized");
+            option.addArguments("--force-device-scale-factor=0.75");
+            option.addArguments("disable-infobars");
+            //隐藏页面
+            webDriver = new ChromeDriver(option);
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("初始化驱动失败");
+        }
     }
 
     /**
diff --git a/src/main/java/com/bonus/autoweb/base/DutyLogIOp.java b/src/main/java/com/bonus/autoweb/base/DutyLogIOp.java
index 2fd67e4..5da2032 100644
--- a/src/main/java/com/bonus/autoweb/base/DutyLogIOp.java
+++ b/src/main/java/com/bonus/autoweb/base/DutyLogIOp.java
@@ -116,7 +116,7 @@ public class DutyLogIOp {
                 td = dayNum - 1;
             }
             log.info("标签位置：tr:" + tr + "，td:" + td);
-            xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]/div";
+            xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]";
         } else {
             //点击上月按钮，切换至上月
             webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[1]/div[2]/div/button[1]")).click();
@@ -128,7 +128,7 @@ public class DutyLogIOp {
             //判断上个月最后一天的位置
             tr = DateTimeUtils.getWeekNum(mothDay);
             td = DateTimeUtils.getWeekOfDate(mothDay);
-            xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]/div";
+            xpath = "//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]";
 //            String dayNum = mothDay.substring(8, 10);
 //            WebElement spanElement = webDriver.findElement(By.xpath("//*[@id=\"app\"]/div/section/main/div/div[1]/div[1]/div[3]/div[2]/table/tbody/tr[" + tr + "]" + "/td[" + td + "]/div/div/div[1]/span"));
 //            if (dayNum.equals(spanElement.getText())) {
diff --git a/src/main/java/com/bonus/autoweb/task/AutoWebTask.java b/src/main/java/com/bonus/autoweb/task/AutoWebTask.java
index 28c4b9a..e359426 100644
--- a/src/main/java/com/bonus/autoweb/task/AutoWebTask.java
+++ b/src/main/java/com/bonus/autoweb/task/AutoWebTask.java
@@ -165,10 +165,10 @@ public class AutoWebTask {
                     "]/table/tbody/tr[2]/td[2]/div/div/p[1]"));
             String personName = personNameEle.getText();
             log.info("今日值班人员：" + personName);
-            WebElement accountEle = webDriver.findElement(By.xpath("//*[@id='pane-1']/div/div[3]/div/div/div[3" +
-                    "]/table/tbody/tr[2]/td[2]/div/div/p[2]"));
-            String account = accountEle.getText();
-            log.info("今日值班人员账号：" + account);
+//            WebElement accountEle = webDriver.findElement(By.xpath("//*[@id='pane-1']/div/div[3]/div/div/div[3" +
+//                    "]/table/tbody/tr[2]/td[2]/div/div/p[2]"));
+//            String account = accountEle.getText();
+//            log.info("今日值班人员账号：" + account);
             Thread.sleep(3000);
             excelFile = new FileInputStream("E:\\bns\\config\\zhibanaccount.xlsx");
             workbook = new XSSFWorkbook(excelFile);
@@ -179,7 +179,7 @@ public class AutoWebTask {
                     value += cell.getStringCellValue() + "]]]";
                 }
                 value = value.substring(0, value.length() - 3);
-                if (value.contains(account)) {
+                if (value.contains(personName)) {
                     System.out.println("今天：" + value);
                     AutoUtils.write("E:\\bns\\config\\今日值班账号.txt", "今日账号：" + value.split("]]]")[1] + "；密码：" + value.split(
                             "]]]")[2]);