gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(sj_1.2.0-beta1): 兼容JDK1.8

Browse Source
This commit is contained in:
dhb52 2024-09-08 11:14:12 +08:00 committed by opensnail
parent a722626610
commit 6a9b26f692
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractScriptExecutor.java
View File

@ -1,13 +1,13 @@
package com.aizuda.snailjob.client.job.core.executor; package com.aizuda.snailjob.client.job.core.executor;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.client.common.config.SnailJobProperties; import com.aizuda.snailjob.client.common.config.SnailJobProperties;
import com.aizuda.snailjob.common.core.util.SnailJobFileUtil;
import com.aizuda.snailjob.common.core.util.SnailJobSystemUtil;
import com.aizuda.snailjob.client.model.ExecuteResult; import com.aizuda.snailjob.client.model.ExecuteResult;
import com.aizuda.snailjob.common.core.context.SnailSpringContext; import com.aizuda.snailjob.common.core.context.SnailSpringContext;
import com.aizuda.snailjob.common.core.exception.SnailJobInnerExecutorException; import com.aizuda.snailjob.common.core.exception.SnailJobInnerExecutorException;
import com.aizuda.snailjob.common.core.util.SnailJobFileUtil;
import com.aizuda.snailjob.common.core.util.SnailJobSystemUtil;
import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.log.SnailJobLog;
import io.micrometer.common.util.StringUtils;
import lombok.Data; import lombok.Data;
import java.io.*; import java.io.*;
@ -246,7 +246,7 @@ public abstract class AbstractScriptExecutor {
SnailJobLog.REMOTE.warn("[snail-job] " + msg, params); SnailJobLog.REMOTE.warn("[snail-job] " + msg, params);
} }
public class SnailFileUtils { public static class SnailFileUtils {
/** /**
* 获取工作目录 * 获取工作目录
@ -256,7 +256,7 @@ public abstract class AbstractScriptExecutor {
public static String workspace() { public static String workspace() {
SnailJobProperties snailJobProperties = SnailSpringContext.getBean(SnailJobProperties.class); SnailJobProperties snailJobProperties = SnailSpringContext.getBean(SnailJobProperties.class);
String workspaceByDKey = snailJobProperties.getWorkspace(); String workspaceByDKey = snailJobProperties.getWorkspace();
if (StringUtils.isNotEmpty(workspaceByDKey)) { if (StrUtil.isNotEmpty(workspaceByDKey)) {
SnailJobLog.LOCAL.info("[FileUtils] [workspace] use custom workspace: {}", workspaceByDKey); SnailJobLog.LOCAL.info("[FileUtils] [workspace] use custom workspace: {}", workspaceByDKey);
return workspaceByDKey; return workspaceByDKey;
} }