ops / monitor-ui · Commits

Go to a project

Authored by jack
Commit 47a42de8745ec59d0bbd24d9a3ce43ddd28c7947 1 parent f0ac2580

nginxsync update

Inline Side-by-side
Showing 4 changed files with 108 additions and 31 deletions
package com.ui.model.req;
import lombok.Data;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.List;
/**
* Created by yoho on 2016/8/24.
*/
@Data
public class NginxSyncLog {
String taskId = StringUtils.EMPTY;
int isFinished = 1;
List<String> msgList = new ArrayList<>();
}
... ...
package com.ui.model.req;
import lombok.Data;
/**
* Created by yoho on 2016/8/24.
*/
@Data
public class NginxSyncTask {
//命令执行用户
String user;
//命令类型
int type;
//shell 命令行
String cmd;
String taskId;
}
... ...
package com.ui.ctrl;
import com.ui.http.HttpRestClient;
import com.ui.model.BaseResponse;
import com.ui.model.req.NginxSyncTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
... ... @@ -11,8 +15,30 @@ import org.springframework.web.servlet.ModelAndView;
@RequestMapping(value = "/nginxSync")
public class NginxSyncCtrl {
@Autowired
HttpRestClient httpRestClient;
@RequestMapping("/toNginxSync")
public ModelAndView toNginxView() {
return new ModelAndView("nginx/nginxSync");
}
@RequestMapping("/pushTask")
public BaseResponse pushTask(NginxSyncTask task)
{
BaseResponse response = httpRestClient.defaultPost("/nginxsync/pushtask", task, BaseResponse.class);
return response;
}
@RequestMapping("/getTaskLog")
public BaseResponse getTaskLog(NginxSyncTask task)
{
BaseResponse response = httpRestClient.defaultPost("/nginxsync/getasklog", task, BaseResponse.class);
return response;
}
}
... ...
... ... @@ -159,62 +159,72 @@
function btn_click(btnId, txtId) {
console.log(btnId);
var id = 0;
if (btnId === "nginx_btn") {
id = 1;
}
else if (btnId === "h5_btn") {
id = 2;
}
else if (btnId === "dns_btn") {
id = 3;
}
else {
return;
}
var btn = document.getElementById(btnId);
document.getElementById(txtId).innerText ="";
btn.disabled = true;
console.log("id: " + id);
$.ajax({
url: getUrlBasePath() + "/rabbitmq/allRabbitMq",
url: getUrlBasePath() + "/nginxSync/pushTask",
type: "post",
dataType: "json",
data: {
moType: "qc"
type: id
},
success: function (response) {
var logView = document.getElementById(txtId);
var interval = setInterval(function (){
var logView = document.getElementById(txtId).innerText;
var interval = setInterval(function () {
$.ajax({
url: 'getbuildmsg?messageid=' + obj.data.id + '&project=' + cproject,
url: "/nginxSync/getTaskLog",
type: 'POST',
dataType: 'json',
data: {
taskId: response.data.taskId
},
success: function (data3) {
var obj2 = eval("(" + data3 + ")");
var messagedata = obj2.data;
var currproject = messagedata.currentProject;
if (currproject != cproject) {
$("#currentproject").val(currproject);//更换当前的项目
$("#show-" + cproject + "-div").attr("class", "ckbox ckbox-success");
$("#show-" + currproject + "-div").attr("class", "ckbox ckbox-warning");
$("#resultArea").val("")
console.log(data3);
var messagedata = data3.data;
var logList = messagedata.msgList;
console.log(logList)
console.log(logList.length)
if (logList.length != 0) {
var str = "";
for (var i = 0; i < logList.length; i++) {
str = str + '\n' + logList[i];
}
var d = document.getElementById(txtId).innerHTML;
document.getElementById(txtId).innerText = d + str;
document.getElementById(txtId).scrollTop=document.getElementById(txtId).scrollHeight;
}
if (messagedata.message != "") {
var d = $("#resultArea").val();
$("#resultArea").val(d + messagedata.message);
var scrollTop = $("#resultArea")[0].scrollHeight;
$("#resultArea").scrollTop(scrollTop);
}
//code为2 ,则结束
var code = obj2.code;
var message = obj2.message;
if (code == 2) {
$("#submit-btn").show();
$("#cancel-btn").hide();
$("#show-" + cproject + "-div").attr("class", "ckbox ckbox-success");
document.getElementById("task-info-div").innerHTML = "<strong>'"+ message +"'</strong>";
var code = messagedata.isFinished;
if (code == 1) {
clearInterval(interval);
alert("Success to execute job...");
btn.disabled = false;
}
},
error: function (e) {
alert("从后台获取数据出错");
}
});
},1000);
}, 3000);
},
error: function (e) {
alert("Failed to execute job...");
... ...