Commit 9a5dce7d authored by chenchao.deng's avatar chenchao.deng

对接阿里云Ecs Api

parent acd05077
......@@ -154,7 +154,7 @@ public class BrowserTask {
RunInstancesResponse response = AliEcsClient.runInstances(
ipResource.getOwner(), ipResource.getUsername(),ipResource.getPassword(), aliRegion);
if (null ==response || !response.getStatusCode().equals(200)) {
log.error("{}, fail to buy ip : {}", logs, JSON.toJSON(response.getBody()));
log.error("{}, fail to buy ip : {}", logs, JSON.toJSON(response));
}else if(Objects.nonNull(response.getBody())){
String instanceId = response.getBody().getInstanceIdSets().getInstanceIdSet().get(0);
cloudPlatformOrder.setPlatformOrderId(instanceId);
......@@ -237,7 +237,17 @@ public class BrowserTask {
if(Objects.nonNull(response.getBody())){
DescribeInstancesResponseBody body = response.getBody();
//TODO 查询ip信息并且封装
//TODO 查询ip信息并且封装 到期时间还没有明确
ipResource.setAddr(body.getInstances().getInstance().get(0).getPublicIpAddress().getIpAddress().get(0));
ipResource.setStatus(0);
//ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());
if (StringUtils.isNotBlank(ipResource.getRegion()) && region.contains(ipResource.getRegion())) {
ipResource.setProxyUsername(ipResource.getAddr());
ipResource.setProxyPassword(genRandom(3, 12));
ipResource.setSpecialLine(true);
}
ipResourceRepository.save(ipResource);
}
}
......
......@@ -31,10 +31,10 @@ class BrowserBackendApplicationTests {
@Test
void buyEcsTest() throws Exception {
//browserTask.buyIpNewTasks();
browserTask.queryIpNewTasks();
//AliEcsClient.runInstances("11","cn-shenzhen","2222");
//AliEcsClient.getDescribeInstances("测试","i-wz9hf0i13xj6h904k14p","cn-shenzhen");
DeleteInstanceResponse response = AliEcsClient.deleteInstance("测试", "i-wz91k777e49z85nt5xl3","cn-shenzhen");
//DeleteInstanceResponse response = AliEcsClient.deleteInstance("测试", "i-wz91k777e49z85nt5xl3","cn-shenzhen");
}
@Test
......
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