release: v1.9.0

This commit is contained in:
meilin.huang
2024-10-23 17:30:05 +08:00
parent 44a1bd626e
commit 2118acf244
26 changed files with 60 additions and 59 deletions

View File

@@ -323,7 +323,7 @@ func (m *MachineFile) UploadFolder(rc *req.Ctx) {
isSuccess = false
logx.Errorf("文件上传失败: %s", err)
switch t := err.(type) {
case errorx.BizError:
case *errorx.BizError:
m.MsgApp.CreateAndSend(la, msgdto.ErrSysMsg("文件上传失败", fmt.Sprintf("执行文件上传失败:\n<-e errCode: %d, errMsg: %s", t.Code(), t.Error())))
}
}

View File

@@ -105,9 +105,6 @@ func (m *machineAppImpl) SaveMachine(ctx context.Context, param *dto.SaveMachine
if err == nil {
return errorx.NewBiz("该机器信息已存在")
}
if m.CountByCond(&entity.Machine{Name: me.Name}) > 0 {
return errorx.NewBiz("该名称已存在")
}
// 新增机器,默认启用状态
me.Status = entity.MachineStatusEnable

View File

@@ -49,6 +49,7 @@ func (m *machineTermOpAppImpl) InjectMachineTermOpRepo(repo repository.MachineTe
func (m *machineTermOpAppImpl) TermConn(ctx context.Context, cli *mcm.Cli, wsConn *websocket.Conn, rows, cols int) error {
var recorder *mcm.Recorder
var termOpRecord *entity.MachineTermOp
var err error
// 开启终端操作记录
if cli.Info.EnableRecorder == 1 {
@@ -68,7 +69,7 @@ func (m *machineTermOpAppImpl) TermConn(ctx context.Context, cli *mcm.Cli, wsCon
if err != nil {
return errorx.NewBiz("创建终端回放记录文件失败: %s", err.Error())
}
defer saveFileFunc()
defer saveFileFunc(&err)
termOpRecord.FileKey = fileKey
recorder = mcm.NewRecorder(wc)