调整邮箱日志格式

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/RunRecordingAndEmailServiceImpl.java

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -105,16 +106,17 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
                  * String logFilePath = FILE_SYSTEM_PRE+fileSystemIp+":"+fileSystemPort+"/"+jobTaskRunLog.getLogRemotelyPath();
                  * String logFileUrl = String.format(iframeHtml,logFilePath);
                  */
-                String logStr = "无远程路径";
+                StringBuilder logStr = new StringBuilder("<br/>");
                 if(StringUtils.isNotBlank(jobTaskRunLog.getLogRemotelyPath())){
-                    logStr = jobTaskRunLog.getLogRemotelyPath();
+                    //logStr = jobTaskRunLog.getLogRemotelyPath();
                     List<String> trackerList = trackerConnectionManager.getTrackerList();
                     if (CollectionUtil.isNotEmpty(trackerList)) {
                         for (String ipPort : trackerList) {
                             String ip = ipPort.split(":")[0];
-                            String baseUrl = "http://"+ip+":"+trackerIpsPort+"/";
-                            logStr += baseUrl + logStr+"\n\n";
-                            log.debug("--------log远程路径为:{}------",logStr);
+                            String baseUrl = "http://"+ip+":"+"8888"+"/";
+                            String hrefUrl = baseUrl + jobTaskRunLog.getLogRemotelyPath();
+                            logStr.append("<a href='").append(hrefUrl).append("'target='_blank'>").append(baseUrl).append("</a><br/><br/>");
+                            log.info("-----------------日志远程路径为：{}------------------", logStr.toString());
                         }
                     }
 
@@ -129,7 +131,7 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
                                 : "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", logStr))
+                        .append(String.format("%s", logStr.toString()))
                         .append("</div>")
                         .append("</td></tr>");
 
@@ -139,4 +141,20 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
                 .append("</table>");
         return stringBuilder.toString();
     }
+
+    public static void main(String[] args) {
+        List<String> trackerListTest = new ArrayList<>();
+        trackerListTest.add("127.0.0.1:8989");
+        trackerListTest.add("127.0.0.2:8989");
+        trackerListTest.add("127.0.0.3:8989");
+        StringBuilder logStr = new StringBuilder("<br/>");
+        String path = "ddmp/M00/00/0B/CgB42F7DTa6AdGG1AAAABH0VDjQ718.log";
+        for (String ipPort : trackerListTest) {
+            String ip = ipPort.split(":")[0];
+            String baseUrl = "http://"+ip+":"+"8888"+"/";
+            String hrefUrl = baseUrl + path;
+            logStr.append("<a href='").append(hrefUrl).append("'target='_blank'>").append(baseUrl).append("</a><br/><br/>");
+        }
+        System.out.println(logStr);
+    }
 }