调整文件系统的程序位置，修正邮件日志的显示系统

byit-myth-admin/src/main/resources/application-dev.yml

@@ -31,3 +31,6 @@ file:
   system:
     ip: 10.0.120.2
     port: 88
+
+myth-job:
+  filestystem: FASTDFS
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/RunRecordingScanHelper.java

@@ -3,6 +3,7 @@ package com.byit.thread;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.byit.enums.RunRecordingEnum;
+import com.byit.filesystem.FileSystem;
 import com.byit.model.EmailAlarm;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.RunRecording;
@@ -11,15 +12,17 @@ import com.byit.service.JobTaskRunLogService;
 import com.byit.service.RunRecordingService;
 import com.byit.util.TimeFormatUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.csource.common.MyException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -59,20 +62,23 @@ public class RunRecordingScanHelper {
 
     private static final String FILE_SYSTEM_PRE="http://";
 
+
     private DataSource dataSource;
 
     private final EmailAlarmService emailAlarmService;
     private final JobTaskRunLogService jobTaskRunLogService;
     private final RunRecordingService runRecordingService;
+    private final FileSystem fileSystem;
 
     private volatile boolean runRecordingThreadStop = false;
     private Thread runRecordingThread;
 
     @Autowired
-    public RunRecordingScanHelper(EmailAlarmService emailAlarmService, JobTaskRunLogService jobTaskRunLogService, RunRecordingService runRecordingService) {
+    public RunRecordingScanHelper(EmailAlarmService emailAlarmService, JobTaskRunLogService jobTaskRunLogService, RunRecordingService runRecordingService, FileSystem fileSystem) {
         this.emailAlarmService = emailAlarmService;
         this.jobTaskRunLogService = jobTaskRunLogService;
         this.runRecordingService = runRecordingService;
+        this.fileSystem = fileSystem;
     }
 
     public void start() {
@@ -258,6 +264,14 @@ public class RunRecordingScanHelper {
                  * String logFilePath = FILE_SYSTEM_PRE+fileSystemIp+":"+fileSystemPort+"/"+jobTaskRunLog.getLogRemotelyPath();
                  * String logFileUrl = String.format(iframeHtml,logFilePath);
                  */
+                String logStr = null;
+                try {
+                    if(null != jobTaskRunLog.getLogRemotelyPath()){
+                        logStr = new String(fileSystem.downloaderFile(jobTaskRunLog.getLogRemotelyPath()), StandardCharsets.UTF_8);
+                    }
+                } catch (IOException | MyException e) {
+                    e.printStackTrace();
+                }
                 stringBuilder.append("<tr align='center'>")
                         .append(String.format("<td>%s</td>", jobTaskRunLog.getNodeName()))
                         .append(String.format("<td>%s</td>", DateUtil.format(jobTaskRunLog.getStartTime(), DATE_FORMAT)))
@@ -268,7 +282,7 @@ public class RunRecordingScanHelper {
                                 : "4".equals(jobTaskRunLog.getRunCode()) ? "补批失败" : "失败"))
                         .append("<td>")
                         .append("<div style='display:inline-block;width:100%;word-break:break-all;height: auto;overflow: auto;text-align: left;'>")
-                        .append(String.format("%s", jobTaskRunLog.getRunMsg()))
+                        .append(String.format("%s", logStr==null?jobTaskRunLog.getRunMsg():logStr))
                         .append("</div>")
                         .append("</td></tr>");
 

byit-myth-core/myth-core-common/pom.xml

@@ -13,6 +13,10 @@
     <artifactId>myth-core-common</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>net.oschina.zcx7878</groupId>
+            <artifactId>fastdfs-client-java</artifactId>
+        </dependency>
         <!-- slf4j -->
         <dependency>
             <groupId>org.slf4j</groupId>

byit-myth-core/myth-executor-core/src/main/java/com/byit/executor/filesystem/FastDfsFileSystem.java → byit-myth-core/myth-core-common/src/main/java/com/byit/filesystem/FastDfsFileSystem.java

-package com.byit.executor.filesystem;
+package com.byit.filesystem;
 
 import cn.hutool.core.collection.CollectionUtil;
 import org.csource.common.MyException;
 import org.csource.common.NameValuePair;
-import org.csource.fastdfs.*;
+import org.csource.fastdfs.ClientGlobal;
+import org.csource.fastdfs.StorageClient1;
+import org.csource.fastdfs.TrackerClient;
+import org.csource.fastdfs.TrackerServer;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

byit-myth-core/myth-executor-core/src/main/java/com/byit/executor/filesystem/FileSystem.java → byit-myth-core/myth-core-common/src/main/java/com/byit/filesystem/FileSystem.java

-package com.byit.executor.filesystem;
+package com.byit.filesystem;
 
 import org.csource.common.MyException;
 
@@ -19,7 +19,7 @@ public interface FileSystem {
      * @throws IOException
      * @throws MyException
      */
-    String uploadFile(byte[] fileBuffer, String fileExtName, Map<String,String> mateDaTA) throws IOException, MyException;
+    String uploadFile(byte[] fileBuffer, String fileExtName, Map<String, String> mateDaTA) throws IOException, MyException;
 
     /**
      * 文件下载接口

byit-myth-core/myth-executor-core/pom.xml

@@ -47,10 +47,10 @@
             <artifactId>guava</artifactId>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>net.oschina.zcx7878</groupId>
             <artifactId>fastdfs-client-java</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>junit</groupId>

byit-myth-core/myth-executor-core/src/test/java/com/test/Test1.java

 package com.test;
 
-import com.byit.executor.filesystem.FastDfsFileSystem;
+
+import com.byit.filesystem.FastDfsFileSystem;
 import org.apache.commons.io.FileUtils;
 import org.csource.common.MyException;
 

byit-myth-executor/myth-executor-server/src/main/java/com/byit/service/ScriptExecutorServiceImpl.java

@@ -2,9 +2,9 @@ package com.byit.service;
 
 import com.alibaba.fastjson.JSON;
 import com.byit.executor.api.ScriptExecutorService;
-import com.byit.executor.filesystem.FileSystem;
 import com.byit.executor.jobExecutor.process.MythJobProcess;
 import com.byit.executor.jobExecutor.process.ProcessFailureException;
+import com.byit.filesystem.FileSystem;
 import com.byit.job.dto.DispatchResponseDto;
 import com.byit.job.dto.JobRunResultDto;
 import com.byit.job.dto.ScriptDto;