Merge branch 'master' of https://github.com/metersphere/metersphere
This commit is contained in:
commit
7992567189
|
@ -28,7 +28,7 @@ import static io.metersphere.commons.constants.ResourceStatusEnum.VALID;
|
||||||
public class NodeResourcePoolService {
|
public class NodeResourcePoolService {
|
||||||
private final static String nodeControllerUrl = "http://%s:%s/status";
|
private final static String nodeControllerUrl = "http://%s:%s/status";
|
||||||
|
|
||||||
@Resource
|
@Resource(name = "restTemplateWithTimeOut")
|
||||||
private RestTemplate restTemplateWithTimeOut;
|
private RestTemplate restTemplateWithTimeOut;
|
||||||
@Resource
|
@Resource
|
||||||
private TestResourceMapper testResourceMapper;
|
private TestResourceMapper testResourceMapper;
|
||||||
|
|
Loading…
Reference in New Issue