diff --git a/monitor-service-awstools/src/main/java/com/monitor/cloudtools/controller/CloudToolController.java b/monitor-service-awstools/src/main/java/com/monitor/cloudtools/controller/CloudToolController.java index 051dd26..2b23c75 100644 --- a/monitor-service-awstools/src/main/java/com/monitor/cloudtools/controller/CloudToolController.java +++ b/monitor-service-awstools/src/main/java/com/monitor/cloudtools/controller/CloudToolController.java @@ -219,8 +219,8 @@ public class CloudToolController { */ @RequestMapping("/updateAnsibleDeployForNode") @ResponseBody - public BaseResponse updateAnsibleDeployForNode(String operate,String cloudTypeStr, String ip){ - BaseResponse response = cloudToolService.updateAnsibleDeployForNode(operate, cloudTypeStr, ip); + public BaseResponse updateAnsibleDeployForNode(@RequestBody AutoScalingInfoReq infoReq){ + BaseResponse response = cloudToolService.updateAnsibleDeployForNode(infoReq.getOperate(), infoReq.getCloudTypeStr(), infoReq.getChangeIps()); return response; } diff --git a/monitor-service-awstools/src/main/java/com/monitor/cloudtools/model/AutoScalingInfoReq.java b/monitor-service-awstools/src/main/java/com/monitor/cloudtools/model/AutoScalingInfoReq.java index cc32196..bb7543c 100644 --- a/monitor-service-awstools/src/main/java/com/monitor/cloudtools/model/AutoScalingInfoReq.java +++ b/monitor-service-awstools/src/main/java/com/monitor/cloudtools/model/AutoScalingInfoReq.java @@ -14,6 +14,12 @@ public class AutoScalingInfoReq { */ private int cloudType; + private String operate; + + private String cloudTypeStr; + + private String changeIps; + //新申请到的ip串 private String newInstanceIps; diff --git a/monitor-service-awstools/src/main/java/com/monitor/cloudtools/service/impl/CloudToolServiceImpl.java b/monitor-service-awstools/src/main/java/com/monitor/cloudtools/service/impl/CloudToolServiceImpl.java index e3703c1..a62a427 100644 --- a/monitor-service-awstools/src/main/java/com/monitor/cloudtools/service/impl/CloudToolServiceImpl.java +++ b/monitor-service-awstools/src/main/java/com/monitor/cloudtools/service/impl/CloudToolServiceImpl.java @@ -232,7 +232,7 @@ public class CloudToolServiceImpl implements CloudToolService { response.setMessage("参数不全"); return response; } - String commond = "ssh master@172.31.16.167 sh /home/master/ansible_deploy/update-ip.sh"; + String commond = "ssh master@172.31.16.167 sh /home/master/ansible_deploy/update-ip2.sh"; try{ String message = CommodUtil.exe(commond+" "+operate+" "+cloudTypeStr+" "+ip); response.setMessage(message);