Authored by qinchao

发布机更改

@@ -156,7 +156,7 @@ public class CloudToolServiceImpl implements CloudToolService { @@ -156,7 +156,7 @@ public class CloudToolServiceImpl implements CloudToolService {
156 response.setMessage("参数不全"); 156 response.setMessage("参数不全");
157 return response; 157 return response;
158 } 158 }
159 - String commond = "ssh master@172.31.16.167 sh /home/master/auto_deploy/deploy/update-ips.sh -a%s -e%s -i%s"; 159 + String commond = "ssh master@10.66.80.23 sh /home/master/auto_deploy/deploy/update-ips.sh -a%s -e%s -i%s";
160 160
161 try{ 161 try{
162 List<String> ips = new ArrayList<String>(); 162 List<String> ips = new ArrayList<String>();
@@ -207,7 +207,7 @@ public class CloudToolServiceImpl implements CloudToolService { @@ -207,7 +207,7 @@ public class CloudToolServiceImpl implements CloudToolService {
207 response.setMessage("参数不全"); 207 response.setMessage("参数不全");
208 return response; 208 return response;
209 } 209 }
210 - String commond = "ssh master@172.31.16.167 sh /home/master/auto_deploy/deploy/update-upstream.sh"; 210 + String commond = "ssh master@10.66.80.23 sh /home/master/auto_deploy/deploy/update-upstream.sh";
211 try{ 211 try{
212 String message = CommodUtil.exe(commond+" "+operate+" "+cloudTypeStr+" "+ip); 212 String message = CommodUtil.exe(commond+" "+operate+" "+cloudTypeStr+" "+ip);
213 response.setMessage(message); 213 response.setMessage(message);
@@ -229,7 +229,7 @@ public class CloudToolServiceImpl implements CloudToolService { @@ -229,7 +229,7 @@ public class CloudToolServiceImpl implements CloudToolService {
229 response.setMessage("参数不全"); 229 response.setMessage("参数不全");
230 return response; 230 return response;
231 } 231 }
232 - String commond = "ssh master@172.31.16.167 sh /home/master/ansible_deploy/update-ip2.sh"; 232 + String commond = "ssh master@10.66.80.23 sh /home/master/ansible_deploy/update-ip2.sh";
233 try{ 233 try{
234 String message = CommodUtil.exe(commond+" "+operate+" "+cloudTypeStr+" "+ip); 234 String message = CommodUtil.exe(commond+" "+operate+" "+cloudTypeStr+" "+ip);
235 response.setMessage(message); 235 response.setMessage(message);
@@ -572,9 +572,9 @@ public class CloudToolServiceImpl implements CloudToolService { @@ -572,9 +572,9 @@ public class CloudToolServiceImpl implements CloudToolService {
572 572
573 public BaseResponse updateNginxConfig(AutoScalingInfoReq infoReq){ 573 public BaseResponse updateNginxConfig(AutoScalingInfoReq infoReq){
574 BaseResponse response=new BaseResponse(); 574 BaseResponse response=new BaseResponse();
575 - String commond = "ssh master@172.31.16.167 sh /home/master/nginx-sync/update-java-nginx.sh"; 575 + String commond = "ssh master@10.66.80.23 sh /home/master/nginx-sync/update-java-nginx.sh";
576 if(!"java".equalsIgnoreCase(infoReq.getNginxType())){ 576 if(!"java".equalsIgnoreCase(infoReq.getNginxType())){
577 - commond = "ssh master@172.31.16.167 sh /home/master/nginx-sync/update-pch5-nginx.sh"; 577 + commond = "ssh master@10.66.80.23 sh /home/master/nginx-sync/update-pch5-nginx.sh";
578 } 578 }
579 String cloud = "aws"; 579 String cloud = "aws";
580 if(2==infoReq.getCloudType()){ 580 if(2==infoReq.getCloudType()){
@@ -32,7 +32,7 @@ public class InternalDnsCtrl { @@ -32,7 +32,7 @@ public class InternalDnsCtrl {
32 32
33 private Logger logger = LoggerFactory.getLogger("switchLogger"); 33 private Logger logger = LoggerFactory.getLogger("switchLogger");
34 34
35 - private String URL = "http://172.31.16.167:8883/dns/refreshDns"; 35 + private String URL = "http://10.66.80.23:8883/dns/refreshDns";
36 36
37 //private String URL = "http://127.0.0.1:8883/dns/refreshDns"; 37 //private String URL = "http://127.0.0.1:8883/dns/refreshDns";
38 38
@@ -27,7 +27,7 @@ public class NodePm2Task { @@ -27,7 +27,7 @@ public class NodePm2Task {
27 27
28 private static Logger logger = LoggerFactory.getLogger(NodePm2Task.class); 28 private static Logger logger = LoggerFactory.getLogger(NodePm2Task.class);
29 29
30 - private String URL = "http://172.31.16.167:8883/node/"; 30 + private String URL = "http://10.66.80.23:8883/node/";
31 31
32 private static ConcurrentHashMap<String, PythonProject> concurrentHashMap = new ConcurrentHashMap<>(); 32 private static ConcurrentHashMap<String, PythonProject> concurrentHashMap = new ConcurrentHashMap<>();
33 33
@@ -47,7 +47,7 @@ public class ExeIpTask implements Runnable { @@ -47,7 +47,7 @@ public class ExeIpTask implements Runnable {
47 RestartProcess restartProcess = RestartProcessStore.get(id); 47 RestartProcess restartProcess = RestartProcessStore.get(id);
48 DecimalFormat formater = new DecimalFormat("######0.00"); 48 DecimalFormat formater = new DecimalFormat("######0.00");
49 formater.setRoundingMode(RoundingMode.UP); 49 formater.setRoundingMode(RoundingMode.UP);
50 - String commond = "ssh master@172.31.16.167 sh /home/master/.java_pm/java_restart.sh " + exe + " single " + project + " " + ip; 50 + String commond = "ssh master@10.66.80.23 sh /home/master/.java_pm/java_restart.sh " + exe + " single " + project + " " + ip;
51 try { 51 try {
52 if ("restart".equals(exe)){ 52 if ("restart".equals(exe)){
53 IpStatus.add(project,ip); 53 IpStatus.add(project,ip);
@@ -34,7 +34,7 @@ public class ExeProjectTask implements Runnable { @@ -34,7 +34,7 @@ public class ExeProjectTask implements Runnable {
34 if (restartProcess.getFirstList().size() == 0){ 34 if (restartProcess.getFirstList().size() == 0){
35 int firstLength; 35 int firstLength;
36 if (!"single".equals(restartModel.getCloud())) { 36 if (!"single".equals(restartModel.getCloud())) {
37 - String commond = "ssh master@172.31.16.167 sh /home/master/.java_pm/java_restart.sh getIPs " + restartModel.getCloud() + " " + project; 37 + String commond = "ssh master@10.66.80.23 sh /home/master/.java_pm/java_restart.sh getIPs " + restartModel.getCloud() + " " + project;
38 List<String> ips = CommodUtil.exe(commond); 38 List<String> ips = CommodUtil.exe(commond);
39 if (ips.isEmpty()) { 39 if (ips.isEmpty()) {
40 log.error("ips is null,cloud:{},project:{}", restartModel.getCloud(), project); 40 log.error("ips is null,cloud:{},project:{}", restartModel.getCloud(), project);
@@ -70,7 +70,7 @@ public class JavaProjectStatusLoaderTask { @@ -70,7 +70,7 @@ public class JavaProjectStatusLoaderTask {
70 70
71 private List<JavaProjectStatus> getStatusInfos(String projectName) { 71 private List<JavaProjectStatus> getStatusInfos(String projectName) {
72 List<JavaProjectStatus> javaProjectStatusList = new ArrayList<>(); 72 List<JavaProjectStatus> javaProjectStatusList = new ArrayList<>();
73 - String commond = "ssh master@172.31.16.167 sh /home/master/.java_pm/java_restart.sh checkstatus mix " + projectName; 73 + String commond = "ssh master@10.66.80.23 sh /home/master/.java_pm/java_restart.sh checkstatus mix " + projectName;
74 List<String> list = CommodUtil.exe(commond); 74 List<String> list = CommodUtil.exe(commond);
75 for (String string : list) { 75 for (String string : list) {
76 String[] array = string.split("@@"); 76 String[] array = string.split("@@");
@@ -5,7 +5,7 @@ JavaApiExecutorPoolCoreSize=30 @@ -5,7 +5,7 @@ JavaApiExecutorPoolCoreSize=30
5 #java api 执行最大线程数 5 #java api 执行最大线程数
6 JavaApiExecutorPoolMaxSize=50 6 JavaApiExecutorPoolMaxSize=50
7 7
8 -nginxsync.agent=172.31.16.167:6060 8 +nginxsync.agent=10.66.80.23:6060
9 9
10 zookeeper.address=yoho-ops-zookeeper:2181 10 zookeeper.address=yoho-ops-zookeeper:2181
11 #zookeeper.address=172.31.50.139:2181 11 #zookeeper.address=172.31.50.139:2181