TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 00:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: sql文件字段名调整

Browse Source
This commit is contained in:
meilin.huang
2022-07-24 18:54:23 +08:00
parent 577802e5ad
commit 366563a0fe
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/internal/devops/application/db_app.go
View File

@@ -258,10 +258,9 @@ func GetDbConn(d *entity.Db, db string) (*sql.DB, error) {
// SSH Conect // SSH Conect
if d.EnableSshTunnel == 1 && d.SshTunnelMachineId != 0 { if d.EnableSshTunnel == 1 && d.SshTunnelMachineId != 0 {
sshTunnelMachine := MachineApp.GetSshTunnelMachine(d.SshTunnelMachineId) sshTunnelMachine := MachineApp.GetSshTunnelMachine(d.SshTunnelMachineId)
defer machine.CloseSshTunnelMachine(d.SshTunnelMachineId, 0)
if d.Type == entity.DbTypeMysql { if d.Type == entity.DbTypeMysql {
mysql.RegisterDialContext(d.Network, func(ctx context.Context, addr string) (net.Conn, error) { mysql.RegisterDialContext(d.Network, func(ctx context.Context, addr string) (net.Conn, error) {
return MachineApp.GetSshTunnelMachine(d.SshTunnelMachineId).GetDialConn("tcp", addr) return sshTunnelMachine.GetDialConn("tcp", addr)
}) })
} else if d.Type == entity.DbTypePostgres { } else if d.Type == entity.DbTypePostgres {
_, err := pq.DialOpen(&PqSqlDialer{sshTunnelMachine: sshTunnelMachine}, getDsn(d, db)) _, err := pq.DialOpen(&PqSqlDialer{sshTunnelMachine: sshTunnelMachine}, getDsn(d, db))

2
server/internal/devops/infrastructure/machine/sshtunnel.go
View File

@@ -130,7 +130,7 @@ func (stm *SshTunnelMachine) Close() {
global.Log.Infof("ssh隧道机器[%d]未被使用, 关闭隧道...", stm.machineId) global.Log.Infof("ssh隧道机器[%d]未被使用, 关闭隧道...", stm.machineId)
err := stm.SshClient.Close() err := stm.SshClient.Close()
if err != nil { if err != nil {
global.Log.Errorf("关闭ssh隧道机器[%s]发生错误: %s", stm.machineId, err.Error()) global.Log.Errorf("关闭ssh隧道机器[%d]发生错误: %s", stm.machineId, err.Error())
} }
} }
delete(sshTunnelMachines, stm.machineId) delete(sshTunnelMachines, stm.machineId)

16
server/mayfly-go.sql
View File

@@ -30,8 +30,8 @@ CREATE TABLE `t_db` (
`database` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据库,空格分割多个数据库', `database` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据库,空格分割多个数据库',
`params` varchar(125) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '其他连接参数', `params` varchar(125) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '其他连接参数',
`network` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL, `network` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL,
`enableSshTunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道', `enable_ssh_tunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道',
`sshTunnelMachineId` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id', `ssh_tunnel_machine_id` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id',
`project_id` bigint(20) DEFAULT NULL, `project_id` bigint(20) DEFAULT NULL,
`project` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL, `project` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL,
`env_id` bigint(20) DEFAULT NULL COMMENT '环境id', `env_id` bigint(20) DEFAULT NULL COMMENT '环境id',
@@ -111,8 +111,8 @@ CREATE TABLE `t_machine` (
`username` varchar(12) COLLATE utf8mb4_bin NOT NULL, `username` varchar(12) COLLATE utf8mb4_bin NOT NULL,
`auth_method` tinyint(2) NULL DEFAULT NULL COMMENT '1.密码登录2.publickey登录', `auth_method` tinyint(2) NULL DEFAULT NULL COMMENT '1.密码登录2.publickey登录',
`password` varchar(3200) COLLATE utf8mb4_bin DEFAULT NULL, `password` varchar(3200) COLLATE utf8mb4_bin DEFAULT NULL,
`enableSshTunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道', `enable_ssh_tunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道',
`sshTunnelMachineId` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id', `ssh_tunnel_machine_id` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id',
`status` tinyint(2) NOT NULL COMMENT '状态: 1:启用; -1:禁用', `status` tinyint(2) NOT NULL COMMENT '状态: 1:启用; -1:禁用',
`remark` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL, `remark` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL,
`need_monitor` tinyint(2) DEFAULT NULL, `need_monitor` tinyint(2) DEFAULT NULL,
@@ -263,8 +263,8 @@ CREATE TABLE `t_redis` (
`password` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL, `password` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
`db` int(32) DEFAULT NULL, `db` int(32) DEFAULT NULL,
`mode` varchar(32) DEFAULT NULL, `mode` varchar(32) DEFAULT NULL,
`enableSshTunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道', `enable_ssh_tunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道',
`sshTunnelMachineId` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id', `ssh_tunnel_machine_id` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id',
`remark` varchar(125) DEFAULT NULL, `remark` varchar(125) DEFAULT NULL,
`project_id` bigint(20) DEFAULT NULL, `project_id` bigint(20) DEFAULT NULL,
`project` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL, `project` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
@@ -670,8 +670,8 @@ CREATE TABLE `t_mongo` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`name` varchar(36) COLLATE utf8mb4_bin NOT NULL COMMENT '名称', `name` varchar(36) COLLATE utf8mb4_bin NOT NULL COMMENT '名称',
`uri` varchar(255) COLLATE utf8mb4_bin NOT NULL COMMENT '连接uri', `uri` varchar(255) COLLATE utf8mb4_bin NOT NULL COMMENT '连接uri',
`enableSshTunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道', `enable_ssh_tunnel` tinyint(2) DEFAULT NULL COMMENT '是否启用ssh隧道',
`sshTunnelMachineId` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id', `ssh_tunnel_machine_id` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id',
`project_id` bigint(20) NOT NULL, `project_id` bigint(20) NOT NULL,
`project` varchar(36) COLLATE utf8mb4_bin DEFAULT NULL, `project` varchar(36) COLLATE utf8mb4_bin DEFAULT NULL,
`env_id` bigint(20) DEFAULT NULL, `env_id` bigint(20) DEFAULT NULL,