import path properties config file

src/main/java/com/moekr/moocoder/logic/service/impl/VisualizationServiceImpl.java

@@ -32,7 +32,7 @@ public class VisualizationServiceImpl implements VisualizationService {
     }
 
     @Override
-    public Pair<String, String> diffForCommit(String firstId, String secondId) {  // TODO
+    public Pair<String, String> diffForCommit(String firstId, String secondId) {
         String first = "import math\n" +
                 "\n" +
                 "class Solution:\n" +

src/main/java/com/moekr/moocoder/util/MavenUtil.java

@@ -13,8 +13,6 @@ import java.util.Collections;
  */
 @CommonsLog
 public class MavenUtil {
-    //TODO automatically find maven home
-    private static final String MAVEN_HOME = "/usr/local/Cellar/maven/3.5.3/libexec";
 
     private MavenUtil() {}
 
@@ -30,7 +28,7 @@ public class MavenUtil {
             request.setGoals( Collections.singletonList("compile"));
 
             Invoker invoker = new DefaultInvoker();
-            invoker.setMavenHome(new File(MAVEN_HOME));
+            invoker.setMavenHome(new File(PathUtil.getMavenHome()));
             invoker.setWorkingDirectory(new File(srcDir));
             InvocationResult result = invoker.execute(request);
             return result.getExitCode() == 0;  //non-zero exit code indicates compile or test failure

src/main/java/com/moekr/moocoder/util/PathUtil.java

@@ -0,0 +1,34 @@
+package com.moekr.moocoder.util;
+
+import lombok.extern.apachecommons.CommonsLog;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Properties;
+
+/**
+ * @author 王川源
+ * 管理资源路径
+ * 迭代三改用数据库，无需初始化文件夹
+ */
+@CommonsLog
+public class PathUtil {
+
+    private static String mavenHome;
+
+    static {
+        Properties pathProperty = new Properties();
+        try {
+            pathProperty.load(new InputStreamReader(PathUtil.class.getResourceAsStream("/path.properties"),"UTF-8"));
+            mavenHome = pathProperty.getProperty("maven_home");
+        } catch (IOException e) {
+            log.error(e);
+        }
+    }
+
+    public static String getMavenHome() {
+        return mavenHome;
+    }
+
+    private PathUtil() { }
+}

src/main/resources/application.properties

@@ -1,3 +1,6 @@
+#端口配置
+server.port=8090
+
 #thymeleaf配置，包括模版路径等
 spring.thymeleaf.prefix=classpath:/templates/
 spring.thymeleaf.suffix=.html
@@ -24,11 +27,3 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 #显示sql语句
 spring.jpa.properties.hibernate.show_sql=true
-
-#java mail
-spring.mail.host=smtp.qq.com
-spring.mail.port=587
-spring.mail.username=592589198@qq.com
-spring.mail.password=leueiolghoxvbegc
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true

src/main/resources/path.properties

@@ -0,0 +1 @@
+maven_home=/usr/local/Cellar/maven/3.5.3/libexec

src/test/java/com/moekr/moocoder/logic/api/PMDWrapperTest.java

@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author miaomuzhi
@@ -16,10 +16,10 @@ class PMDWrapperTest {
     void runPMD1() {
         PMDWrapper pmdWrapper = new PMDWrapper();
         String srcFolder = getClass().getResource("/wala/src_code/walawork").getFile();
-        String outputFile = getClass().getResource("/wala/outputs").getFile() + File.separator + "wala-pmd-report.xml";
+        String outputFile = getClass().getResource("/wala/jar").getFile() + File.separator + "wala-pmd-report.xml";
 
         assertEquals("/Users/miaomuzhi/Documents/IdeaProjects/moocoder/target/classes/wala/src_code/walawork", srcFolder);
-        assertEquals("/Users/miaomuzhi/Documents/IdeaProjects/moocoder/target/classes/wala/outputs/wala-pmd-report.xml", outputFile);
+        assertEquals("/Users/miaomuzhi/Documents/IdeaProjects/moocoder/target/test-classes/wala/jar/wala-pmd-report.xml", outputFile);
 
         pmdWrapper.runPMD(srcFolder, "xml", "rulesets/internal/all-java.xml", outputFile, null);
         System.out.println("DONE!");
@@ -33,10 +33,10 @@ class PMDWrapperTest {
     void runPMD2() {
         PMDWrapper pmdWrapper = new PMDWrapper();
         String srcFolder = getClass().getResource("/wala/src_code/Foo.java").getFile();
-        String outputFile = getClass().getResource("/wala/outputs").getFile() + File.separator + "foo-pmd-report.txt";
+        String outputFile = getClass().getResource("/wala/jar").getFile() + File.separator + "foo-pmd-report.txt";
 
         assertEquals("/Users/miaomuzhi/Documents/IdeaProjects/moocoder/target/classes/wala/src_code/Foo.java", srcFolder);
-        assertEquals("/Users/miaomuzhi/Documents/IdeaProjects/moocoder/target/classes/wala/outputs/foo-pmd-report.txt", outputFile);
+        assertEquals("/Users/miaomuzhi/Documents/IdeaProjects/moocoder/target/test-classes/wala/jar/foo-pmd-report.txt", outputFile);
 
         pmdWrapper.runPMD(srcFolder, "text", "rulesets/java/quickstart.xml", outputFile, null);
     }
@@ -45,7 +45,7 @@ class PMDWrapperTest {
     void runCPD1() {
         PMDWrapper wrapper = new PMDWrapper();
         String srcFolder = getClass().getResource("/wala/src_code/walawork").getFile();
-        String outputFile = getClass().getResource("/wala/outputs").getFile() + File.separator + "wala-cpd-report.xml";
+        String outputFile = getClass().getResource("/wala/jar").getFile() + File.separator + "wala-cpd-report.xml";
         wrapper.runCPD(srcFolder, "xml", outputFile);
         System.out.println("DONE!");
     }