Commit fe4e53180127875d61341ce7e4333556b69798c4

Authored by 杨鸣坤
1 parent c0f639bd

增加私钥文件名称字段

@@ -427,19 +427,20 @@ COMMENT ON COLUMN qg_db_connect.connect_test_query IS '链接校验语å¥ï¼Œé»˜è @@ -427,19 +427,20 @@ COMMENT ON COLUMN qg_db_connect.connect_test_query IS '链接校验语å¥ï¼Œé»˜è
427 COMMENT ON COLUMN qg_db_connect.connect_timeout IS '最大等待时间(毫秒),默认为:30000毫秒'; 427 COMMENT ON COLUMN qg_db_connect.connect_timeout IS '最大等待时间(毫秒),默认为:30000毫秒';
428 428
429 CREATE TABLE "qg_db_connect_ssh" ( 429 CREATE TABLE "qg_db_connect_ssh" (
430 - "id" varchar(36) PRIMARY KEY,  
431 - "connect_id" varchar(36) NOT NULL,  
432 - "ip" varchar(20),  
433 - "port" varchar(20),  
434 - "ssh_name" varchar(50),  
435 - "ssh_password" varchar(50),  
436 - "verify_method" varchar(200),  
437 - "private_key" varchar(200),  
438 - "tenant_id" varchar(36),  
439 - "create_time" timestamp(6),  
440 - "creator" varchar(36) NULL,  
441 - "updater" varchar(36) NULL,  
442 - "update_time" timestamp(6) 430 + "id" varchar(36) PRIMARY KEY,
  431 + "connect_id" varchar(36) NOT NULL,
  432 + "ip" varchar(20),
  433 + "port" varchar(20),
  434 + "ssh_name" varchar(50),
  435 + "ssh_password" varchar(50),
  436 + "verify_method" varchar(200),
  437 + "private_key" varchar(200),
  438 + "private_key_file_name" varchar(200),
  439 + "tenant_id" varchar(36),
  440 + "create_time" timestamp(6),
  441 + "creator" varchar(36) NULL,
  442 + "updater" varchar(36) NULL,
  443 + "update_time" timestamp(6)
443 ); 444 );
444 COMMENT ON TABLE qg_db_connect_ssh IS 'SSH通道配置信息'; 445 COMMENT ON TABLE qg_db_connect_ssh IS 'SSH通道配置信息';
445 COMMENT ON COLUMN qg_db_connect.tenant_id IS '租户ID'; 446 COMMENT ON COLUMN qg_db_connect.tenant_id IS '租户ID';
@@ -450,6 +451,7 @@ COMMENT ON COLUMN qg_db_connect_ssh.ssh_name IS '用户å'; @@ -450,6 +451,7 @@ COMMENT ON COLUMN qg_db_connect_ssh.ssh_name IS '用户å';
450 COMMENT ON COLUMN qg_db_connect_ssh.ssh_password IS '密码/密码短语'; 451 COMMENT ON COLUMN qg_db_connect_ssh.ssh_password IS '密码/密码短语';
451 COMMENT ON COLUMN qg_db_connect_ssh.verify_method IS '验证方式(PASSWORD:密码;PUBLIC_KEY:公钥)'; 452 COMMENT ON COLUMN qg_db_connect_ssh.verify_method IS '验证方式(PASSWORD:密码;PUBLIC_KEY:公钥)';
452 COMMENT ON COLUMN qg_db_connect_ssh.private_key IS '私钥文件'; 453 COMMENT ON COLUMN qg_db_connect_ssh.private_key IS '私钥文件';
  454 +COMMENT ON COLUMN qg_db_connect_ssh.private_key_file_name IS '私钥文件名称';
453 455
454 CREATE TABLE "qg_db_connect_ssl" ( 456 CREATE TABLE "qg_db_connect_ssl" (
455 "id" varchar(36) PRIMARY KEY, 457 "id" varchar(36) PRIMARY KEY,
@@ -1159,19 +1159,20 @@ CREATE TABLE IF NOT EXISTS qg_db_connect ( @@ -1159,19 +1159,20 @@ CREATE TABLE IF NOT EXISTS qg_db_connect (
1159 ); 1159 );
1160 1160
1161 CREATE TABLE IF NOT EXISTS qg_db_connect_ssl ( 1161 CREATE TABLE IF NOT EXISTS qg_db_connect_ssl (
1162 - "id" varchar(36) PRIMARY KEY,  
1163 - "connect_id" varchar(36) NOT NULL,  
1164 - "ip" varchar(20),  
1165 - "port" varchar(20),  
1166 - "ssh_name" varchar(50),  
1167 - "ssh_password" varchar(50),  
1168 - "verify_method" varchar(200),  
1169 - "private_key" varchar(200),  
1170 - "tenant_id" varchar(36),  
1171 - "create_time" timestamp(6),  
1172 - "creator" varchar(36) NULL,  
1173 - "updater" varchar(36) NULL,  
1174 - "update_time" timestamp(6) 1162 + "id" varchar(36) PRIMARY KEY,
  1163 + "connect_id" varchar(36) NOT NULL,
  1164 + "ip" varchar(20),
  1165 + "port" varchar(20),
  1166 + "ssh_name" varchar(50),
  1167 + "ssh_password" varchar(50),
  1168 + "verify_method" varchar(200),
  1169 + "private_key" varchar(200),
  1170 + "private_key_file_name" varchar(200),
  1171 + "tenant_id" varchar(36),
  1172 + "create_time" timestamp(6),
  1173 + "creator" varchar(36) NULL,
  1174 + "updater" varchar(36) NULL,
  1175 + "update_time" timestamp(6)
1175 ); 1176 );
1176 1177
1177 CREATE TABLE IF NOT EXISTS qg_db_connect_ssl ( 1178 CREATE TABLE IF NOT EXISTS qg_db_connect_ssl (
@@ -31,4 +31,7 @@ public class TkDbConnectSshDTO extends TenantDTO { @@ -31,4 +31,7 @@ public class TkDbConnectSshDTO extends TenantDTO {
31 31
32 @ApiModelProperty("私钥文件") 32 @ApiModelProperty("私钥文件")
33 private String privateKey; 33 private String privateKey;
  34 +
  35 + @ApiModelProperty("私钥文件名称")
  36 + private String privateKeyFileName;
34 } 37 }
@@ -27,4 +27,5 @@ public class TkDbConnectSshEntity extends TenantBaseEntity { @@ -27,4 +27,5 @@ public class TkDbConnectSshEntity extends TenantBaseEntity {
27 27
28 private String privateKey; 28 private String privateKey;
29 29
  30 + private String privateKeyFileName;
30 } 31 }