evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(be):使用next-terminal 自定义的日志

Browse Source
This commit is contained in:
neverteaser
2021-03-19 22:58:47 +08:00
committed by dushixiang
parent 518e665d17
commit 9d38e5fef7
19 changed files with 322 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/service/job.go
View File

@ -7,6 +7,7 @@ import (
"strings"
"time"
"next-terminal/pkg/log"
"next-terminal/server/constant"
"next-terminal/server/global"
"next-terminal/server/model"
@ -15,7 +16,6 @@ import (
"next-terminal/server/utils"
"github.com/robfig/cron/v3"
"github.com/sirupsen/logrus"
)
type JobService struct {
@ -43,14 +43,14 @@ func (r JobService) ChangeStatusById(id, status string) error {
if err != nil {
return err
}
logrus.Debugf("开启计划任务「%v」,运行中计划任务数量「%v」", job.Name, len(global.Cron.Entries()))
log.Debugf("开启计划任务「%v」,运行中计划任务数量「%v」", job.Name, len(global.Cron.Entries()))
jobForUpdate := model.Job{ID: id, Status: constant.JobStatusRunning, CronJobId: int(entryID)}
return r.jobRepository.UpdateById(&jobForUpdate)
} else {
global.Cron.Remove(cron.EntryID(job.CronJobId))
logrus.Debugf("关闭计划任务「%v」,运行中计划任务数量「%v」", job.Name, len(global.Cron.Entries()))
log.Debugf("关闭计划任务「%v」,运行中计划任务数量「%v」", job.Name, len(global.Cron.Entries()))
jobForUpdate := model.Job{ID: id, Status: constant.JobStatusNotRunning}
return r.jobRepository.UpdateById(&jobForUpdate)
}
@ -102,7 +102,7 @@ func (r CheckAssetStatusJob) Run() {
msg := fmt.Sprintf("资产「%v」存活状态检测完成，存活「%v」，耗时「%v」", asset.Name, active, elapsed)
_ = r.jobService.assetRepository.UpdateActiveById(active, asset.ID)
logrus.Infof(msg)
log.Infof(msg)
msgChan <- msg
}()
}
@ -154,7 +154,7 @@ func (r ShellJob) Run() {
var metadataShell MetadataShell
err := json.Unmarshal([]byte(r.Metadata), &metadataShell)
if err != nil {
logrus.Errorf("JSON数据解析失败 %v", err)
log.Errorf("JSON数据解析失败 %v", err)
return
}
@ -200,10 +200,10 @@ func (r ShellJob) Run() {
var msg string
if err != nil {
msg = fmt.Sprintf("资产「%v」Shell执行失败，返回值「%v」，耗时「%v」", asset.Name, err.Error(), elapsed)
logrus.Infof(msg)
log.Infof(msg)
} else {
msg = fmt.Sprintf("资产「%v」Shell执行成功，返回值「%v」，耗时「%v」", asset.Name, result, elapsed)
logrus.Infof(msg)
log.Infof(msg)
}
msgChan <- msg
@ -274,7 +274,7 @@ func (r JobService) InitJob() error {
if err := r.jobRepository.Create(&job); err != nil {
return err
}
logrus.Debugf("创建计划任务「%v」cron「%v」", job.Name, job.Cron)
log.Debugf("创建计划任务「%v」cron「%v」", job.Name, job.Cron)
} else {
for i := range jobs {
if jobs[i].Status == constant.JobStatusRunning {
@ -282,7 +282,7 @@ func (r JobService) InitJob() error {
if err != nil {
return err
}
logrus.Debugf("启动计划任务「%v」cron「%v」", jobs[i].Name, jobs[i].Cron)
log.Debugf("启动计划任务「%v」cron「%v」", jobs[i].Name, jobs[i].Cron)
}
}
}

6
server/service/mail.go
View File

@ -3,11 +3,11 @@ package service
import (
"net/smtp"
"next-terminal/pkg/log"
"next-terminal/server/constant"
"next-terminal/server/repository"
"github.com/jordan-wright/email"
"github.com/sirupsen/logrus"
)
type MailService struct {
@ -26,7 +26,7 @@ func (r MailService) SendMail(to, subject, text string) {
password := propertiesMap[constant.MailPassword]
if host == "" || port == "" || username == "" || password == "" {
logrus.Debugf("邮箱信息不完整，跳过发送邮件。")
log.Debugf("邮箱信息不完整，跳过发送邮件。")
return
}
@ -37,6 +37,6 @@ func (r MailService) SendMail(to, subject, text string) {
e.Text = []byte(text)
err := e.Send(host+":"+port, smtp.PlainAuth("", username, password, host))
if err != nil {
logrus.Errorf("邮件发送失败: %v", err.Error())
log.Errorf("邮件发送失败: %v", err.Error())
}
}

2
server/service/property.go
View File

@ -3,7 +3,7 @@ package service
import (
"os"
"next-terminal/server/guacd"
"next-terminal/pkg/guacd"
"next-terminal/server/model"
"next-terminal/server/repository"
"next-terminal/server/utils"

9
server/service/user.go
View File

@ -1,12 +1,11 @@
package service
import (
"next-terminal/pkg/log"
"next-terminal/server/constant"
"next-terminal/server/model"
"next-terminal/server/repository"
"next-terminal/server/utils"
"github.com/sirupsen/logrus"
)
type UserService struct {
@ -40,7 +39,7 @@ func (r UserService) InitUser() (err error) {
if err := r.userRepository.Create(&user); err != nil {
return err
}
logrus.Infof("初始用户创建成功，账号：「%v」密码：「%v」", user.Username, initPassword)
log.Infof("初始用户创建成功，账号：「%v」密码：「%v」", user.Username, initPassword)
} else {
for i := range users {
// 修正默认用户类型为管理员
@ -52,7 +51,7 @@ func (r UserService) InitUser() (err error) {
if err := r.userRepository.Update(&user); err != nil {
return err
}
logrus.Infof("自动修正用户「%v」ID「%v」类型为管理员", users[i].Nickname, users[i].ID)
log.Infof("自动修正用户「%v」ID「%v」类型为管理员", users[i].Nickname, users[i].ID)
}
}
}
@ -83,7 +82,7 @@ func (r UserService) Logout(token string) (err error) {
loginLog, err := r.loginLogRepository.FindById(token)
if err != nil {
logrus.Warnf("登录日志「%v」获取失败", token)
log.Warnf("登录日志「%v」获取失败", token)
return
}