feat: 数据库、redis、mongo支持ssh隧道等

server/internal/devops/api/db.go

@@ -56,13 +56,13 @@ func (d *Db) Save(rc *ctx.ReqCtx) {
 	// 密码脱敏记录日志
 	form.Password = "****"
 
-	if form.Type == "mysql" && form.EnableSSH == 1 {
-		originSSHPwd, err := utils.DefaultRsaDecrypt(form.SSHPass, true)
-		biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
-		db.SSHPass = originSSHPwd
-		// 密码脱敏记录日志
-		form.SSHPass = "****"
-	}
+	// if form.Type == "mysql" && form.EnableSSH == 1 {
+	// 	// originSSHPwd, err := utils.DefaultRsaDecrypt(form.SSHPass, true)
+	// 	biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
+	// 	// db.SSHPass = originSSHPwd
+	// 	// 密码脱敏记录日志
+	// 	form.SSHPass = "****"
+	// }
 
 	rc.ReqParam = form
 

server/internal/devops/api/form/db.go

@@ -15,11 +15,8 @@ type DbForm struct {
 	Env       string `json:"env"`
 	EnvId     uint64 `binding:"required" json:"envId"`
 
-	EnableSSH int    `json:"enable_ssh"`
-	SSHHost   string `json:"ssh_host"`
-	SSHPort   int    `json:"ssh_port"`
-	SSHUser   string `json:"ssh_user"`
-	SSHPass   string `json:"ssh_pass"`
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"`
 }
 
 type DbSqlSaveForm struct {

server/internal/devops/api/form/machine.go

@@ -5,14 +5,12 @@ type MachineForm struct {
 	ProjectId   uint64 `json:"projectId"`
 	ProjectName string `json:"projectName"`
 	Name        string `json:"name" binding:"required"`
-	// IP地址
-	Ip string `json:"ip" binding:"required"`
-	// 用户名
-	Username string `json:"username" binding:"required"`
-	Password string `json:"password"`
-	// 端口号
-	Port   int    `json:"port" binding:"required"`
-	Remark string `json:"remark"`
+	Ip          string `json:"ip" binding:"required"`       // IP地址
+	Username    string `json:"username" binding:"required"` // 用户名
+	AuthMethod  int8   `json:"authMethod" binding:"required"`
+	Password    string `json:"password"`
+	Port        int    `json:"port" binding:"required"` // 端口号
+	Remark      string `json:"remark"`
 }
 
 type MachineRunForm struct {

server/internal/devops/api/form/mongo.go

@@ -1,13 +1,15 @@
 package form
 
 type Mongo struct {
-	Id        uint64
-	Uri       string `binding:"required" json:"uri"`
-	Name      string `binding:"required" json:"name"`
-	ProjectId uint64 `binding:"required" json:"projectId"`
-	Project   string `json:"project"`
-	Env       string `json:"env"`
-	EnvId     uint64 `binding:"required" json:"envId"`
+	Id                 uint64
+	Uri                string `binding:"required" json:"uri"`
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"` // ssh隧道机器id
+	Name               string `binding:"required" json:"name"`
+	ProjectId          uint64 `binding:"required" json:"projectId"`
+	Project            string `json:"project"`
+	Env                string `json:"env"`
+	EnvId              uint64 `binding:"required" json:"envId"`
 }
 
 type MongoCommand struct {

server/internal/devops/api/form/redis.go

@@ -1,16 +1,18 @@
 package form
 
 type Redis struct {
-	Id        uint64
-	Host      string `binding:"required" json:"host"`
-	Password  string `json:"password"`
-	Mode      string `json:"mode"`
-	Db        int    `json:"db"`
-	ProjectId uint64 `binding:"required" json:"projectId"`
-	Project   string `json:"project"`
-	Env       string `json:"env"`
-	EnvId     uint64 `binding:"required" json:"envId"`
-	Remark    string `json:"remark"`
+	Id                 uint64
+	Host               string `binding:"required" json:"host"`
+	Password           string `json:"password"`
+	Mode               string `json:"mode"`
+	Db                 int    `json:"db"`
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"` // ssh隧道机器id
+	ProjectId          uint64 `binding:"required" json:"projectId"`
+	Project            string `json:"project"`
+	Env                string `json:"env"`
+	EnvId              uint64 `binding:"required" json:"envId"`
+	Remark             string `json:"remark"`
 }
 
 type KeyInfo struct {

server/internal/devops/api/machine.go

@@ -54,20 +54,22 @@ func (m *Machine) SaveMachine(rc *ctx.ReqCtx) {
 	machineForm := new(form.MachineForm)
 	ginx.BindJsonAndValid(g, machineForm)
 
-	entity := new(entity.Machine)
-	utils.Copy(entity, machineForm)
+	me := new(entity.Machine)
+	utils.Copy(me, machineForm)
 
-	// 密码解密，并使用解密后的赋值
-	originPwd, err := utils.DefaultRsaDecrypt(machineForm.Password, true)
-	biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
-	entity.Password = originPwd
+	if me.AuthMethod == entity.MachineAuthMethodPassword {
+		// 密码解密，并使用解密后的赋值
+		originPwd, err := utils.DefaultRsaDecrypt(machineForm.Password, true)
+		biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
+		me.Password = originPwd
+	}
 
 	// 密码脱敏记录日志
 	machineForm.Password = "****"
 	rc.ReqParam = machineForm
 
-	entity.SetBaseInfo(rc.LoginAccount)
-	m.MachineApp.Save(entity)
+	me.SetBaseInfo(rc.LoginAccount)
+	m.MachineApp.Save(me)
 }
 
 func (m *Machine) ChangeStatus(rc *ctx.ReqCtx) {

server/internal/devops/api/vo/db.go

@@ -20,8 +20,6 @@ type SelectDataDbVO struct {
 	Creator    *string    `json:"creator"`
 	CreatorId  *int64     `json:"creatorId"`
 
-	EnableSSH *int    `json:"enable_ssh"`
-	SSHHost   *string `json:"ssh_host"`
-	SSHPort   *int    `json:"ssh_port"`
-	SSHUser   *string `json:"ssh_user"`
+	EnableSshTunnel    *int8   `json:"enableSshTunnel"`
+	SshTunnelMachineId *uint64 `json:"sshTunnelMachineId"`
 }

server/internal/devops/api/vo/redis.go

@@ -5,17 +5,19 @@ import "time"
 type Redis struct {
 	Id *int64 `json:"id"`
 	// Name       *string    `json:"name"`
-	Host       *string    `json:"host"`
-	Db         int        `json:"db"`
-	ProjectId  *int64     `json:"projectId"`
-	Project    *string    `json:"project"`
-	Mode       *string    `json:"mode"`
-	Remark     *string    `json:"remark"`
-	Env        *string    `json:"env"`
-	EnvId      *int64     `json:"envId"`
-	CreateTime *time.Time `json:"createTime"`
-	Creator    *string    `json:"creator"`
-	CreatorId  *int64     `json:"creatorId"`
+	Host               *string    `json:"host"`
+	Db                 int        `json:"db"`
+	ProjectId          *int64     `json:"projectId"`
+	Project            *string    `json:"project"`
+	Mode               *string    `json:"mode"`
+	EnableSshTunnel    *int8      `orm:"column(enable_ssh_tunnel)" json:"enableSshTunnel"`        // 是否启用ssh隧道
+	SshTunnelMachineId *uint64    `orm:"column(ssh_tunnel_machine_id)" json:"sshTunnelMachineId"` // ssh隧道机器id
+	Remark             *string    `json:"remark"`
+	Env                *string    `json:"env"`
+	EnvId              *int64     `json:"envId"`
+	CreateTime         *time.Time `json:"createTime"`
+	Creator            *string    `json:"creator"`
+	CreatorId          *int64     `json:"creatorId"`
 }
 
 type Keys struct {

server/internal/devops/api/vo/vo.go

@@ -22,6 +22,7 @@ type MachineVO struct {
 	Username    *string    `json:"username"`
 	Ip          *string    `json:"ip"`
 	Port        *int       `json:"port"`
+	AuthMethod  *int8      `json:"authMethod"`
 	Status      *int8      `json:"status"`
 	CreateTime  *time.Time `json:"createTime"`
 	Creator     *string    `json:"creator"`