diff --git a/src/main/java/net/educoder/ecsonar/services/SonarService.java b/src/main/java/net/educoder/ecsonar/services/SonarService.java index f56c5f2..c333c84 100644 --- a/src/main/java/net/educoder/ecsonar/services/SonarService.java +++ b/src/main/java/net/educoder/ecsonar/services/SonarService.java @@ -258,7 +258,7 @@ public class SonarService { */ public void scanExcel(String excelPath) { - int homeworkId = 20230402; + int homeworkId = 202405181; try { List personList = ExcelUtil.readExcel(excelPath); diff --git a/src/main/java/net/educoder/ecsonar/utils/RarUtil.java b/src/main/java/net/educoder/ecsonar/utils/RarUtil.java index f957bed..953d764 100644 --- a/src/main/java/net/educoder/ecsonar/utils/RarUtil.java +++ b/src/main/java/net/educoder/ecsonar/utils/RarUtil.java @@ -32,14 +32,14 @@ public class RarUtil { // un7Z("/tmp/20230301/201905962241/20230519153506_i39sv5p2.7z", "/Users/youyongsheng/Desktop/aa"); // unzip(); - valid("/tmp/20230402"); -// removeFullCode("/tmp/20230302"); +// valid("/tmp/202405181"); +// removeFullCode("/tmp/202405181"); } public static void unzip(){ - String sourceDir = "/tmp/20230401"; - String targetDir = "/tmp/20230402"; + String sourceDir = "/tmp/20240518"; + String targetDir = "/tmp/202405181"; File directory = new File(sourceDir); File[] studentDirs = directory.listFiles(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0463adc..64c83e3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,16 +5,16 @@ #spring.datasource.driver-class-name=org.postgresql.Driver spring.datasource.initSize=20 -#spring.datasource.master.url=jdbc:postgresql://127.0.0.1:5432/sonar7.7 -spring.datasource.master.url=jdbc:postgresql://117.50.14.123:5432/sonar -spring.datasource.master.username=sonar -spring.datasource.master.password=sonar +#spring.datasource.master.url=jdbc:postgresql://127.0.0.1:5432/sonar +spring.datasource.master.url=jdbc:postgresql://121.40.224.66:45432/sonar +spring.datasource.master.username=postgres +spring.datasource.master.password=Edu_postgresql spring.datasource.master.driverClassName=org.postgresql.Driver #### test ###### spring.datasource.readonly.driverClassName=com.mysql.jdbc.Driver -spring.datasource.readonly.url=jdbc:mysql://rm-bp13v5020p7828r5rso.mysql.rds.aliyuncs.com:3306/preeducoderweb?userSSL=false&useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false +spring.datasource.readonly.url=jdbc:mysql://testeducoder-public.mysql.polardb.rds.aliyuncs.com:3306/testeducoderweb?userSSL=false&useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false spring.datasource.readonly.username=testeducoder spring.datasource.readonly.password=TEST@123 @@ -44,7 +44,7 @@ zip.save.path=/tmp/ excel.template.path=template.xlsx #sonar.url=http://127.0.0.1:9000 -sonar.url=http://117.50.14.123:9000 +sonar.url=http://121.40.224.66:49000 # token令牌 sonar.token=0253a518e824a976ea2f11aec17938cb0f8c0495 diff --git a/src/test/java/net/educoder/ecsonar/EcsonarApplicationTests.java b/src/test/java/net/educoder/ecsonar/EcsonarApplicationTests.java index d1c9f09..73a66e4 100644 --- a/src/test/java/net/educoder/ecsonar/EcsonarApplicationTests.java +++ b/src/test/java/net/educoder/ecsonar/EcsonarApplicationTests.java @@ -68,7 +68,7 @@ public class EcsonarApplicationTests { CountDownLatch countDownLatch = new CountDownLatch(1); // String excelPath = "/Users/youyongsheng/Desktop/ZQ/质量分析/2023-05-16/data.xlsx"; - String excelPath = "/Users/youyongsheng/Desktop/ZQ/质量分析/2023-05-24/湖南工业大学-2023届软件工程-原始数据.xlsx"; + String excelPath = "/Users/youyongsheng/Desktop/湘潭大学计算机科学与工程系2024届.xlsx"; sonarService.scanExcel(excelPath); try { @@ -81,13 +81,13 @@ public class EcsonarApplicationTests { @Test public void writeExcel() throws Exception { - int homeworkId = 20230402; - String directory = "/tmp/20230402/"; + int homeworkId = 202405181; + String directory = "/tmp/202405181/"; File file = new File(directory); File[] files = file.listFiles(); System.out.println("学生数:" + files.length); - List personList = ExcelUtil.readExcel("/Users/youyongsheng/Desktop/ZQ/质量分析/2023-05-24/湖南工业大学-2023届软件工程-原始数据.xlsx"); + List personList = ExcelUtil.readExcel("/Users/youyongsheng/Desktop/湘潭大学计算机科学与工程系2024届.xlsx"); Map> collect = personList.stream().collect(Collectors.groupingBy(Person::getUid)); @@ -100,7 +100,7 @@ public class EcsonarApplicationTests { Metrics metrics = reportService.getMetrics(projectName); String templatePath = this.getClass().getClassLoader().getResource("template1.xlsx").getPath(); - String outPath = "/Users/youyongsheng/Desktop/ddddd.xlsx"; + String outPath = "/Users/youyongsheng/Desktop/fffff333.xlsx"; System.out.println("第"+(i++)+"个学生," + uid); if (CollectionUtils.isEmpty(collect.get(uid))) {