diff --git a/src/main/java/com/dispose/dispose/impl/DpTechImpl.java b/src/main/java/com/dispose/dispose/impl/DpTechImpl.java index 298bc8e5..a91cccf0 100644 --- a/src/main/java/com/dispose/dispose/impl/DpTechImpl.java +++ b/src/main/java/com/dispose/dispose/impl/DpTechImpl.java @@ -77,15 +77,17 @@ public class DpTechImpl implements DisposeEntryManager { ctx.put("password", dev.getPassword()); ctx.put("username", dev.getUserName()); - // 配置连接,访问超时时间 - Client proxy = ClientProxy.getClient(this.cleanTypePort); - HTTPConduit conduit = (HTTPConduit) proxy.getConduit(); - HTTPClientPolicy policy = new HTTPClientPolicy(); - // 请求超时 - policy.setConnectionTimeout(GlobalVar.SOAP_CONNECT_TIMEOUT); - //读取超时 - policy.setReceiveTimeout(GlobalVar.SOAP_RECEIVE_TIMEOUT); - conduit.setClient(policy); + if(GlobalVar.SOAP_CONNECT_TIMEOUT > 0 || GlobalVar.SOAP_RECEIVE_TIMEOUT > 0) { + // 配置连接,访问超时时间 + Client proxy = ClientProxy.getClient(this.cleanTypePort); + HTTPConduit conduit = (HTTPConduit) proxy.getConduit(); + HTTPClientPolicy policy = new HTTPClientPolicy(); + // 请求超时 + policy.setConnectionTimeout(GlobalVar.SOAP_CONNECT_TIMEOUT); + //读取超时 + policy.setReceiveTimeout(GlobalVar.SOAP_RECEIVE_TIMEOUT); + conduit.setClient(policy); + } } /** diff --git a/src/main/java/com/dispose/task/TaskManagerTask.java b/src/main/java/com/dispose/task/TaskManagerTask.java index cc642f79..7b2705ba 100644 --- a/src/main/java/com/dispose/task/TaskManagerTask.java +++ b/src/main/java/com/dispose/task/TaskManagerTask.java @@ -6,7 +6,6 @@ import com.dispose.common.GlobalVar; import com.dispose.pojo.vo.common.TaskInfoDetail; import com.dispose.service.TaskService; import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -23,11 +22,10 @@ import java.util.Iterator; public class TaskManagerTask { @Resource private TaskService taskService; - /** * Task runtime manager. */ - @Async("bizExecutor") + @Scheduled(fixedDelay = 1000) public void taskRuntimeManager() { Iterator<TaskInfoDetail> it = taskService.getActiveTask().iterator();