Commit 972746f2 by huangfusuper

改变fdfs ip的注入配置

parent c5502c2f
......@@ -10,6 +10,7 @@ import com.byit.service.JobTaskRunLogService;
import com.byit.service.RunRecordingService;
import com.byit.service.mapservice.RunRecordingAndEmailService;
import com.byit.util.TimeFormatUtil;
import com.github.tobato.fastdfs.conn.TrackerConnectionManager;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
......@@ -37,16 +38,16 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
*/
private final RunRecordingService runRecordingService;
@Value("${fdfs.tracker-list}")
private List<String> trackerIps;
private final TrackerConnectionManager trackerConnectionManager;
@Value("${fdfs.http-port}")
private String trackerIpsPort;
public RunRecordingAndEmailServiceImpl(EmailAlarmService emailAlarmService, JobTaskRunLogService jobTaskRunLogService,
RunRecordingService runRecordingService) {
RunRecordingService runRecordingService, TrackerConnectionManager trackerConnectionManager) {
this.emailAlarmService = emailAlarmService;
this.jobTaskRunLogService = jobTaskRunLogService;
this.runRecordingService = runRecordingService;
this.trackerConnectionManager = trackerConnectionManager;
}
@Override
......@@ -104,8 +105,9 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
String logStr = "无远程路径";
if(StringUtils.isNotBlank(jobTaskRunLog.getLogRemotelyPath())){
logStr = jobTaskRunLog.getLogRemotelyPath();
if (CollectionUtil.isNotEmpty(trackerIps)) {
for (String ipPort : trackerIps) {
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";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment