Sunyard/cisd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：初始化脚本

Browse Source
This commit is contained in:
waner
2026-05-25 18:19:31 +08:00
parent c4c178c8b1
commit 6e5c0a0fcf
6 changed files with 116 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/cisd/tms/integration/crypto/pcie/service/JnaPcieCryptoService.java
+1 -1
View File
@@ -1975,7 +1975,7 @@ public class JnaPcieCryptoService implements PcieCryptoService {
recoveryResult.setLmkSeedMac(Arrays.copyOf(mac, mac.length));
return recoveryResult;
});
//todo 补回到一个session中
scheduleRecoverUserKeys(copyRecoverUserKeyRequests(userKeyRequests));
return result;
} finally {
src/main/java/com/cisd/tms/modules/init/executor/ConfigurableInitStepExecutor.java
+4
View File
@@ -523,6 +523,10 @@ public class ConfigurableInitStepExecutor implements InitStepExecutor {
}
private boolean shouldUseStandardRabbitQueueScript02(PlanContext context) {
return shouldUseStandardNode02(context);
}
private boolean shouldUseStandardNode02(PlanContext context) {
if (!"DUAL".equals(context.deployMode())) {
return false;
}
src/main/resources/db/migration/V2__tms_schema_full.sql
+30 -83
View File
@@ -4,7 +4,7 @@
-- 数据库：TiDB / MySQL 8+
--
-- 说明：
-- 1. 本文件是当前仓库唯一保留的数据库初始化 SQL。
-- 1. 本文件是当前推荐使用的完整数据库初始化 SQL，V1 文件仅作为历史版本保留。
-- 2. 结构已按当前最终状态汇总，不再依赖历史 V1~V12 逐步迁移。
-- 3. 执行前请先选中目标数据库，本文件不再包含 CREATE DATABASE / USE。
-- -----------------------------------------------------------------------------
@@ -32,6 +32,7 @@ CREATE TABLE IF NOT EXISTS tms_init_task (
init_plan_json LONGTEXT NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_init_task_task_id (task_id)
) COMMENT='初始化任务表';
@@ -47,6 +48,7 @@ CREATE TABLE IF NOT EXISTS tms_init_task_step (
exit_code INT NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_init_task_step_task_no (task_id, step_no),
KEY idx_tms_init_task_step_task_id (task_id)
) COMMENT='初始化任务步骤表';
@@ -79,6 +81,7 @@ CREATE TABLE IF NOT EXISTS tms_resource_backup_task (
update_time DATETIME(3) NOT NULL,
start_time DATETIME(3) NULL,
finish_time DATETIME(3) NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_resource_backup_task_task_id (task_id),
UNIQUE KEY uk_tms_resource_backup_task_backup_id (backup_id),
KEY idx_tms_resource_backup_task_status (status),
@@ -110,6 +113,7 @@ CREATE TABLE IF NOT EXISTS tms_resource_restore_task (
update_time DATETIME(3) NOT NULL,
start_time DATETIME(3) NULL,
finish_time DATETIME(3) NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_resource_restore_task_task_id (task_id),
UNIQUE KEY uk_tms_resource_restore_task_precheck_id (precheck_id),
KEY idx_tms_resource_restore_task_status (status),
@@ -126,6 +130,7 @@ CREATE TABLE IF NOT EXISTS tms_device_node (
status VARCHAR(32) NOT NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_device_node_node_id (node_id)
) COMMENT='设备节点表';
@@ -137,6 +142,7 @@ CREATE TABLE IF NOT EXISTS tms_file_record (
status VARCHAR(32) NOT NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_file_record_file_id (file_id)
) COMMENT='文件记录表';
@@ -154,10 +160,11 @@ CREATE TABLE IF NOT EXISTS tms_device_software_version (
remarks VARCHAR(255) NULL,
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_device_software_version_component_code (component_code)
) COMMENT='设备软件版本表';
INSERT INTO tms_device_software_version
INSERT IGNORE INTO tms_device_software_version
(id, component_code, component_name, current_version, source_type, detected_at, remarks)
VALUES
(1001, 'RABBITMQ', '消息队列', 'V3.8.21', 'MANUAL', NOW(), '出厂预置'),
@@ -165,14 +172,7 @@ VALUES
(1003, 'TIDB', '数据库', 'V8.1.0', 'MANUAL', NOW(), '出厂预置'),
(1004, 'NGINX', 'Nginx', 'V1.20', 'MANUAL', NOW(), '出厂预置'),
(1005, 'RECEIVER', '标准收发器', 'V1.3.2', 'MANUAL', NOW(), '出厂预置'),
(1006, 'TMS', 'CISD终端管理服务', 'V1.0.0', 'MANUAL', NOW(), '出厂预置')
ON DUPLICATE KEY UPDATE
component_name = VALUES(component_name),
current_version = VALUES(current_version),
source_type = VALUES(source_type),
detected_at = VALUES(detected_at),
remarks = VALUES(remarks),
update_time = CURRENT_TIMESTAMP;
(1006, 'TMS', 'CISD终端管理服务', 'V1.0.0', 'MANUAL', NOW(), '出厂预置');
-- -----------------------------------------------------------------------------
-- 升级任务
@@ -200,6 +200,7 @@ CREATE TABLE IF NOT EXISTS tms_upgrade_task (
finished_at DATETIME(3) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_upgrade_task_task_id (task_id),
KEY idx_tms_upgrade_task_status (status),
KEY idx_tms_upgrade_task_task_type (task_type),
@@ -218,6 +219,7 @@ CREATE TABLE IF NOT EXISTS tms_role_account (
status VARCHAR(32) NOT NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_role_account_role_code (role_code)
) COMMENT='角色账号表';
@@ -233,6 +235,7 @@ CREATE TABLE IF NOT EXISTS tms_role_ukey_binding (
unbound_at DATETIME(3) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_role_ukey_binding_role_uid_serial (role_code, uid, ukey_serial),
KEY idx_tms_role_ukey_binding_role_uid_status (role_code, uid, status),
KEY idx_tms_role_ukey_binding_role_status (role_code, status)
@@ -255,6 +258,7 @@ CREATE TABLE IF NOT EXISTS tms_auth_full_account (
last_active_at DATETIME(3) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_auth_full_account_role_uid (role_code, uid),
UNIQUE KEY uk_tms_auth_full_account_name (account_name),
KEY idx_tms_auth_full_account_role_code (role_code)
@@ -273,6 +277,7 @@ CREATE TABLE IF NOT EXISTS tms_auth_session (
logout_at DATETIME(3) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_auth_session_token (session_token),
KEY idx_tms_auth_session_role_code (role_code)
) COMMENT='认证会话表';
@@ -295,6 +300,7 @@ CREATE TABLE IF NOT EXISTS tms_replay_nonce (
expires_at DATETIME(3) NOT NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_replay_nonce_scope_principal_nonce (scope, principal_id, nonce),
KEY idx_tms_replay_nonce_expires_at (expires_at),
KEY idx_tms_replay_nonce_principal_time (principal_id, create_time)
@@ -312,6 +318,7 @@ CREATE TABLE IF NOT EXISTS tms_security_event (
detail_json JSON NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
KEY idx_tms_security_event_event_type (event_type),
KEY idx_tms_security_event_scope_principal (scope, principal_id)
) COMMENT='安全事件表';
@@ -473,48 +480,6 @@ VALUES
CURRENT_TIMESTAMP(3)
);
-- -----------------------------------------------------------------------------
-- 兼容旧库默认口令摘要升级
-- -----------------------------------------------------------------------------
-- 旧版本默认账号保存的是 PBKDF2('Sunyard@123', password_salt)。
-- 当前版本前端提交 password=SM3('Sunyard@123')，因此默认账号统一重置为
-- 固定 salt + PBKDF2(SM3('Sunyard@123'), salt)，便于旧库直接切换到摘要口径。
UPDATE tms_auth_full_account
SET password_hash = 'vVPlH2UGQcXUo7NblMJMaof32um6UinF8zsckZuxe9E=',
password_salt = '3df85c2988a5de2b9eeaa8109639641a',
update_time = CURRENT_TIMESTAMP(3)
WHERE role_code = 'SUPER_ADMIN'
AND uid = 1;
UPDATE tms_auth_full_account
SET password_hash = '25e83ejpUmjU64cYAKcDV5hhqClEu6aol8YyR3Jey7E=',
password_salt = '50de03346bb1f6afc74938acf5e88560',
update_time = CURRENT_TIMESTAMP(3)
WHERE role_code = 'SUPER_ADMIN'
AND uid = 2;
UPDATE tms_auth_full_account
SET password_hash = 'l65Pr7MxOvqPOe0u6ozGGZcT4raTXUgDYMQfLTINTyE=',
password_salt = '073cd5fd30701edfcf033e8f501b2b43',
update_time = CURRENT_TIMESTAMP(3)
WHERE role_code = 'KEY_ADMIN'
AND uid = 1;
UPDATE tms_auth_full_account
SET password_hash = 'ZRwdn3TOotyXAytO4zeSpxRm/68Rm8VcB7w7VJmZPYc=',
password_salt = '57e2616077bd8af5cb90fc9790f69573',
update_time = CURRENT_TIMESTAMP(3)
WHERE role_code = 'AUDIT_ADMIN'
AND uid = 1;
UPDATE tms_auth_full_account
SET password_hash = '5Wu8Mf5hC3kq4gm/62/T7pO+aZIw8Y7uYoMIztWyT1w=',
password_salt = 'a6bea7601138e90a540b39c73d53df81',
update_time = CURRENT_TIMESTAMP(3)
WHERE role_code = 'OPS_ADMIN'
AND uid = 1;
-- -----------------------------------------------------------------------------
-- IP白名单表
-- -----------------------------------------------------------------------------
@@ -523,7 +488,8 @@ CREATE TABLE IF NOT EXISTS tms_access_whitelist (
ip VARCHAR(32) NOT NULL,
mask VARCHAR(10) NOT NULL,
create_time DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
update_time DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
update_time DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
signature VARCHAR(250) NULL COMMENT '数据真实性签名值'
) COMMENT='访问白名单表';
@@ -548,6 +514,7 @@ CREATE TABLE IF NOT EXISTS tms_key_entity (
create_by VARCHAR(64) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_key_entity_key_idx (key_idx),
KEY idx_tms_key_entity_org_code (org_code),
KEY idx_tms_key_entity_algo (algo_type),
@@ -572,6 +539,7 @@ CREATE TABLE IF NOT EXISTS tms_certificate (
create_by VARCHAR(64) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_certificate_fingerprint (fingerprint),
KEY idx_tms_certificate_entity_id (entity_id),
KEY idx_tms_certificate_cert_type (cert_type),
@@ -597,6 +565,7 @@ CREATE TABLE IF NOT EXISTS tms_trusted_cert (
create_by VARCHAR(64) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_trusted_cert_fingerprint (fingerprint),
KEY idx_tms_trusted_cert_subject_dn (subject_dn(512)),
KEY idx_tms_trusted_cert_issuer_dn (issuer_dn(512)),
@@ -617,6 +586,7 @@ CREATE TABLE IF NOT EXISTS tms_certificate_crl (
create_by VARCHAR(64) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_certificate_crl_fingerprint (fingerprint),
KEY idx_tms_certificate_crl_issuer_dn (issuer_dn(512)),
KEY idx_tms_certificate_crl_this_update (this_update),
@@ -635,6 +605,7 @@ CREATE TABLE IF NOT EXISTS tms_certificate_crl_revoked (
revocation_reason VARCHAR(64) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
KEY idx_tms_certificate_crl_revoked_crl_id (crl_id),
KEY idx_tms_certificate_crl_revoked_issuer_serial (issuer_dn(512), serial_number),
KEY idx_tms_certificate_crl_revoked_subject_dn (subject_dn(512)),
@@ -655,6 +626,7 @@ CREATE TABLE IF NOT EXISTS tms_certificate_crl_import_task (
finished_at DATETIME(3) NULL,
create_time DATETIME(3) NOT NULL,
update_time DATETIME(3) NOT NULL,
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_certificate_crl_import_task_task_id (task_id),
KEY idx_tms_certificate_crl_import_task_status (status),
KEY idx_tms_certificate_crl_import_task_create_time (create_time)
@@ -684,6 +656,7 @@ CREATE TABLE IF NOT EXISTS tms_operation_audit_log (
sign_value TEXT NOT NULL COMMENT 'SM2签名值',
occurred_at DATETIME(3) NOT NULL COMMENT '操作发生时间',
create_time DATETIME(3) NOT NULL COMMENT '落库时间',
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
UNIQUE KEY uk_tms_operation_audit_log_log_id (log_id),
KEY idx_tms_operation_audit_log_role_code (operator_role_code),
KEY idx_tms_operation_audit_log_module_code (module_code),
@@ -709,6 +682,7 @@ CREATE TABLE IF NOT EXISTS tms_log_backup_record (
backup_result VARCHAR(32) NOT NULL COMMENT '备份结果（SUCCESS/FAILED）',
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
sign_data TEXT DEFAULT NULL COMMENT '其他字段签名',
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
PRIMARY KEY (`id`),
UNIQUE KEY `uk_record_id` (`record_id`),
KEY `idx_create_time` (`create_time`),
@@ -727,6 +701,7 @@ CREATE TABLE IF NOT EXISTS tms_backup_config (
retention_count int(11) DEFAULT '1' COMMENT '保留份数',
last_backup_time datetime DEFAULT NULL COMMENT '上次执行时间',
sign_data varchar(255) NOT NULL COMMENT '其他字段的签名值',
signature VARCHAR(250) NULL COMMENT '数据真实性签名值',
PRIMARY KEY (`id`)
) COMMENT='日志备份配置表';
@@ -739,7 +714,8 @@ CREATE TABLE IF NOT EXISTS tms_master_key_activate (
activation_status BOOLEAN NOT NULL,
create_time DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
update_time DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
update_time DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
signature VARCHAR(250) NULL COMMENT '数据真实性签名值'
) COMMENT='主密钥激活状态表';
INSERT IGNORE INTO tms_master_key_activate (
@@ -747,32 +723,3 @@ INSERT IGNORE INTO tms_master_key_activate (
ever_initialized,
activation_status
) VALUES (1, true, true);
ALTER TABLE tms_access_whitelist ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_auth_audit_log ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_auth_challenge ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_auth_full_account ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_auth_session ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_backup_config ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_certificate ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_certificate_crl ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_certificate_crl_import_task ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_certificate_crl_revoked ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_device_node ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_device_software_version ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_file_record ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_init_task ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_init_task_step ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_key_entity ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_log_backup_record ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_master_key_activate ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_operation_audit_log ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_replay_nonce ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_resource_backup_task ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_resource_restore_task ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_role_account ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_role_ukey_binding ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_security_event ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_trusted_cert ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
ALTER TABLE tms_upgrade_task ADD signature varchar(250) NULL COMMENT '数据真实性签名值';
src/test/java/com/cisd/tms/modules/init/executor/ConfigurableInitStepExecutorTest.java
+3
View File
@@ -1129,6 +1129,9 @@ class ConfigurableInitStepExecutorTest {
Assertions.assertTrue(vendorRunnerContent.contains("setftq"));
Assertions.assertTrue(vendorRunnerContent.contains("settlq"));
Assertions.assertTrue(vendorRunnerContent.contains("setsptp"));
Assertions.assertTrue(vendorRunnerContent.contains("prepare_setsptp_templates"));
Assertions.assertTrue(vendorRunnerContent.contains("cpackage/cmsp/${node_dir}"));
Assertions.assertTrue(vendorRunnerContent.contains("cpackage/cmtp/${node_dir}"));
String startAppsRunnerContent = Files.readString(startAppsRunner);
Assertions.assertTrue(startAppsRunnerContent.contains("start_standard_apps.sh"));