From 5fbc2bbe6e50c0a45af04a1f18a8f63fb517480f Mon Sep 17 00:00:00 2001 From: georgehao Date: Tue, 18 May 2021 00:31:24 +0800 Subject: [PATCH] V2.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复几处bug --- controllers/common.go | 5 ++--- controllers/login.go | 2 +- jobs/job.go | 27 ++++++++++++++++++++------- views/admin/list.html | 5 +++-- views/ban/list.html | 5 +++-- views/group/list.html | 5 +++-- views/notifytpl/list.html | 5 +++-- views/public/layout.html | 12 ++++++++++++ views/role/edit.html | 5 +++-- views/role/list.html | 5 +++-- views/server/list.html | 5 +++-- views/servergroup/list.html | 5 +++-- views/task/auditlist.html | 8 ++++---- views/task/list.html | 12 +++++++----- views/tasklog/list.html | 3 ++- views/user/edit.html | 2 +- 16 files changed, 73 insertions(+), 38 deletions(-) diff --git a/controllers/common.go b/controllers/common.go index 18c3160..41a22b4 100644 --- a/controllers/common.go +++ b/controllers/common.go @@ -67,8 +67,7 @@ func (self *BaseController) Auth() { if userId > 0 { user, err := models.AdminGetById(userId) - //if err == nil && password == libs.Md5([]byte(self.getClientIp()+"|"+user.Password+user.Salt)) { - if err == nil && password == libs.Md5([]byte(user.Password+user.Salt)){ + if err == nil && password == libs.Md5([]byte(self.getClientIp()+"|"+user.Password+user.Salt)) { self.userId = user.Id self.loginName = user.LoginName self.userName = user.RealName @@ -78,7 +77,7 @@ func (self *BaseController) Auth() { } isHasAuth := strings.Contains(self.allowUrl, self.controllerName+"/"+self.actionName) - noAuth := "ajaxsave/table/loginin/loginout/getnodes/start／apitask/apistart/apipause" + noAuth := "ajaxsave/table/loginin/loginout/getnodes/start/apitask/apistart/apipause" isNoAuth := strings.Contains(noAuth, self.actionName) if isHasAuth == false && isNoAuth == false { diff --git a/controllers/login.go b/controllers/login.go index 7ca3ef4..c438b42 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -50,7 +50,7 @@ func (self *LoginController) LoginIn() { user.LastIp = self.getClientIp() user.LastLogin = time.Now().Unix() user.Update() - authkey := libs.Md5([]byte(user.Password + user.Salt)) + authkey := libs.Md5([]byte(self.getClientIp() + "|" + user.Password + user.Salt)) self.Ctx.SetCookie("auth", strconv.Itoa(user.Id)+"|"+authkey, 7*86400) self.ajaxMsg("登录成功", MSG_OK) diff --git a/jobs/job.go b/jobs/job.go index 784dac6..ac8db6a 100644 --- a/jobs/job.go +++ b/jobs/job.go @@ -222,16 +222,19 @@ func RemoteCommandJob(id int, serverId int, name string, command string, servers jobresult.OutMsg = "" jobresult.ErrMsg = "" jobresult.IsTimeout = false + jobresult.IsOk = true key, err := ioutil.ReadFile(servers.PrivateKeySrc) if err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("读取私钥失败，%v", err.Error()) return } // Create the Signer for this private key. signer, err := ssh.ParsePrivateKey(key) if err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("创建签名失败，%v", err.Error()) return } addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port) @@ -250,6 +253,7 @@ func RemoteCommandJob(id int, serverId int, name string, command string, servers client, err := ssh.Dial("tcp", addr, config) if err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败，%v", err.Error()) return } @@ -258,6 +262,7 @@ func RemoteCommandJob(id int, serverId int, name string, command string, servers session, err := client.NewSession() if err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败，%v", err.Error()) return } defer session.Close() @@ -269,16 +274,16 @@ func RemoteCommandJob(id int, serverId int, name string, command string, servers var c bytes.Buffer session.Stdout = &b session.Stderr = &c - + jobresult.IsTimeout = false //session.Output(command) if err := session.Run(command); err != nil { + jobresult.ErrMsg = c.String() + jobresult.OutMsg = b.String() jobresult.IsOk = false - return } jobresult.OutMsg = b.String() jobresult.ErrMsg = c.String() jobresult.IsOk = true - jobresult.IsTimeout = false return } return job @@ -306,6 +311,7 @@ func RemoteCommandJobByPassword(id int, serverId int, name string, command strin jobresult.OutMsg = "" jobresult.ErrMsg = "" jobresult.IsTimeout = false + jobresult.IsOk = true // get auth method auth = make([]ssh.AuthMethod, 0) @@ -325,6 +331,7 @@ func RemoteCommandJobByPassword(id int, serverId int, name string, command strin if client, err = ssh.Dial("tcp", addr, clientConfig); err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("连接服务器失败，%v", err.Error()) return } @@ -333,6 +340,7 @@ func RemoteCommandJobByPassword(id int, serverId int, name string, command strin // create session if session, err = client.NewSession(); err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("连接服务器失败，%v", err.Error()) return } @@ -343,12 +351,9 @@ func RemoteCommandJobByPassword(id int, serverId int, name string, command strin //session.Output(command) if err := session.Run(command); err != nil { jobresult.IsOk = false - return } jobresult.OutMsg = b.String() jobresult.ErrMsg = c.String() - jobresult.IsOk = true - jobresult.IsTimeout = false return } @@ -369,11 +374,13 @@ func RemoteCommandJobByTelnetPassword(id int, serverId int, name string, command jobresult.OutMsg = "" jobresult.ErrMsg = "" jobresult.IsTimeout = false + jobresult.IsOk = true addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port) conn, err := gote.DialTimeout("tcp", addr, timeout) if err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败0，%v", err.Error()) return } @@ -383,26 +390,31 @@ func RemoteCommandJobByTelnetPassword(id int, serverId int, name string, command if _, err = conn.Read(buf); err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败-1，%v", err.Error()) return } if _, err = conn.Write([]byte(servers.ServerAccount + "\r\n")); err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败-2，%v", err.Error()) return } if _, err = conn.Read(buf); err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败-3，%v", err.Error()) return } if _, err = conn.Write([]byte(servers.Password + "\r\n")); err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败-4，%v", err.Error()) return } if _, err = conn.Read(buf); err != nil { jobresult.IsOk = false + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败-5，%v", err.Error()) return } @@ -419,6 +431,7 @@ func RemoteCommandJobByTelnetPassword(id int, serverId int, name string, command for _, c := range commandArr { _, err = conn.Write([]byte(c + "\r\n")) if err != nil { + jobresult.ErrMsg = fmt.Sprintf("服务器连接失败-6，%v", err.Error()) jobresult.IsOk = false return } @@ -717,7 +730,7 @@ func (j *Job) Run() { content = strings.Replace(content, "{{TaskId}}", strconv.Itoa(j.Task.Id), -1) content = strings.Replace(content, "{{ServerId}}", strconv.Itoa(j.ServerId), -1) content = strings.Replace(content, "{{TaskName}}", j.Task.TaskName, -1) - content = strings.Replace(content, "{{ExecuteCommand}}", j.Task.Command, -1) + content = strings.Replace(content, "{{ExecuteCommand}}", strings.Replace(j.Task.Command, "\"", "\\\"", -1), -1) content = strings.Replace(content, "{{ExecuteTime}}", beego.Date(time.Unix(log.CreateTime, 0), "Y-m-d H:i:s"), -1) content = strings.Replace(content, "{{ProcessTime}}", strconv.FormatFloat(float64(log.ProcessTime)/1000, 'f', 6, 64), -1) content = strings.Replace(content, "{{ExecuteStatus}}", TextStatus[status], -1) diff --git a/views/admin/list.html b/views/admin/list.html index 61f018f..5d6b484 100644 --- a/views/admin/list.html +++ b/views/admin/list.html @@ -1,7 +1,7 @@
- +
@@ -9,7 +9,7 @@
- +
@@ -45,6 +45,7 @@ table.render({ elem: '#table_list' ,url: '/admin/table' + ,size: 'sm' //小尺寸的表格 ,cols: [[ // {checkbox: true, fixed: true}, {field:'id', title: 'ID', align:'center',sort: true, width:150} diff --git a/views/ban/list.html b/views/ban/list.html index bbf3acf..6024dff 100644 --- a/views/ban/list.html +++ b/views/ban/list.html @@ -1,7 +1,7 @@
- 新增 + 新增
@@ -9,7 +9,7 @@
- +
@@ -43,6 +43,7 @@ table.render({ elem: '#table_list' ,url: '/ban/table' + ,size: 'sm' //小尺寸的表格 ,cols: [[ // {checkbox: true, fixed: true}, {field:'id', title: 'ID', align:'center',sort: true, width:150} diff --git a/views/group/list.html b/views/group/list.html index 2e9991e..41911f6 100644 --- a/views/group/list.html +++ b/views/group/list.html @@ -1,7 +1,7 @@
- +
@@ -9,7 +9,7 @@
- +
@@ -43,6 +43,7 @@ table.render({ elem: '#table_list' ,url: '/group/table' + ,size: 'sm' //小尺寸的表格 ,cols: [[ // {checkbox: true, fixed: true}, {field:'id', title: 'ID', align:'center',sort: true, width:150} diff --git a/views/notifytpl/list.html b/views/notifytpl/list.html index b341634..73183f7 100644 --- a/views/notifytpl/list.html +++ b/views/notifytpl/list.html @@ -1,7 +1,7 @@
- +
@@ -9,7 +9,7 @@
- +
@@ -41,6 +41,7 @@ table.render({ elem: '#table_list' , url: '/notifytpl/table' + ,size: 'sm' //小尺寸的表格 , cols: [[ {checkbox: true, fixed: true}, {field: 'id', title: 'ID', align: 'center', sort: true, width: 150}, diff --git a/views/public/layout.html b/views/public/layout.html index 2bd61c7..b4a3570 100644 --- a/views/public/layout.html +++ b/views/public/layout.html @@ -17,6 +17,18 @@ .modal-hide{ display: none; } + + /*控制按钮和input大小*/ + .layui-form-label { + padding: 5px 15px; + } + .layui-input, .layui-select, .layui-textarea { + height: 30px; + line-height: 30px; + } + .layui-form-select dl dd, .layui-form-select dl dt { + line-height: 30px; + } diff --git a/views/role/edit.html b/views/role/edit.html index 5c0c235..eff9629 100644 --- a/views/role/edit.html +++ b/views/role/edit.html @@ -26,13 +26,14 @@
- + {{range $k, $v := .serverGroup}} - + {{end}}
+
diff --git a/views/role/list.html b/views/role/list.html index edbf5e4..36a12e9 100644 --- a/views/role/list.html +++ b/views/role/list.html @@ -1,7 +1,7 @@
- +
@@ -9,7 +9,7 @@
- +
@@ -40,6 +40,7 @@ table.render({ elem: '#table_list' ,url: '/role/table' + ,size: 'sm' //小尺寸的表格 ,cols: [[ // {checkbox: true, fixed: true}, {field:'id', title: 'ID', align:'center',sort: true, width:150} diff --git a/views/server/list.html b/views/server/list.html index d054172..87a05ab 100644 --- a/views/server/list.html +++ b/views/server/list.html @@ -1,7 +1,7 @@
- +
@@ -17,7 +17,7 @@ {{end}}
- +
@@ -51,6 +51,7 @@ table.render({ elem: '#table_list' ,url: '/server/table' + ,size: 'sm' //小尺寸的表格 ,cols: [[ // {checkbox: true, fixed: true}, {field:'id', title: 'ID', align:'center',sort: true, width:80} diff --git a/views/servergroup/list.html b/views/servergroup/list.html index 4466ad2..6ee11f8 100644 --- a/views/servergroup/list.html +++ b/views/servergroup/list.html @@ -1,7 +1,7 @@
- +
@@ -9,7 +9,7 @@
- +
@@ -43,6 +43,7 @@ table.render({ elem: '#table_list' ,url: '/servergroup/table' + ,size: 'sm' //小尺寸的表格 ,cols: [[ // {checkbox: true, fixed: true}, {field:'id', title: 'ID', align:'center',sort: true, width:150} diff --git a/views/task/auditlist.html b/views/task/auditlist.html index 3f5dc75..215a1b2 100644 --- a/views/task/auditlist.html +++ b/views/task/auditlist.html @@ -2,9 +2,9 @@
- 新增任务 - - + 新增任务 + +
@@ -15,7 +15,7 @@
- +
diff --git a/views/task/list.html b/views/task/list.html index b04b105..c262673 100644 --- a/views/task/list.html +++ b/views/task/list.html @@ -1,17 +1,18 @@ +
- - - cron + + + cron
-
+
@@ -22,7 +23,7 @@ {{end}}
- +
@@ -56,6 +57,7 @@ table.render({ elem: '#table_list' ,url: '/task/table' + ,size: 'sm' //小尺寸的表格 ,cols: [[ {checkbox: true, fixed: true}, {field:'id', title: 'ID', align:'center', width:80,sort: true} diff --git a/views/tasklog/list.html b/views/tasklog/list.html index 0056e62..918a5c4 100644 --- a/views/tasklog/list.html +++ b/views/tasklog/list.html @@ -1,7 +1,7 @@
- +
@@ -44,6 +44,7 @@ table.render({ elem: '#table_list' ,url: "/tasklog/table?task_id={{.task_id}}" + ,size: 'sm' //小尺寸的表格 ,cols: [[ {checkbox: true, fixed: true} // ,{field:'id', title: 'ID', align:'center',sort: true, width:150} diff --git a/views/user/edit.html b/views/user/edit.html index 29d29af..12b8d62 100644 --- a/views/user/edit.html +++ b/views/user/edit.html @@ -48,7 +48,7 @@
- +