diff --git a/packages/ui/certd-server/db/migration-pg/v00001__init.sql b/packages/ui/certd-server/db/migration-pg/v00001__init.sql index 2e52ae90c..39ed74462 100644 --- a/packages/ui/certd-server/db/migration-pg/v00001__init.sql +++ b/packages/ui/certd-server/db/migration-pg/v00001__init.sql @@ -1,5 +1,5 @@ -- 表:sys_permission -CREATE TABLE "sys_permission" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "title" varchar(100) NOT NULL, "permission" varchar(100), "parent_id" integer NOT NULL DEFAULT (-1), "sort" integer NOT NULL, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "sys_permission" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "title" varchar(100) NOT NULL, "permission" varchar(100), "parent_id" bigint NOT NULL DEFAULT (-1), "sort" bigint NOT NULL, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); INSERT INTO sys_permission (id, title, permission, parent_id, sort ) VALUES (1, '系统管理', 'sys', -1, 1); INSERT INTO sys_permission (id, title, permission, parent_id, sort ) VALUES (2, '权限管理', 'sys:auth', 1, 1 ); INSERT INTO sys_permission (id, title, permission, parent_id, sort ) VALUES (3, '用户管理', 'sys:auth:user', 2, 1); @@ -22,12 +22,12 @@ INSERT INTO sys_permission (id, title, permission, parent_id, sort ) VALUES (18, -- 表:sys_role -CREATE TABLE "sys_role" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "name" varchar(100) NOT NULL, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "sys_role" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "name" varchar(100) NOT NULL, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); INSERT INTO sys_role (id, name ) VALUES (1, '管理员'); INSERT INTO sys_role (id, name ) VALUES (2, '只读角色'); -- 表:sys_role_permission -CREATE TABLE "sys_role_permission" ("role_id" integer NOT NULL, "permission_id" integer NOT NULL, PRIMARY KEY ("role_id", "permission_id")); +CREATE TABLE "sys_role_permission" ("role_id" bigint NOT NULL, "permission_id" bigint NOT NULL, PRIMARY KEY ("role_id", "permission_id")); INSERT INTO sys_role_permission (role_id, permission_id) VALUES (1, 1); INSERT INTO sys_role_permission (role_id, permission_id) VALUES (1, 2); INSERT INTO sys_role_permission (role_id, permission_id) VALUES (1, 3); @@ -59,12 +59,12 @@ INSERT INTO sys_role_permission (role_id, permission_id) VALUES (2, 7); INSERT INTO sys_role_permission (role_id, permission_id) VALUES (2, -1); -- 表:sys_user -CREATE TABLE "sys_user" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "username" varchar(100) NOT NULL, "password" varchar(50) NOT NULL, "nick_name" varchar(50), "avatar" varchar(255), "phone_code" varchar(20), "mobile" varchar(20), "email" varchar(100),"remark" varchar(100), "status" integer NOT NULL DEFAULT (1), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "sys_user" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "username" varchar(100) NOT NULL, "password" varchar(50) NOT NULL, "nick_name" varchar(50), "avatar" varchar(255), "phone_code" varchar(20), "mobile" varchar(20), "email" varchar(100),"remark" varchar(100), "status" bigint NOT NULL DEFAULT (1), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); INSERT INTO sys_user (id, username, password, nick_name, avatar, phone_code, mobile, email, status ,remark) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 'admin', NULL, NULL, NULL, NULL, 1,NULL); INSERT INTO sys_user (id, username, password, nick_name, avatar, phone_code, mobile, email, status ,remark) VALUES (2, 'readonly', 'e10adc3949ba59abbe56e057f20f883e', '只读用户', NULL, NULL, NULL, NULL, 1,'密码:123456'); -- 表:sys_user_role -CREATE TABLE "sys_user_role" ("role_id" integer NOT NULL, "user_id" integer NOT NULL, PRIMARY KEY ("role_id", "user_id")); +CREATE TABLE "sys_user_role" ("role_id" bigint NOT NULL, "user_id" bigint NOT NULL, PRIMARY KEY ("role_id", "user_id")); INSERT INTO sys_user_role (role_id, user_id) VALUES (1, 1); INSERT INTO sys_user_role (role_id, user_id) VALUES (2, 2); diff --git a/packages/ui/certd-server/db/migration-pg/v10000__certd.sql b/packages/ui/certd-server/db/migration-pg/v10000__certd.sql index 700505f7d..7cdd72686 100644 --- a/packages/ui/certd-server/db/migration-pg/v10000__certd.sql +++ b/packages/ui/certd-server/db/migration-pg/v10000__certd.sql @@ -5,20 +5,20 @@ -- -- 表:cd_access -CREATE TABLE "cd_access" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "name" varchar(100) NOT NULL, "type" varchar(100) NOT NULL, "setting" varchar(1024), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "cd_access" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "name" varchar(100) NOT NULL, "type" varchar(100) NOT NULL, "setting" varchar(1024), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -- 表:cd_cert -CREATE TABLE "cd_cert" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "domains" varchar(2048) NOT NULL, "email" varchar(100) NOT NULL, "cert_issuer_id" integer, "challenge_type" varchar(100), "challenge_dns_type" varchar(100),"challenge_access_id" integer, "country" varchar(100), "state" varchar(100), "locality" varchar(100), "organization" varchar(100), "organization_unit" varchar(100), "remark" varchar(100), "last_history_id" integer, "last_success_id" integer, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "cd_cert" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "domains" varchar(2048) NOT NULL, "email" varchar(100) NOT NULL, "cert_issuer_id" bigint, "challenge_type" varchar(100), "challenge_dns_type" varchar(100),"challenge_access_id" bigint, "country" varchar(100), "state" varchar(100), "locality" varchar(100), "organization" varchar(100), "organization_unit" varchar(100), "remark" varchar(100), "last_history_id" bigint, "last_success_id" bigint, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -- 表:cd_cert_apply_history -CREATE TABLE "cd_cert_apply_history" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "cert_id" integer NOT NULL, "success" boolean, "result" varchar(1024), "cert_crt" varchar(1024), "cert_key" varchar(1024), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "cd_cert_apply_history" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "cert_id" bigint NOT NULL, "success" boolean, "result" varchar(1024), "cert_crt" varchar(1024), "cert_key" varchar(1024), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -- 表:cd_cert_issuer -CREATE TABLE "cd_cert_issuer" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "type" varchar(20) NOT NULL, "account" varchar(100) NOT NULL, "private_key" varchar(1024), "setting" varchar, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "cd_cert_issuer" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "type" varchar(20) NOT NULL, "account" varchar(100) NOT NULL, "private_key" varchar(1024), "setting" varchar, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -- 表:cd_task -CREATE TABLE "cd_task" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "name" varchar(100), "type" varchar(100), "setting" varchar(2048), "cert_id" integer NOT NULL, "last_history_id" integer, "last_success_id" integer, "remark" varchar(100), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "cd_task" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "name" varchar(100), "type" varchar(100), "setting" varchar(2048), "cert_id" bigint NOT NULL, "last_history_id" bigint, "last_success_id" bigint, "remark" varchar(100), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -- 表:cd_task_history -CREATE TABLE "cd_task_history" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "task_id" integer NOT NULL, "cert_id" integer NOT NULL, "cert_apply_history_id" integer NOT NULL, "success" boolean, "result" varchar(2048), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "cd_task_history" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "task_id" bigint NOT NULL, "cert_id" bigint NOT NULL, "cert_apply_history_id" bigint NOT NULL, "success" boolean, "result" varchar(2048), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); diff --git a/packages/ui/certd-server/db/migration-pg/v10001__certdv2.sql b/packages/ui/certd-server/db/migration-pg/v10001__certdv2.sql index 41dc897d0..d5ce48e59 100644 --- a/packages/ui/certd-server/db/migration-pg/v10001__certdv2.sql +++ b/packages/ui/certd-server/db/migration-pg/v10001__certdv2.sql @@ -1,7 +1,7 @@ -CREATE TABLE "pi_history" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "pipeline_id" integer NOT NULL, "pipeline" varchar(40960), "status" varchar(20), "end_time" timestamp, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "pi_history" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "pipeline_id" bigint NOT NULL, "pipeline" varchar(40960), "status" varchar(20), "end_time" timestamp, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -CREATE TABLE "pi_history_log" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "pipeline_id" integer NOT NULL, "history_id" integer NOT NULL, "node_id" varchar(100), "logs" varchar(40960), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "pi_history_log" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "pipeline_id" bigint NOT NULL, "history_id" bigint NOT NULL, "node_id" varchar(100), "logs" varchar(40960), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -CREATE TABLE "pi_pipeline" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "title" integer NOT NULL, "content" varchar(40960) NOT NULL, "keep_history_count" integer, "remark" varchar(100), "status" varchar(100), "disabled" boolean DEFAULT (false), "last_history_time" integer, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "pi_pipeline" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "title" bigint NOT NULL, "content" varchar(40960) NOT NULL, "keep_history_count" bigint, "remark" varchar(100), "status" varchar(100), "disabled" boolean DEFAULT (false), "last_history_time" bigint, "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -CREATE TABLE "pi_storage" ("id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" integer NOT NULL, "scope" varchar NOT NULL, "namespace" varchar NOT NULL, "version" varchar(100),"key" varchar(100), "value" varchar(40960), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); +CREATE TABLE "pi_storage" ("id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, "user_id" bigint NOT NULL, "scope" varchar NOT NULL, "namespace" varchar NOT NULL, "version" varchar(100),"key" varchar(100), "value" varchar(40960), "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)); diff --git a/packages/ui/certd-server/db/migration-pg/v10002__settings.sql b/packages/ui/certd-server/db/migration-pg/v10002__settings.sql index 011e659ef..5aed8b133 100644 --- a/packages/ui/certd-server/db/migration-pg/v10002__settings.sql +++ b/packages/ui/certd-server/db/migration-pg/v10002__settings.sql @@ -1,6 +1,6 @@ CREATE TABLE "sys_settings" ( - "id" integer NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY , - "user_id" integer NOT NULL, + "id" bigint NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY , + "user_id" bigint NOT NULL, "key" varchar(100) NOT NULL, "title" varchar(100) NOT NULL, "setting" varchar(1024), diff --git a/packages/ui/certd-server/db/migration-pg/v10004__settings.sql b/packages/ui/certd-server/db/migration-pg/v10004__settings.sql index 3d7964dce..8729c7d50 100644 --- a/packages/ui/certd-server/db/migration-pg/v10004__settings.sql +++ b/packages/ui/certd-server/db/migration-pg/v10004__settings.sql @@ -1,7 +1,7 @@ ALTER TABLE "sys_settings" RENAME TO "user_settings"; CREATE TABLE "sys_settings" ( - "id" integer NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY , + "id" bigint NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY , "key" varchar(100) NOT NULL, "title" varchar(100) NOT NULL, "setting" varchar(1024), diff --git a/packages/ui/certd-server/db/migration-pg/v10005__password2.sql b/packages/ui/certd-server/db/migration-pg/v10005__password2.sql index 37b41e09c..0050d7741 100644 --- a/packages/ui/certd-server/db/migration-pg/v10005__password2.sql +++ b/packages/ui/certd-server/db/migration-pg/v10005__password2.sql @@ -1,5 +1,5 @@ INSERT INTO sys_settings (key, title, setting,access) VALUES ('sys.install','安装信息','{"installTime":'|| (select (timestamp) from flyway_history where id = 1 )||'}','private'); -ALTER TABLE sys_user ADD COLUMN password_version integer DEFAULT 1; +ALTER TABLE sys_user ADD COLUMN password_version bigint DEFAULT 1; ALTER TABLE sys_user ADD COLUMN password_salt varchar(36); alter table sys_user alter column password type varchar(100) using password::varchar(100); diff --git a/packages/ui/certd-server/db/migration-pg/v10006__pipeline_title.sql b/packages/ui/certd-server/db/migration-pg/v10006__pipeline_title.sql index d2349dfd0..afea57e89 100644 --- a/packages/ui/certd-server/db/migration-pg/v10006__pipeline_title.sql +++ b/packages/ui/certd-server/db/migration-pg/v10006__pipeline_title.sql @@ -2,4 +2,4 @@ alter table pi_pipeline alter column title type varchar(100) using title::varcha alter table pi_pipeline alter column content type text using content::text; alter table pi_storage alter column value type text using value::text; -alter table pi_pipeline add "order" integer default 0; +alter table pi_pipeline add "order" bigint default 0; diff --git a/packages/ui/certd-server/src/basic/base-service.ts b/packages/ui/certd-server/src/basic/base-service.ts index aa1909247..07337fad4 100644 --- a/packages/ui/certd-server/src/basic/base-service.ts +++ b/packages/ui/certd-server/src/basic/base-service.ts @@ -75,7 +75,7 @@ export abstract class BaseService { * @param param 数据 */ async add(param) { - const now = new Date().getTime(); + const now = new Date(); param.createTime = now; param.updateTime = now; await this.addOrUpdate(param); @@ -91,7 +91,7 @@ export abstract class BaseService { */ async update(param) { if (!param.id) throw new ValidateException('no id'); - param.updateTime = new Date().getTime(); + param.updateTime = new Date(); await this.addOrUpdate(param); await this.modifyAfter(param); }