src/main/java/net/educoder/ecsonar/config/ThreadPoolConfig.java

@@ -14,7 +14,7 @@ public class ThreadPoolConfig {
     @Primary
     public ExecutorService sonarScannerPool() {
         ThreadFactory sonarScannerPool = new CustomizableThreadFactory("sonarScanner-pool-");
-        return new ThreadPoolExecutor(50, 50, 0,
+        return new ThreadPoolExecutor(10, 10, 0,
                 TimeUnit.SECONDS, new ArrayBlockingQueue<>(10000), sonarScannerPool,
                 new ThreadPoolExecutor.AbortPolicy());
     }
@@ -23,7 +23,7 @@ public class ThreadPoolConfig {
     @Bean("sonarQueryResultPool")
     public ExecutorService queryResultPool() {
         ThreadFactory sonarQueryResultPool = new CustomizableThreadFactory("sonarQueryResult-pool-");
-        return new ThreadPoolExecutor(50, 50, 0,
+        return new ThreadPoolExecutor(5, 5, 0,
                 TimeUnit.SECONDS, new ArrayBlockingQueue<>(10000),
                 sonarQueryResultPool,
                 new ThreadPoolExecutor.AbortPolicy());

src/main/java/net/educoder/ecsonar/constant/Constant.java

@@ -16,10 +16,9 @@ public class Constant {
     public static final String CXX = "cpp";
     public static final String CPP = "c++";
     public static final String PYTHON = "python";
-    public static final String H = "h";
     public static final String OTHER = "other";
 
-    public static final List<String> language = Arrays.asList(JAVA, C, CXX, PYTHON, OTHER, H);
+    public static final List<String> language = Arrays.asList(JAVA, C, CXX, PYTHON, OTHER);
 
     public static final String SUCCESS = "SUCCESS";
 

src/main/java/net/educoder/ecsonar/dao/GameCodesDao.java

@@ -12,8 +12,4 @@ public interface GameCodesDao {
     
     @Select("select new_code code,path  from game_codes where id=#{id}")
     GameCodes queryOriginalCodeById(Long id);
-
-
-    @Select("select code,path from student_work_shixun_codes where id=#{id}")
-    GameCodes queryShiXunOriginalCodeById(Long id);
 }

src/main/java/net/educoder/ecsonar/dao/TaskInfoDetailDao.java

@@ -20,8 +20,7 @@ public interface TaskInfoDetailDao {
      *
      * @param taskInfoDetail
      */
-    @Insert("insert into task_info_detail(id,task_id,project_name,student_id,user_id,name,code_ids, shixun_code_ids) " +
-            "values(#{id},#{taskId},#{projectName},#{studentId},#{userId} ,#{name},#{codeIds}, #{shiXunCodeIds})")
+    @Insert("insert into task_info_detail(id,task_id,project_name,student_id,user_id,name,code_ids) values(#{id},#{taskId},#{projectName},#{studentId},#{userId} ,#{name},#{codeIds})")
     void insertTaskInfoDetail(TaskInfoDetail taskInfoDetail);
 
     /**
@@ -48,9 +47,7 @@ public interface TaskInfoDetailDao {
      * @param id
      * @return
      */
-    @Select("select id,task_id taskId,project_name projectName,student_id studentId,user_id userId,name," +
-            "code_ids codeIds,shixun_code_ids shiXunCodeIds, status,create_time createTime,update_time updateTime " +
-            "from task_info_detail where id=#{id}")
+    @Select("select id,task_id taskId,project_name projectName,student_id studentId,user_id userId,name,code_ids codeIds,status,create_time createTime,update_time updateTime from task_info_detail where id=#{id}")
     TaskInfoDetail selectById(String id);
 
     /**
@@ -72,9 +69,6 @@ public interface TaskInfoDetailDao {
      * @param position
      * @return
      */
-    @Select("select id,task_id taskId,project_name projectName,student_id studentId,user_id userId,name," +
-            "code_ids codeIds,shixun_code_ids shiXunCodeIds, status,create_time createTime,update_time updateTime  " +
-            "from task_info_detail where task_id=#{taskId} limit #{pageSize} offset #{position}")
-    List<TaskInfoDetail> selectTaskInfoDetailPageList(@Param("taskId") String taskId,
-            @Param("pageSize") Integer pageSize, @Param("position") Integer position);
+    @Select("select id,task_id taskId,project_name projectName,student_id studentId,user_id userId,name,code_ids codeIds,status,create_time createTime,update_time updateTime  from task_info_detail where task_id=#{taskId} limit #{pageSize} offset #{position}")
+    List<TaskInfoDetail> selectTaskInfoDetailPageList(@Param("taskId") String taskId, @Param("pageSize") Integer pageSize, @Param("position") Integer position);
 }

src/main/java/net/educoder/ecsonar/model/TaskInfoDetail.java

@@ -16,7 +16,6 @@ public class TaskInfoDetail {
     private Long userId;
     private String name;
     private String codeIds;
-    private String shiXunCodeIds;
     /**
      * 0处理中 1处理成功 -1 处理失败
      */
@@ -104,12 +103,4 @@ public class TaskInfoDetail {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    public String getShiXunCodeIds() {
-        return shiXunCodeIds;
-    }
-
-    public void setShiXunCodeIds(String shiXunCodeIds) {
-        this.shiXunCodeIds = shiXunCodeIds;
-    }
 }

src/main/java/net/educoder/ecsonar/model/vo/AnalyseDetailListVO.java

@@ -30,9 +30,7 @@ public class AnalyseDetailListVO extends PageVO {
     @NotBlank(message = "作业id不能为空")
     private String homeworkId;
 
+    @NotBlank(message = "学号不能为空")
     private String studentNo;
 
-    @NotBlank(message = "userId不能为空")
-    private String userId;
-
 }

src/main/java/net/educoder/ecsonar/model/vo/AnalyseDetailVO.java

@@ -15,9 +15,7 @@ public class AnalyseDetailVO {
     @NotBlank(message = "作业id不能为空")
     private String homeworkId;
 
+    @NotBlank(message = "学号不能为空")
     private String studentNo;
 
-    @NotBlank(message = "userId不能为空")
-    private String userId;
-
 }

src/main/java/net/educoder/ecsonar/model/vo/QualityInspectUserDataVO.java

@@ -30,8 +30,6 @@ public class QualityInspectUserDataVO implements Serializable {
      */
     private List<Long> codeIds;
 
-    private List<Long> studentWorkShixunCodeIds;
-
     public String getStudentId() {
         return studentId;
     }
@@ -63,12 +61,4 @@ public class QualityInspectUserDataVO implements Serializable {
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-
-    public List<Long> getStudentWorkShixunCodeIds() {
-        return studentWorkShixunCodeIds;
-    }
-
-    public void setStudentWorkShixunCodeIds(List<Long> studentWorkShixunCodeIds) {
-        this.studentWorkShixunCodeIds = studentWorkShixunCodeIds;
-    }
 }

src/main/java/net/educoder/ecsonar/services/DbOperateService.java

@@ -45,13 +45,6 @@ public class DbOperateService {
         return gameCode;
     }
 
-    public GameCodes queryShiXunCodesById(Long id) {
-        DynamicDataSourceContextHolder.setContextKey(DynamicDataSourceConfig.READONLY);
-        GameCodes gameCode = gameCodesDao.queryShiXunOriginalCodeById(id);
-        DynamicDataSourceContextHolder.removeContextKey();
-        return gameCode;
-    }
-
     /**
      * 查询任务执行状态
      *

src/main/java/net/educoder/ecsonar/services/QualityInspectService.java

@@ -103,12 +103,11 @@ public class QualityInspectService {
             TaskInfoDetail taskInfoDetail = new TaskInfoDetail();
             taskInfoDetail.setId(IdUtils.nextStrId());
             taskInfoDetail.setTaskId(taskInfo.getId());
-            taskInfoDetail.setProjectName(String.format("%s-%s", qualityInspectVO.getHomeworkId(), userData.getUserId()));
+            taskInfoDetail.setProjectName(String.format("%s-%s", qualityInspectVO.getHomeworkId(), userData.getStudentId()));
             taskInfoDetail.setName(userData.getName());
             taskInfoDetail.setStudentId(userData.getStudentId());
             taskInfoDetail.setUserId(userData.getUserId());
             taskInfoDetail.setCodeIds(userData.getCodeIds().toString());
-            taskInfoDetail.setShiXunCodeIds(userData.getStudentWorkShixunCodeIds().toString());
 
             taskInfoDetailDao.insertTaskInfoDetail(taskInfoDetail);
 
@@ -234,7 +233,7 @@ public class QualityInspectService {
      */
     public AnalyseDetailDTO getAnalyseDetail(AnalyseDetailVO analyseDetailVO) {
         // 作业id+学号
-        String projectName = String.format("%s-%s", analyseDetailVO.getHomeworkId(), analyseDetailVO.getUserId());
+        String projectName = String.format("%s-%s", analyseDetailVO.getHomeworkId(), analyseDetailVO.getStudentNo());
 
         Project project = projectDao.findByName(projectName);
         if (project == null) {
@@ -275,7 +274,7 @@ public class QualityInspectService {
         rollPage.setPageSize(analyseDetailListVO.getPageSize());
 
         // 作业id+学号
-        String projectName = String.format("%s-%s", analyseDetailListVO.getHomeworkId(), analyseDetailListVO.getUserId());
+        String projectName = String.format("%s-%s", analyseDetailListVO.getHomeworkId(), analyseDetailListVO.getStudentNo());
 
         Project project = projectDao.findByName(projectName);
         if (project == null) {

src/main/java/net/educoder/ecsonar/services/SonarService.java

@@ -42,8 +42,8 @@ public class SonarService {
     @Value("${sonar.url}")
     String sonarUrl;
 
-    @Value("${sonar.token}")
-    String sonarToken;
+//    @Value("${sonar.token}")
+//    String sonarToken;
 
     @Value("${extract.path}")
     String extractProgramPath;
@@ -61,11 +61,10 @@ public class SonarService {
                     "-Dsonar.sourceEncoding=utf-8 " +
                     "-Dsonar.projectKey=" + param.getProjectKey() + " " +
                     "-Dsonar.java.binaries=./ " +
-                    "-Dsonar.login=" + sonarToken + " " +
                     "-Dsonar.projectBaseDir=" + param.getProjectPath();
 
             SystemUtil.ExecuteResp executeResp = SystemUtil.executeAndGetExitStatus(command);
-            log.info("java语言:command{},result:{}", command, executeResp.getOutput());
+            log.info("java语言:command{},result:{}",command,executeResp.getOutput());
 
         });
         concurrentHashMap.put(Constant.PYTHON, param -> {
@@ -73,60 +72,33 @@ public class SonarService {
                     "-Dsonar.host.url=" + sonarUrl + " " +
                     "-Dsonar.sourceEncoding=utf-8 " +
                     "-Dsonar.projectKey=" + param.getProjectKey() + " " +
-                    "-Dsonar.login=" + sonarToken + " " +
                     "-Dsonar.projectBaseDir=" + param.getProjectPath();
 
             SystemUtil.ExecuteResp executeResp = SystemUtil.executeAndGetExitStatus(command);
-            log.info("python语言:command{},result:{}", command, executeResp.getOutput());
+            log.info("python语言:command{},result:{}",command,executeResp.getOutput());
         });
         concurrentHashMap.put(Constant.C, param -> {
             String command = "cppcheck --xml --xml-version=2 --enable=all " + param.getProjectPath() + " 2> " + param.getCppCheckReportPath() +
                     "&& sonar-scanner " +
                     "-Dsonar.host.url=" + sonarUrl + " " +
                     "-Dsonar.sourceEncoding=utf-8 " +
-                    "-Dsonar.login=" + sonarToken + " " +
                     "-Dsonar.projectKey=" + param.getProjectKey() + " " +
                     "-Dsonar.cxx.cppcheck.reportPath=" + param.getCppCheckReportPath() + " " +
                     "-Dsonar.projectBaseDir=" + param.getProjectPath();
             SystemUtil.ExecuteResp executeResp = SystemUtil.executeAndGetExitStatus(command);
-            log.info("c语言:command{},result:{}", command, executeResp.getOutput());
+            log.info("c语言:command{},result:{}",command,executeResp.getOutput());
         });
         concurrentHashMap.put(Constant.CXX, param -> {
             String command = "cppcheck --xml --xml-version=2 --enable=all " + param.getProjectPath() + " 2> " + param.getCppCheckReportPath() +
                     "&& sonar-scanner " +
                     "-Dsonar.host.url=" + sonarUrl + " " +
                     "-Dsonar.sourceEncoding=utf-8 " +
-                    "-Dsonar.login=" + sonarToken + " " +
                     "-Dsonar.projectKey=" + param.getProjectKey() + " " +
                     "-Dsonar.cxx.cppcheck.reportPath=" + param.getCppCheckReportPath() + " " +
                     "-Dsonar.projectBaseDir=" + param.getProjectPath();
             SystemUtil.ExecuteResp executeResp = SystemUtil.executeAndGetExitStatus(command);
             log.info("c++: command:{}, result:{}", command, executeResp.getOutput());
         });
-
-        concurrentHashMap.put(Constant.H, param -> {
-            String command = "sonar-scanner " +
-                    "-Dsonar.host.url=" + sonarUrl + " " +
-                    "-Dsonar.sourceEncoding=utf-8 " +
-                    "-Dsonar.login=" + sonarToken + " " +
-                    "-Dsonar.projectKey=" + param.getProjectKey() + " " +
-                    "-Dsonar.projectBaseDir=" + param.getProjectPath();
-            SystemUtil.ExecuteResp executeResp = SystemUtil.executeAndGetExitStatus(command);
-            log.info("H语言 command: {},result:{}", command, executeResp.getOutput());
-        });
-
-
-        concurrentHashMap.put(Constant.OTHER, param -> {
-            String command = "sonar-scanner " +
-                    "-Dsonar.host.url=" + sonarUrl + " " +
-                    "-Dsonar.sourceEncoding=utf-8 " +
-                    "-Dsonar.projectKey=" + param.getProjectKey() + " " +
-                    "-Dsonar.login=" + sonarToken + " " +
-                    "-Dsonar.projectBaseDir=" + param.getProjectPath();
-
-            SystemUtil.ExecuteResp executeResp = SystemUtil.executeAndGetExitStatus(command);
-            log.info("Other语言 command:{},result:{}", command, executeResp.getOutput());
-        });
     }
 
     /**
@@ -206,7 +178,7 @@ public class SonarService {
     public void sonar(String language, SonarScannerParam sonarScannerParam) {
         Consumer<SonarScannerParam> consumer = concurrentHashMap.get(language.toLowerCase());
         if (consumer != null) {
-            log.info("语言:{},projectName:{},path:{}找到了consumer", language, sonarScannerParam.getProjectKey(), sonarScannerParam.getProjectPath());
+            log.info("语言:{},projectName:{},path:{}找到了consumer", language, sonarScannerParam.getProjectKey(),sonarScannerParam.getProjectPath());
             consumer.accept(sonarScannerParam);
         }
     }
@@ -218,7 +190,6 @@ public class SonarService {
                 "-Dsonar.sourceEncoding=utf-8 " +
                 "-Dsonar.projectKey=" + key + " " +
                 "-Dsonar.java.binaries=./ " +
-                "-Dsonar.login=" + sonarToken + " " +
                 "-Dsonar.projectBaseDir=" + projectPath;
         log.info("projectPath:{},key:{}, command: {}", projectPath, key, command);
         SystemUtil.executeAndGetExitStatus(command);
@@ -226,11 +197,10 @@ public class SonarService {
 
     /**
      * 是否是支持的语言
-     *
      * @param language
      * @return
      */
-    public boolean supportLanguage(String language) {
+    public boolean supportLanguage(String language){
         return concurrentHashMap.containsKey(language.toLowerCase());
     }
 

src/main/java/net/educoder/ecsonar/task/QualityInspectRunnable.java

@@ -8,7 +8,6 @@ import net.educoder.ecsonar.model.TaskInfoDetail;
 import net.educoder.ecsonar.model.vo.QualityInspectUserDataVO;
 import net.educoder.ecsonar.services.DbOperateService;
 import net.educoder.ecsonar.services.SonarService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.tomcat.util.http.fileupload.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,11 +15,8 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
 
 
 /**
@@ -45,9 +41,9 @@ public class QualityInspectRunnable implements Runnable {
     private SonarService sonarService;
 
     public QualityInspectRunnable(String taskId, String language, String homeworkId,
-            TaskInfoDetail taskInfoDetail,
-            QualityInspectUserDataVO userData,
-            ExecutorService queryResultPool) {
+                                  TaskInfoDetail taskInfoDetail,
+                                  QualityInspectUserDataVO userData,
+                                  ExecutorService queryResultPool) {
         this.taskId = taskId;
         this.language = language;
         this.homeworkId = homeworkId;
@@ -59,22 +55,47 @@ public class QualityInspectRunnable implements Runnable {
 
     @Override
     public void run() {
-        String projectName = String.format("%s-%s", homeworkId, userData.getUserId());
+        String projectName = String.format("%s-%s", homeworkId, userData.getStudentId());
         String path = String.format("/tmp/%s/%s/", homeworkId, projectName);
 
         List<Long> codeIds = userData.getCodeIds();
-        List<Long> shiXunCodeIds = userData.getStudentWorkShixunCodeIds();
+        boolean constantCFlag = true,constantCPPFlag = true,constantJavaFlag = true, constantPyFlag = true;
+        for (Long codeId : codeIds) {
+            File file = new File(path);
+            try {
+                FileUtils.forceMkdir(file);
+            } catch (IOException e) {
+            }
 
-        if(CollectionUtils.isNotEmpty(shiXunCodeIds)){
-            for (Long codeId : shiXunCodeIds) {
-                processCodeId(codeId, path, projectName, dbOperateService::queryShiXunCodesById);
+            GameCodes gameCodes = dbOperateService.queryGameCodesById(codeId);
+            if(gameCodes == null){
+                LOGGER.error("projectName:{}, game_codes_id:{}找不到对应的学员代码",projectName, codeId);
+                continue;
             }
-        }else{
-            for (Long codeId : codeIds) {
-                processCodeId(codeId, path, projectName, dbOperateService::queryGameCodesById);
+            FileUtil.writeString(gameCodes.getCode(), path + gameCodes.getPath(), Charset.forName("UTF-8"));
+
+            if (constantCFlag && gameCodes.getPath().toLowerCase().contains(".c")) {
+                constantCFlag = false;
+            } else if (constantCPPFlag && gameCodes.getPath().toLowerCase().contains(".cpp")) {
+                constantCPPFlag = false;
+            } else if (constantJavaFlag && gameCodes.getPath().toLowerCase().contains(".java")) {
+                constantJavaFlag = false;
+            } else if (constantPyFlag && gameCodes.getPath().toLowerCase().contains(".py")) {
+                constantPyFlag = false;
             }
         }
 
+        // 需要自己判别语言,Java优先
+        if(!constantJavaFlag){
+            language = Constant.JAVA;
+        }else if(!constantPyFlag){
+            language = Constant.PYTHON;
+        } else if(!constantCFlag){
+            language = Constant.C;
+        }else if(!constantCPPFlag){
+            language = Constant.CXX;
+        }
+
         // 写完所有文件开始用sonar进行质量分析
         SonarScannerParam param = new SonarScannerParam(projectName, path);
         if (Constant.C.equalsIgnoreCase(language) || Constant.CXX.equalsIgnoreCase(language)) {
@@ -112,45 +133,4 @@ public class QualityInspectRunnable implements Runnable {
     public void setSonarService(SonarService sonarService) {
         this.sonarService = sonarService;
     }
-
-    private void processCodeId(Long codeId, String path, String projectName, Function<Long, GameCodes> queryMethod) {
-        boolean constantCFlag = true, constantCPPFlag = true, constantJavaFlag = true, constantPyFlag = true;
-        File file = new File(path);
-        try {
-            FileUtils.forceMkdir(file);
-        } catch (IOException e) {
-            LOGGER.error("创建目录失败: {}", path, e);
-        }
-
-        GameCodes gameCodes = queryMethod.apply(codeId);
-        if (gameCodes == null) {
-            LOGGER.error("projectName:{}, game_codes_id:{} 找不到对应的学员代码", projectName, codeId);
-            return;
-        }
-
-        Path filePath = Paths.get(path, gameCodes.getPath());
-        FileUtil.writeString(gameCodes.getCode(), filePath.toString(), Charset.forName("UTF-8"));
-
-        String filePathLower = gameCodes.getPath().toLowerCase();
-        if (constantCFlag && filePathLower.matches(".*\\.c$")) {
-            constantCFlag = false;
-        } else if (constantCPPFlag && filePathLower.matches(".*\\.cpp$")) {
-            constantCPPFlag = false;
-        } else if (constantJavaFlag && filePathLower.matches(".*\\.java$")) {
-            constantJavaFlag = false;
-        } else if (constantPyFlag && filePathLower.matches(".*\\.py$")) {
-            constantPyFlag = false;
-        }
-
-        // 需要自己判别语言,Java优先
-        if (!constantJavaFlag) {
-            language = Constant.JAVA;
-        } else if (!constantPyFlag) {
-            language = Constant.PYTHON;
-        } else if (!constantCFlag) {
-            language = Constant.C;
-        } else if (!constantCPPFlag) {
-            language = Constant.CXX;
-        }
-    }
 }

src/main/resources/application.properties

@@ -6,7 +6,7 @@
 
 spring.datasource.initSize=20
 #spring.datasource.master.url=jdbc:postgresql://127.0.0.1:5432/sonar7.7
-spring.datasource.master.url=jdbc:postgresql://106.75.25.158:5432/sonar
+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.driverClassName=org.postgresql.Driver
@@ -14,7 +14,7 @@ spring.datasource.master.driverClassName=org.postgresql.Driver
 
 #### test ######
 spring.datasource.readonly.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.readonly.url=jdbc:mysql://testeducoder-public.mysql.polardb.rds.aliyuncs.com:3306/newtesteducoderweb?useSSL=false&useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false
+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.username=testeducoder
 spring.datasource.readonly.password=TEST@123
 
@@ -45,9 +45,8 @@ excel.template.path=template.xlsx
 
 sonar.url=http://127.0.0.1:9000
 #sonar.url=http://117.50.14.123:9000
-# token令牌    02c142773360aebeedb4af1b178e20115ef46758
-#sonar.token=0253a518e824a976ea2f11aec17938cb0f8c0495
-sonar.token=02c142773360aebeedb4af1b178e20115ef46758
+# token令牌
+sonar.token=0253a518e824a976ea2f11aec17938cb0f8c0495
 
 extract.path=/usr/local/bin/unar
 #extract.path=/usr/bin/unar