diff --git a/launchers/standalone/src/main/resources/application-mysql.yaml b/launchers/standalone/src/main/resources/application-mysql.yaml index f3145551a..5aff85cd6 100644 --- a/launchers/standalone/src/main/resources/application-mysql.yaml +++ b/launchers/standalone/src/main/resources/application-mysql.yaml @@ -6,6 +6,7 @@ spring: password: ${S2_DB_PASSWORD:} sql: init: + continue-on-error: true mode: always username: ${S2_DB_USER:root} password: ${S2_DB_PASSWORD:} diff --git a/launchers/standalone/src/main/resources/application-postgres.yaml b/launchers/standalone/src/main/resources/application-postgres.yaml index 519e716aa..6b8419239 100644 --- a/launchers/standalone/src/main/resources/application-postgres.yaml +++ b/launchers/standalone/src/main/resources/application-postgres.yaml @@ -6,6 +6,7 @@ spring: password: ${S2_DB_PASSWORD:postgres} sql: init: + continue-on-error: true mode: always username: ${S2_DB_USER:postgres} password: ${S2_DB_PASSWORD:postgres} diff --git a/launchers/standalone/src/main/resources/db/data-mysql.sql b/launchers/standalone/src/main/resources/db/data-mysql.sql index 223be4060..6210dbff6 100644 --- a/launchers/standalone/src/main/resources/db/data-mysql.sql +++ b/launchers/standalone/src/main/resources/db/data-mysql.sql @@ -1,8 +1,3 @@ --- clear data if already exists -DELETE FROM s2_user; -DELETE FROM s2_available_date_info; -DELETE FROM s2_canvas; - -- sample user -- The default value for the password is 123456 INSERT INTO s2_user (`name`, password, salt, display_name, email, is_admin) values ('admin','c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT','jGl25bVBBBW96Qi9Te4V3w==','admin','admin@xx.com', 1); diff --git a/launchers/standalone/src/main/resources/db/data-postgres.sql b/launchers/standalone/src/main/resources/db/data-postgres.sql index 014c1711b..d1f02ff69 100644 --- a/launchers/standalone/src/main/resources/db/data-postgres.sql +++ b/launchers/standalone/src/main/resources/db/data-postgres.sql @@ -1,8 +1,3 @@ --- clear data if already exists -DELETE FROM s2_user; -DELETE FROM s2_available_date_info; -DELETE FROM s2_canvas; - -- sample user -- The default value for the password is 123456 insert into s2_user ("name", password, salt, display_name, email, is_admin) values ('admin','c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT','jGl25bVBBBW96Qi9Te4V3w==','admin','admin@xx.com', 1); diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql index 6143b19e4..8ecc8170a 100644 --- a/launchers/standalone/src/main/resources/db/schema-mysql.sql +++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql @@ -41,6 +41,7 @@ CREATE TABLE IF NOT EXISTS `s2_available_date_info` ( `updated_at` timestamp NULL, `updated_by` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, `status` tinyint DEFAULT 0, + UNIQUE(`item_id`, `type`), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -382,6 +383,7 @@ CREATE TABLE IF NOT EXISTS s2_user salt varchar(256) DEFAULT NULL COMMENT 'md5密码盐', email varchar(100) null, is_admin tinyint null, + UNIQUE (`name`), PRIMARY KEY (`id`) ); diff --git a/launchers/standalone/src/main/resources/db/schema-postgres.sql b/launchers/standalone/src/main/resources/db/schema-postgres.sql index a57944216..834fafd41 100644 --- a/launchers/standalone/src/main/resources/db/schema-postgres.sql +++ b/launchers/standalone/src/main/resources/db/schema-postgres.sql @@ -37,7 +37,8 @@ CREATE TABLE IF NOT EXISTS s2_available_date_info ( created_by varchar(100) NOT NULL, updated_at timestamp NULL, updated_by varchar(100) NOT NULL, - status smallint DEFAULT 0 + status smallint DEFAULT 0, + UNIQUE(item_id, type) ); CREATE TABLE IF NOT EXISTS s2_chat ( @@ -491,5 +492,6 @@ CREATE TABLE IF NOT EXISTS s2_user ( password varchar(256) NULL, salt varchar(256) DEFAULT NULL, email varchar(100) NULL, - is_admin smallint NULL + is_admin smallint NULL, + UNIQUE(name) ); \ No newline at end of file