Authored by qinchao

gitwebhook

... ... @@ -144,6 +144,8 @@ public class DockerProjectCtrl {
//查询镜像
boolean okFlag=false;
String alarmMsg="镜像制作失败";
String alarmTypeSuccess="service_exception";//"docker_auto_success";
String alarmTypeFail="service_exception";//"docker_auto_error";
for(int i=0;i<20;i++){
DockerJenkinsRecord record=dockerProjectService.queryJenkinsById(buildId);
if(record==null){
... ... @@ -177,7 +179,7 @@ public class DockerProjectCtrl {
if(!okFlag){
//sendMsg
alarmMsg=("["+model.getProjectName()+"]"+alarmMsg);
alarmMsgService.sendSms("docker_deploy", alarmMsg , mobile_yunwei);
alarmMsgService.sendSms(alarmTypeFail, alarmMsg , mobile_yunwei);
return;
}
... ... @@ -189,14 +191,14 @@ public class DockerProjectCtrl {
if(deployResp==null){
//发布失败
alarmMsg=("["+model.getProjectName()+"]调用腾讯云发布接口失败");
alarmMsgService.sendSms("docker_deploy",alarmMsg , mobile_yunwei);
alarmMsgService.sendSms(alarmTypeFail,alarmMsg , mobile_yunwei);
return;
}
if(deployResp.getCode()!=200){
//发布失败
alarmMsg=("["+model.getProjectName()+"]查询腾讯云发布状态接口失败");
alarmMsgService.sendSms("docker_deploy",alarmMsg , mobile_yunwei);
alarmMsgService.sendSms(alarmTypeFail,alarmMsg , mobile_yunwei);
return;
}else{
//发布成功
... ... @@ -207,7 +209,7 @@ public class DockerProjectCtrl {
//发布之后的状态成功
projectStatus=true;
alarmMsg=("["+model.getProjectName()+"]发布成功!");
alarmMsgService.sendSms("docker_deploy",alarmMsg , mobile_yunwei);
alarmMsgService.sendSms(alarmTypeSuccess,alarmMsg , mobile_yunwei);
break;
}else{
try {
... ... @@ -220,7 +222,7 @@ public class DockerProjectCtrl {
if(!projectStatus){
alarmMsg=("["+model.getProjectName()+"]发布状态为非normal,请检查!");
alarmMsgService.sendSms("docker_deploy",alarmMsg , mobile_yunwei);
alarmMsgService.sendSms(alarmTypeFail,alarmMsg , mobile_yunwei);
}
}
... ...