diff --git a/app/src/main/resources/sql/h2/create_all_tables_ddl_v1.0.0.h2.sql b/app/src/main/resources/sql/h2/01_create_all_tables_ddl_v1.0.0.h2.sql similarity index 100% rename from app/src/main/resources/sql/h2/create_all_tables_ddl_v1.0.0.h2.sql rename to app/src/main/resources/sql/h2/01_create_all_tables_ddl_v1.0.0.h2.sql diff --git a/app/src/main/resources/sql/h2/create_model_ddl_2025_0717.sql b/app/src/main/resources/sql/h2/02_create_model_ddl_2025_0717.sql similarity index 98% rename from app/src/main/resources/sql/h2/create_model_ddl_2025_0717.sql rename to app/src/main/resources/sql/h2/02_create_model_ddl_2025_0717.sql index b0c8400f..149ed8b3 100644 --- a/app/src/main/resources/sql/h2/create_model_ddl_2025_0717.sql +++ b/app/src/main/resources/sql/h2/02_create_model_ddl_2025_0717.sql @@ -1,22 +1,22 @@ -drop table if exists `t_model`; - -create table `t_model` -( - `id` int not null auto_increment comment '主键id', - `name_cn` varchar(255) not null comment '中文名称', - `name_en` varchar(255) not null comment '英文名称', - `version` varchar(255) comment '版本', - `model_url` varchar(255) comment '模型url', - `parameters` varchar(2000) not null comment '字段参数', - `method` longtext comment '方法', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_model` (`name_en`,`version`) using btree -) engine = innodb comment = '模型表'; +drop table if exists `t_model`; + +create table `t_model` +( + `id` int not null auto_increment comment '主键id', + `name_cn` varchar(255) not null comment '中文名称', + `name_en` varchar(255) not null comment '英文名称', + `version` varchar(255) comment '版本', + `model_url` varchar(255) comment '模型url', + `parameters` varchar(2000) not null comment '字段参数', + `method` longtext comment '方法', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_model` (`name_en`,`version`) using btree +) engine = innodb comment = '模型表'; diff --git a/app/src/main/resources/sql/mysql/create_resources_ddl_2025_0902.sql b/app/src/main/resources/sql/h2/03_create_resources_ddl_2025_0902.sql similarity index 98% rename from app/src/main/resources/sql/mysql/create_resources_ddl_2025_0902.sql rename to app/src/main/resources/sql/h2/03_create_resources_ddl_2025_0902.sql index 00e6e670..e6b44079 100644 --- a/app/src/main/resources/sql/mysql/create_resources_ddl_2025_0902.sql +++ b/app/src/main/resources/sql/h2/03_create_resources_ddl_2025_0902.sql @@ -1,58 +1,58 @@ -drop table if exists `t_resource`; - -create table `t_resource` -( - `id` int not null auto_increment comment '主键id', - `app_id` int not null comment '关联appId', - `platform_id` int not null comment '关联设计器id', - `name` varchar(255) not null comment '名称', - `thumbnail_name` varchar(255) not null comment '缩略图名称', - `resource_url` varchar(255) comment '资源url', - `thumbnail_url` varchar(255) comment '缩略图url', - `category` varchar(255) not null comment '分类', - `description` varchar(2000) comment '描述', - `thumbnail_data` longtext comment '缩略图数据', - `resource_data` longtext comment '资源数据', - `public_status` int comment '公开状态：0，1，2', - `is_default` tinyint(1) comment '是否是默认', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_resource` (`category`,`name`, `tenant_id`) using btree -) engine = innodb comment = '资源表'; - -drop table if exists `t_resource_group`; - -create table `t_resource_group` -( - `id` int not null auto_increment comment '主键id', - `name` varchar(255) not null comment '中文名称', - `app_id` int not null comment '关联appId', - `platform_id` int not null comment '关联设计器id', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_resource_group` (`name`,`app_id`, `tenant_id`) using btree -) engine = innodb comment = '资源分组表'; - -drop table if exists `r_resource_group_resource`; - -CREATE TABLE `r_resource_group_resource` -( - `id` int NOT NULL AUTO_INCREMENT COMMENT '主键id', - `resource_id` int NOT NULL COMMENT '资源id', - `resource_group_id` int NOT NULL COMMENT '资源分组id', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `u_idx_resource_group_resource` (`resource_id`,`resource_group_id`) USING BTREE +drop table if exists `t_resource`; + +create table `t_resource` +( + `id` int not null auto_increment comment '主键id', + `app_id` int not null comment '关联appId', + `platform_id` int not null comment '关联设计器id', + `name` varchar(255) not null comment '名称', + `thumbnail_name` varchar(255) not null comment '缩略图名称', + `resource_url` varchar(255) comment '资源url', + `thumbnail_url` varchar(255) comment '缩略图url', + `category` varchar(255) not null comment '分类', + `description` varchar(2000) comment '描述', + `thumbnail_data` longtext comment '缩略图数据', + `resource_data` longtext comment '资源数据', + `public_status` int comment '公开状态：0，1，2', + `is_default` tinyint(1) comment '是否是默认', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_resource` (`category`,`name`, `tenant_id`) using btree +) engine = innodb comment = '资源表'; + +drop table if exists `t_resource_group`; + +create table `t_resource_group` +( + `id` int not null auto_increment comment '主键id', + `name` varchar(255) not null comment '中文名称', + `app_id` int not null comment '关联appId', + `platform_id` int not null comment '关联设计器id', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_resource_group` (`name`,`app_id`, `tenant_id`) using btree +) engine = innodb comment = '资源分组表'; + +drop table if exists `r_resource_group_resource`; + +CREATE TABLE `r_resource_group_resource` +( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键id', + `resource_id` int NOT NULL COMMENT '资源id', + `resource_group_id` int NOT NULL COMMENT '资源分组id', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `u_idx_resource_group_resource` (`resource_id`,`resource_group_id`) USING BTREE ) engine = innodb comment = '资源及资源分组关系表'; \ No newline at end of file diff --git a/app/src/main/resources/sql/mysql/create_permission_table_ddl_2025_1029.sql b/app/src/main/resources/sql/h2/04_create_permission_table_ddl_2025_1029.sql similarity index 98% rename from app/src/main/resources/sql/mysql/create_permission_table_ddl_2025_1029.sql rename to app/src/main/resources/sql/h2/04_create_permission_table_ddl_2025_1029.sql index 64101625..6242cd20 100644 --- a/app/src/main/resources/sql/mysql/create_permission_table_ddl_2025_1029.sql +++ b/app/src/main/resources/sql/h2/04_create_permission_table_ddl_2025_1029.sql @@ -1,34 +1,34 @@ -drop table if exists `t_permission_role`; - -create table `t_permission_role` -( - `id` int not null auto_increment comment '主键id', - `name` varchar(255) not null comment '名称', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - primary key (`id`) using btree, - unique index `u_idx_permission_role` (`name`) using btree -) engine = innodb comment = ''; - -drop table if exists `r_auth_users_units_roles`; - -create table `r_auth_users_units_roles` -( - `id` int not null auto_increment comment '主键id', - `user_id` int not null comment '用户', - `unit_id` int not null comment '业务单元', - `unit_type` varchar(60) not null comment '业务单元类型', - `tenant_id` int not null comment '组织id', - `role_id` int not null comment '角色id', - `expired_time` timestamp comment '过期时间', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - primary key (`id`) using btree, - unique index `u_idx_auth_users_units_roles` (`user_id`, `unit_id`, `unit_type`) using btree -) engine = innodb comment = ''; - +drop table if exists `t_permission_role`; + +create table `t_permission_role` +( + `id` int not null auto_increment comment '主键id', + `name` varchar(255) not null comment '名称', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + primary key (`id`) using btree, + unique index `u_idx_permission_role` (`name`) using btree +) engine = innodb comment = ''; + +drop table if exists `r_auth_users_units_roles`; + +create table `r_auth_users_units_roles` +( + `id` int not null auto_increment comment '主键id', + `user_id` int not null comment '用户', + `unit_id` int not null comment '业务单元', + `unit_type` varchar(60) not null comment '业务单元类型', + `tenant_id` int not null comment '组织id', + `role_id` int not null comment '角色id', + `expired_time` timestamp comment '过期时间', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + primary key (`id`) using btree, + unique index `u_idx_auth_users_units_roles` (`user_id`, `unit_id`, `unit_type`) using btree +) engine = innodb comment = ''; + diff --git a/app/src/main/resources/sql/h2/update_all_tables_ddl.sql b/app/src/main/resources/sql/h2/05_update_all_tables_ddl.sql similarity index 98% rename from app/src/main/resources/sql/h2/update_all_tables_ddl.sql rename to app/src/main/resources/sql/h2/05_update_all_tables_ddl.sql index 7a944faf..13f202c7 100644 --- a/app/src/main/resources/sql/h2/update_all_tables_ddl.sql +++ b/app/src/main/resources/sql/h2/05_update_all_tables_ddl.sql @@ -1,29 +1,29 @@ -ALTER TABLE t_component DROP INDEX u_idx_component; -ALTER TABLE t_component ADD INDEX u_idx_component (tenant_id, name_en, version, library_id); - -ALTER TABLE t_datasource DROP INDEX u_idx_datasource; -ALTER TABLE t_datasource ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_platform_history MODIFY sub_count int NULL; -ALTER TABLE t_platform_history MODIFY publish_url varchar(255) NULL; - -ALTER TABLE t_app MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_app_extension MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_carriers_relation MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_group MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_business_category MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_component MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_component_library MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_datasource MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_i18n_entry MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_material MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_material_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page_template MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_component DROP INDEX u_idx_component; +ALTER TABLE t_component ADD INDEX u_idx_component (tenant_id, name_en, version, library_id); + +ALTER TABLE t_datasource DROP INDEX u_idx_datasource; +ALTER TABLE t_datasource ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_platform_history MODIFY sub_count int NULL; +ALTER TABLE t_platform_history MODIFY publish_url varchar(255) NULL; + +ALTER TABLE t_app MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_app_extension MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_carriers_relation MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_group MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_business_category MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_component MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_component_library MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_datasource MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_i18n_entry MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_material MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_material_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page_template MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; diff --git a/app/src/main/resources/sql/h2/update_tables_ddl_v1.0.0_2025_0527.sql b/app/src/main/resources/sql/h2/06_update_tables_ddl_v1.0.0_2025_0527.sql similarity index 99% rename from app/src/main/resources/sql/h2/update_tables_ddl_v1.0.0_2025_0527.sql rename to app/src/main/resources/sql/h2/06_update_tables_ddl_v1.0.0_2025_0527.sql index 460a83aa..7ed6d0b4 100644 --- a/app/src/main/resources/sql/h2/update_tables_ddl_v1.0.0_2025_0527.sql +++ b/app/src/main/resources/sql/h2/06_update_tables_ddl_v1.0.0_2025_0527.sql @@ -1,2 +1,2 @@ -ALTER TABLE t_block_group DROP INDEX u_idx_block_group; +ALTER TABLE t_block_group DROP INDEX u_idx_block_group; ALTER TABLE t_block_group ADD INDEX u_idx_block_group (`tenant_id`, `platform_id`, `name`, `app_id`); \ No newline at end of file diff --git a/app/src/main/resources/sql/h2/update_table_ddl_2025_1014.sql b/app/src/main/resources/sql/h2/07_update_table_ddl_2025_1014.sql similarity index 97% rename from app/src/main/resources/sql/h2/update_table_ddl_2025_1014.sql rename to app/src/main/resources/sql/h2/07_update_table_ddl_2025_1014.sql index aec687b3..a66dba27 100644 --- a/app/src/main/resources/sql/h2/update_table_ddl_2025_1014.sql +++ b/app/src/main/resources/sql/h2/07_update_table_ddl_2025_1014.sql @@ -1,46 +1,46 @@ -ALTER TABLE t_app - ADD COLUMN is_template VARCHAR(100) AFTER is_default; -ALTER TABLE t_app - ADD COLUMN industry_id INT AFTER platform_id; -ALTER TABLE t_app - ADD COLUMN scene_id INT AFTER industry_id; - -ALTER TABLE t_app DROP INDEX u_idx_app; -ALTER TABLE t_app - ADD INDEX u_idx_app (`tenant_id`, `platform_id`, `name`, `is_template`); - -ALTER TABLE t_business_category - ADD COLUMN business_group VARCHAR(100) AFTER `name`; - -ALTER TABLE t_datasource DROP INDEX u_idx_datasource; -ALTER TABLE t_datasource - ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_app_extension - ADD COLUMN platform_id INT AFTER app_id; -ALTER TABLE t_app_extension DROP INDEX u_idx_app_extension; -ALTER TABLE t_app_extension - ADD INDEX u_idx_app_extension (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_model - ADD COLUMN app_id INT AFTER id; -ALTER TABLE t_model - ADD COLUMN platform_id INT AFTER app_id; -ALTER TABLE t_model DROP INDEX u_idx_model; -ALTER TABLE t_model - ADD INDEX u_idx_model (`tenant_id`, `platform_id`, `app_id`, `name_cn`,`version`); - -ALTER TABLE t_user DROP COLUMN email, DROP COLUMN tenant_id, DROP COLUMN site_id,DROP COLUMN renter_id,DROP COLUMN created_by,DROP COLUMN last_updated_by; - - -ALTER TABLE t_user - ADD COLUMN password VARCHAR(200) AFTER username; -ALTER TABLE t_user - ADD COLUMN email VARCHAR(200) AFTER password; -ALTER TABLE t_user - ADD COLUMN salt VARCHAR(200) AFTER password; -ALTER TABLE t_user - ADD COLUMN public_key VARCHAR(200) AFTER salt; -ALTER TABLE t_user - ADD COLUMN private_key VARCHAR(200) AFTER public_key; - +ALTER TABLE t_app + ADD COLUMN is_template VARCHAR(100) AFTER is_default; +ALTER TABLE t_app + ADD COLUMN industry_id INT AFTER platform_id; +ALTER TABLE t_app + ADD COLUMN scene_id INT AFTER industry_id; + +ALTER TABLE t_app DROP INDEX u_idx_app; +ALTER TABLE t_app + ADD INDEX u_idx_app (`tenant_id`, `platform_id`, `name`, `is_template`); + +ALTER TABLE t_business_category + ADD COLUMN business_group VARCHAR(100) AFTER `name`; + +ALTER TABLE t_datasource DROP INDEX u_idx_datasource; +ALTER TABLE t_datasource + ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_app_extension + ADD COLUMN platform_id INT AFTER app_id; +ALTER TABLE t_app_extension DROP INDEX u_idx_app_extension; +ALTER TABLE t_app_extension + ADD INDEX u_idx_app_extension (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_model + ADD COLUMN app_id INT AFTER id; +ALTER TABLE t_model + ADD COLUMN platform_id INT AFTER app_id; +ALTER TABLE t_model DROP INDEX u_idx_model; +ALTER TABLE t_model + ADD INDEX u_idx_model (`tenant_id`, `platform_id`, `app_id`, `name_cn`,`version`); + +ALTER TABLE t_user DROP COLUMN email, DROP COLUMN tenant_id, DROP COLUMN site_id,DROP COLUMN renter_id,DROP COLUMN created_by,DROP COLUMN last_updated_by; + + +ALTER TABLE t_user + ADD COLUMN password VARCHAR(200) AFTER username; +ALTER TABLE t_user + ADD COLUMN email VARCHAR(200) AFTER password; +ALTER TABLE t_user + ADD COLUMN salt VARCHAR(200) AFTER password; +ALTER TABLE t_user + ADD COLUMN public_key VARCHAR(200) AFTER salt; +ALTER TABLE t_user + ADD COLUMN private_key VARCHAR(200) AFTER public_key; + diff --git a/app/src/main/resources/sql/h2/update_table_ddl_2025_1217.sql b/app/src/main/resources/sql/h2/08_update_table_ddl_2025_1217.sql similarity index 98% rename from app/src/main/resources/sql/h2/update_table_ddl_2025_1217.sql rename to app/src/main/resources/sql/h2/08_update_table_ddl_2025_1217.sql index 7329c08b..e7885329 100644 --- a/app/src/main/resources/sql/h2/update_table_ddl_2025_1217.sql +++ b/app/src/main/resources/sql/h2/08_update_table_ddl_2025_1217.sql @@ -1,2 +1,2 @@ -ALTER TABLE t_resource +ALTER TABLE t_resource ADD COLUMN hash VARCHAR(100) AFTER thumbnail_url; \ No newline at end of file diff --git a/app/src/main/resources/sql/h2/09_update_table_ddl_2025_1229.sql b/app/src/main/resources/sql/h2/09_update_table_ddl_2025_1229.sql new file mode 100644 index 00000000..1e8f009f --- /dev/null +++ b/app/src/main/resources/sql/h2/09_update_table_ddl_2025_1229.sql @@ -0,0 +1,5 @@ +ALTER TABLE t_tenant DROP INDEX u_idx_tenant; +ALTER TABLE t_tenant ADD UNIQUE INDEX u_idx_tenant (`name_en`); + +ALTER TABLE t_tenant MODIFY COLUMN name_en VARCHAR(255) NOT NULL COMMENT '组织英文名'; +ALTER TABLE t_tenant MODIFY COLUMN name_cn VARCHAR(255) NULL COMMENT '组织中文名'; \ No newline at end of file diff --git a/app/src/main/resources/sql/h2/init_data_for_test_v1.0.0.sql b/app/src/main/resources/sql/h2/init_data_for_test_v1.0.0.sql index f482a960..640301c4 100644 --- a/app/src/main/resources/sql/h2/init_data_for_test_v1.0.0.sql +++ b/app/src/main/resources/sql/h2/init_data_for_test_v1.0.0.sql @@ -1,7 +1,7 @@ INSERT INTO `t_material_history` (`id`, `ref_id`, `version`, `content`, `name`, `npm_name`, `framework`, `assets_url`, `image_url`, `description`, `material_size`, `tgz_url`, `unzip_tgz_root_path_url`, `unzip_tgz_files`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, 1, '1.0.8', '{}', 'materialstwo', '@opentiny/lowcode-alpha-material-materialstwo-1505', 'Vue', '{\"material\":[\"\"],\"scripts\":[\"\",\"\"],\"styles\":[]}', NULL, '1.0.8', NULL, NULL, NULL, NULL, '1', '1', '2024-10-16 19:28:53', '2024-10-16 19:28:53', '1', '1'); -INSERT INTO `t_tenant` (`id`, `name_cn`, `name_en`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`) VALUES (1, 'public', '公共租户', 'Default tenant for new user to explore.', '1', '1', '2024-10-16 19:31:28', '2024-10-16 19:31:28'); +INSERT INTO `t_tenant` (`id`, `name_cn`, `name_en`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`) VALUES (1, '公共租户','public', 'Default tenant for new user to explore.', '1', '1', '2024-10-16 19:31:28', '2024-10-16 19:31:28'); INSERT INTO `t_app` (`id`, `name`, `app_website`, `platform_id`, `platform_history_id`, `publish_url`, `editor_url`, `visit_url`, `image_url`, `assets_url`, `state`, `published`, `home_page_id`, `css`, `config`, `constants`, `data_handler`, `description`, `latest`, `git_group`, `project_name`, `branch`, `is_demo`, `is_default`, `template_type`, `set_template_time`, `set_template_by`, `set_default_by`, `framework`, `global_state`, `default_lang`, `extend_config`, `data_hash`, `can_associate`, `data_source_global`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, 'portal-app', NULL, 1, '1', NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, '{}', NULL, '{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}', 'demo应用', '22', NULL, NULL, 'develop', NULL, NULL, 'serviceDevelop', '2023-11-19 18:14:37', '1', '1', 'Vue', '[{\"id\":\"test2\",\"state\":{\"name1\":\"xxx1\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}},{\"id\":\"test3\",\"state\":{\"name1\":\"xxx\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}},{\"id\":\"test4\",\"state\":{\"region\":\"\",\"scenario\":\"all\",\"productId\":\"\",\"planId\":\"\",\"addEvs\":false,\"addHss\":false,\"addCbr\":false,\"period\":{\"value\":1,\"unit\":\"month\"},\"amount\":1},\"getters\":{},\"actions\":{}},{\"id\":\"test1\",\"state\":{\"name1\":\"xxx\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}}]', NULL, '{\"business\":{\"serviceName\":\"\",\"endpointName\":\"cce\",\"endpointId\":\"ee\",\"serviceId\":\"ee\",\"router\":\"ee\"},\"env\":{\"alpha\":{\"regions\":[{\"name\":\"\",\"baseUrl\":\"\",\"isDefault\":false}],\"isDefault\":true}},\"type\":\"console\"}', '8b0eba6ad055532a586f9f669108fabb', '1', '{\"dataHandler\":{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}}', '1', '1', '2024-10-16 23:27:10', '2024-10-16 23:27:10', '1', '1'); diff --git a/app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.0.0.mysql.sql b/app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql similarity index 100% rename from app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.0.0.mysql.sql rename to app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql diff --git a/app/src/main/resources/sql/mysql/create_model_ddl_2025_0717.sql b/app/src/main/resources/sql/mysql/02_create_model_ddl_2025_0717.sql similarity index 98% rename from app/src/main/resources/sql/mysql/create_model_ddl_2025_0717.sql rename to app/src/main/resources/sql/mysql/02_create_model_ddl_2025_0717.sql index b0c8400f..149ed8b3 100644 --- a/app/src/main/resources/sql/mysql/create_model_ddl_2025_0717.sql +++ b/app/src/main/resources/sql/mysql/02_create_model_ddl_2025_0717.sql @@ -1,22 +1,22 @@ -drop table if exists `t_model`; - -create table `t_model` -( - `id` int not null auto_increment comment '主键id', - `name_cn` varchar(255) not null comment '中文名称', - `name_en` varchar(255) not null comment '英文名称', - `version` varchar(255) comment '版本', - `model_url` varchar(255) comment '模型url', - `parameters` varchar(2000) not null comment '字段参数', - `method` longtext comment '方法', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_model` (`name_en`,`version`) using btree -) engine = innodb comment = '模型表'; +drop table if exists `t_model`; + +create table `t_model` +( + `id` int not null auto_increment comment '主键id', + `name_cn` varchar(255) not null comment '中文名称', + `name_en` varchar(255) not null comment '英文名称', + `version` varchar(255) comment '版本', + `model_url` varchar(255) comment '模型url', + `parameters` varchar(2000) not null comment '字段参数', + `method` longtext comment '方法', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_model` (`name_en`,`version`) using btree +) engine = innodb comment = '模型表'; diff --git a/docker-deploy-data/mysql/init/create_resources_ddl_2025_0902.sql b/app/src/main/resources/sql/mysql/03_create_resources_ddl_2025_0902.sql similarity index 98% rename from docker-deploy-data/mysql/init/create_resources_ddl_2025_0902.sql rename to app/src/main/resources/sql/mysql/03_create_resources_ddl_2025_0902.sql index 00e6e670..e6b44079 100644 --- a/docker-deploy-data/mysql/init/create_resources_ddl_2025_0902.sql +++ b/app/src/main/resources/sql/mysql/03_create_resources_ddl_2025_0902.sql @@ -1,58 +1,58 @@ -drop table if exists `t_resource`; - -create table `t_resource` -( - `id` int not null auto_increment comment '主键id', - `app_id` int not null comment '关联appId', - `platform_id` int not null comment '关联设计器id', - `name` varchar(255) not null comment '名称', - `thumbnail_name` varchar(255) not null comment '缩略图名称', - `resource_url` varchar(255) comment '资源url', - `thumbnail_url` varchar(255) comment '缩略图url', - `category` varchar(255) not null comment '分类', - `description` varchar(2000) comment '描述', - `thumbnail_data` longtext comment '缩略图数据', - `resource_data` longtext comment '资源数据', - `public_status` int comment '公开状态：0，1，2', - `is_default` tinyint(1) comment '是否是默认', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_resource` (`category`,`name`, `tenant_id`) using btree -) engine = innodb comment = '资源表'; - -drop table if exists `t_resource_group`; - -create table `t_resource_group` -( - `id` int not null auto_increment comment '主键id', - `name` varchar(255) not null comment '中文名称', - `app_id` int not null comment '关联appId', - `platform_id` int not null comment '关联设计器id', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_resource_group` (`name`,`app_id`, `tenant_id`) using btree -) engine = innodb comment = '资源分组表'; - -drop table if exists `r_resource_group_resource`; - -CREATE TABLE `r_resource_group_resource` -( - `id` int NOT NULL AUTO_INCREMENT COMMENT '主键id', - `resource_id` int NOT NULL COMMENT '资源id', - `resource_group_id` int NOT NULL COMMENT '资源分组id', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `u_idx_resource_group_resource` (`resource_id`,`resource_group_id`) USING BTREE +drop table if exists `t_resource`; + +create table `t_resource` +( + `id` int not null auto_increment comment '主键id', + `app_id` int not null comment '关联appId', + `platform_id` int not null comment '关联设计器id', + `name` varchar(255) not null comment '名称', + `thumbnail_name` varchar(255) not null comment '缩略图名称', + `resource_url` varchar(255) comment '资源url', + `thumbnail_url` varchar(255) comment '缩略图url', + `category` varchar(255) not null comment '分类', + `description` varchar(2000) comment '描述', + `thumbnail_data` longtext comment '缩略图数据', + `resource_data` longtext comment '资源数据', + `public_status` int comment '公开状态：0，1，2', + `is_default` tinyint(1) comment '是否是默认', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_resource` (`category`,`name`, `tenant_id`) using btree +) engine = innodb comment = '资源表'; + +drop table if exists `t_resource_group`; + +create table `t_resource_group` +( + `id` int not null auto_increment comment '主键id', + `name` varchar(255) not null comment '中文名称', + `app_id` int not null comment '关联appId', + `platform_id` int not null comment '关联设计器id', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_resource_group` (`name`,`app_id`, `tenant_id`) using btree +) engine = innodb comment = '资源分组表'; + +drop table if exists `r_resource_group_resource`; + +CREATE TABLE `r_resource_group_resource` +( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键id', + `resource_id` int NOT NULL COMMENT '资源id', + `resource_group_id` int NOT NULL COMMENT '资源分组id', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `u_idx_resource_group_resource` (`resource_id`,`resource_group_id`) USING BTREE ) engine = innodb comment = '资源及资源分组关系表'; \ No newline at end of file diff --git a/app/src/main/resources/sql/h2/create_permission_table_ddl_2025_1029.sql b/app/src/main/resources/sql/mysql/04_create_permission_table_ddl_2025_1029.sql similarity index 98% rename from app/src/main/resources/sql/h2/create_permission_table_ddl_2025_1029.sql rename to app/src/main/resources/sql/mysql/04_create_permission_table_ddl_2025_1029.sql index 64101625..6242cd20 100644 --- a/app/src/main/resources/sql/h2/create_permission_table_ddl_2025_1029.sql +++ b/app/src/main/resources/sql/mysql/04_create_permission_table_ddl_2025_1029.sql @@ -1,34 +1,34 @@ -drop table if exists `t_permission_role`; - -create table `t_permission_role` -( - `id` int not null auto_increment comment '主键id', - `name` varchar(255) not null comment '名称', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - primary key (`id`) using btree, - unique index `u_idx_permission_role` (`name`) using btree -) engine = innodb comment = ''; - -drop table if exists `r_auth_users_units_roles`; - -create table `r_auth_users_units_roles` -( - `id` int not null auto_increment comment '主键id', - `user_id` int not null comment '用户', - `unit_id` int not null comment '业务单元', - `unit_type` varchar(60) not null comment '业务单元类型', - `tenant_id` int not null comment '组织id', - `role_id` int not null comment '角色id', - `expired_time` timestamp comment '过期时间', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - primary key (`id`) using btree, - unique index `u_idx_auth_users_units_roles` (`user_id`, `unit_id`, `unit_type`) using btree -) engine = innodb comment = ''; - +drop table if exists `t_permission_role`; + +create table `t_permission_role` +( + `id` int not null auto_increment comment '主键id', + `name` varchar(255) not null comment '名称', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + primary key (`id`) using btree, + unique index `u_idx_permission_role` (`name`) using btree +) engine = innodb comment = ''; + +drop table if exists `r_auth_users_units_roles`; + +create table `r_auth_users_units_roles` +( + `id` int not null auto_increment comment '主键id', + `user_id` int not null comment '用户', + `unit_id` int not null comment '业务单元', + `unit_type` varchar(60) not null comment '业务单元类型', + `tenant_id` int not null comment '组织id', + `role_id` int not null comment '角色id', + `expired_time` timestamp comment '过期时间', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + primary key (`id`) using btree, + unique index `u_idx_auth_users_units_roles` (`user_id`, `unit_id`, `unit_type`) using btree +) engine = innodb comment = ''; + diff --git a/docker-deploy-data/mysql/init/update_all_tables_ddl.sql b/app/src/main/resources/sql/mysql/05_update_all_tables_ddl.sql similarity index 98% rename from docker-deploy-data/mysql/init/update_all_tables_ddl.sql rename to app/src/main/resources/sql/mysql/05_update_all_tables_ddl.sql index 16b331ec..48b2095c 100644 --- a/docker-deploy-data/mysql/init/update_all_tables_ddl.sql +++ b/app/src/main/resources/sql/mysql/05_update_all_tables_ddl.sql @@ -1,30 +1,31 @@ -ALTER TABLE t_component DROP INDEX u_idx_component; -ALTER TABLE t_component ADD INDEX u_idx_component (tenant_id, name_en, version, library_id); - -ALTER TABLE t_datasource DROP INDEX u_idx_datasource; -ALTER TABLE t_datasource ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_platform_history MODIFY sub_count int NULL; -ALTER TABLE t_platform_history MODIFY publish_url varchar(255) NULL; - -ALTER TABLE t_app MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_app_extension MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_carriers_relation MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_group MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_business_category MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_component MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_component_library MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_datasource MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_i18n_entry MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_material MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_material_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page_template MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; - +ALTER TABLE t_component DROP INDEX u_idx_component; +ALTER TABLE t_component ADD INDEX u_idx_component (tenant_id, name_en, version, library_id); + +ALTER TABLE t_datasource DROP INDEX u_idx_datasource; +ALTER TABLE t_datasource ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_platform_history MODIFY sub_count int NULL; +ALTER TABLE t_platform_history MODIFY publish_url varchar(255) NULL; + +ALTER TABLE t_app MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_app_extension MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_carriers_relation MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_group MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_business_category MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_component MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_component_library MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_datasource MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_i18n_entry MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_material MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_material_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page_template MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; + + diff --git a/app/src/main/resources/sql/mysql/update_tables_ddl_v1.0.0_2025_0527.sql b/app/src/main/resources/sql/mysql/06_update_tables_ddl_v1.0.0_2025_0527.sql similarity index 99% rename from app/src/main/resources/sql/mysql/update_tables_ddl_v1.0.0_2025_0527.sql rename to app/src/main/resources/sql/mysql/06_update_tables_ddl_v1.0.0_2025_0527.sql index 460a83aa..7ed6d0b4 100644 --- a/app/src/main/resources/sql/mysql/update_tables_ddl_v1.0.0_2025_0527.sql +++ b/app/src/main/resources/sql/mysql/06_update_tables_ddl_v1.0.0_2025_0527.sql @@ -1,2 +1,2 @@ -ALTER TABLE t_block_group DROP INDEX u_idx_block_group; +ALTER TABLE t_block_group DROP INDEX u_idx_block_group; ALTER TABLE t_block_group ADD INDEX u_idx_block_group (`tenant_id`, `platform_id`, `name`, `app_id`); \ No newline at end of file diff --git a/app/src/main/resources/sql/mysql/update_table_ddl_2025_1014.sql b/app/src/main/resources/sql/mysql/07_update_table_ddl_2025_1014.sql similarity index 97% rename from app/src/main/resources/sql/mysql/update_table_ddl_2025_1014.sql rename to app/src/main/resources/sql/mysql/07_update_table_ddl_2025_1014.sql index aec687b3..a66dba27 100644 --- a/app/src/main/resources/sql/mysql/update_table_ddl_2025_1014.sql +++ b/app/src/main/resources/sql/mysql/07_update_table_ddl_2025_1014.sql @@ -1,46 +1,46 @@ -ALTER TABLE t_app - ADD COLUMN is_template VARCHAR(100) AFTER is_default; -ALTER TABLE t_app - ADD COLUMN industry_id INT AFTER platform_id; -ALTER TABLE t_app - ADD COLUMN scene_id INT AFTER industry_id; - -ALTER TABLE t_app DROP INDEX u_idx_app; -ALTER TABLE t_app - ADD INDEX u_idx_app (`tenant_id`, `platform_id`, `name`, `is_template`); - -ALTER TABLE t_business_category - ADD COLUMN business_group VARCHAR(100) AFTER `name`; - -ALTER TABLE t_datasource DROP INDEX u_idx_datasource; -ALTER TABLE t_datasource - ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_app_extension - ADD COLUMN platform_id INT AFTER app_id; -ALTER TABLE t_app_extension DROP INDEX u_idx_app_extension; -ALTER TABLE t_app_extension - ADD INDEX u_idx_app_extension (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_model - ADD COLUMN app_id INT AFTER id; -ALTER TABLE t_model - ADD COLUMN platform_id INT AFTER app_id; -ALTER TABLE t_model DROP INDEX u_idx_model; -ALTER TABLE t_model - ADD INDEX u_idx_model (`tenant_id`, `platform_id`, `app_id`, `name_cn`,`version`); - -ALTER TABLE t_user DROP COLUMN email, DROP COLUMN tenant_id, DROP COLUMN site_id,DROP COLUMN renter_id,DROP COLUMN created_by,DROP COLUMN last_updated_by; - - -ALTER TABLE t_user - ADD COLUMN password VARCHAR(200) AFTER username; -ALTER TABLE t_user - ADD COLUMN email VARCHAR(200) AFTER password; -ALTER TABLE t_user - ADD COLUMN salt VARCHAR(200) AFTER password; -ALTER TABLE t_user - ADD COLUMN public_key VARCHAR(200) AFTER salt; -ALTER TABLE t_user - ADD COLUMN private_key VARCHAR(200) AFTER public_key; - +ALTER TABLE t_app + ADD COLUMN is_template VARCHAR(100) AFTER is_default; +ALTER TABLE t_app + ADD COLUMN industry_id INT AFTER platform_id; +ALTER TABLE t_app + ADD COLUMN scene_id INT AFTER industry_id; + +ALTER TABLE t_app DROP INDEX u_idx_app; +ALTER TABLE t_app + ADD INDEX u_idx_app (`tenant_id`, `platform_id`, `name`, `is_template`); + +ALTER TABLE t_business_category + ADD COLUMN business_group VARCHAR(100) AFTER `name`; + +ALTER TABLE t_datasource DROP INDEX u_idx_datasource; +ALTER TABLE t_datasource + ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_app_extension + ADD COLUMN platform_id INT AFTER app_id; +ALTER TABLE t_app_extension DROP INDEX u_idx_app_extension; +ALTER TABLE t_app_extension + ADD INDEX u_idx_app_extension (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_model + ADD COLUMN app_id INT AFTER id; +ALTER TABLE t_model + ADD COLUMN platform_id INT AFTER app_id; +ALTER TABLE t_model DROP INDEX u_idx_model; +ALTER TABLE t_model + ADD INDEX u_idx_model (`tenant_id`, `platform_id`, `app_id`, `name_cn`,`version`); + +ALTER TABLE t_user DROP COLUMN email, DROP COLUMN tenant_id, DROP COLUMN site_id,DROP COLUMN renter_id,DROP COLUMN created_by,DROP COLUMN last_updated_by; + + +ALTER TABLE t_user + ADD COLUMN password VARCHAR(200) AFTER username; +ALTER TABLE t_user + ADD COLUMN email VARCHAR(200) AFTER password; +ALTER TABLE t_user + ADD COLUMN salt VARCHAR(200) AFTER password; +ALTER TABLE t_user + ADD COLUMN public_key VARCHAR(200) AFTER salt; +ALTER TABLE t_user + ADD COLUMN private_key VARCHAR(200) AFTER public_key; + diff --git a/app/src/main/resources/sql/mysql/update_table_ddl_2025_1217.sql b/app/src/main/resources/sql/mysql/08_update_table_ddl_2025_1217.sql similarity index 98% rename from app/src/main/resources/sql/mysql/update_table_ddl_2025_1217.sql rename to app/src/main/resources/sql/mysql/08_update_table_ddl_2025_1217.sql index 7329c08b..e7885329 100644 --- a/app/src/main/resources/sql/mysql/update_table_ddl_2025_1217.sql +++ b/app/src/main/resources/sql/mysql/08_update_table_ddl_2025_1217.sql @@ -1,2 +1,2 @@ -ALTER TABLE t_resource +ALTER TABLE t_resource ADD COLUMN hash VARCHAR(100) AFTER thumbnail_url; \ No newline at end of file diff --git a/app/src/main/resources/sql/mysql/09_update_table_ddl_2025_1229.sql b/app/src/main/resources/sql/mysql/09_update_table_ddl_2025_1229.sql new file mode 100644 index 00000000..1e8f009f --- /dev/null +++ b/app/src/main/resources/sql/mysql/09_update_table_ddl_2025_1229.sql @@ -0,0 +1,5 @@ +ALTER TABLE t_tenant DROP INDEX u_idx_tenant; +ALTER TABLE t_tenant ADD UNIQUE INDEX u_idx_tenant (`name_en`); + +ALTER TABLE t_tenant MODIFY COLUMN name_en VARCHAR(255) NOT NULL COMMENT '组织英文名'; +ALTER TABLE t_tenant MODIFY COLUMN name_cn VARCHAR(255) NULL COMMENT '组织中文名'; \ No newline at end of file diff --git a/app/src/main/resources/sql/mysql/init_data_for_test_v1.0.0.sql b/app/src/main/resources/sql/mysql/init_data_for_test_v1.0.0.sql index e5150678..edad8db6 100644 --- a/app/src/main/resources/sql/mysql/init_data_for_test_v1.0.0.sql +++ b/app/src/main/resources/sql/mysql/init_data_for_test_v1.0.0.sql @@ -1,7 +1,7 @@ INSERT INTO `t_material_history` (`id`, `ref_id`, `version`, `content`, `name`, `npm_name`, `framework`, `assets_url`, `image_url`, `description`, `material_size`, `tgz_url`, `unzip_tgz_root_path_url`, `unzip_tgz_files`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, 1, '1.0.8', '{}', 'materialstwo', '@opentiny/lowcode-alpha-material-materialstwo-1505', 'Vue', '{\"material\":[\"\"],\"scripts\":[\"\",\"\"],\"styles\":[]}', NULL, '1.0.8', NULL, NULL, NULL, NULL, '1', '1', '2024-10-16 19:28:53', '2024-10-16 19:28:53', '1', '1'); -INSERT INTO `t_tenant` (`id`, `name_cn`, `name_en`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`) VALUES (1, 'public', '公共租户', 'Default tenant for new user to explore.', '1', '1', '2024-10-16 19:31:28', '2024-10-16 19:31:28'); +INSERT INTO `t_tenant` (`id`, `name_cn`, `name_en`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`) VALUES (1, '公共租户','public', 'Default tenant for new user to explore.', '1', '1', '2024-10-16 19:31:28', '2024-10-16 19:31:28'); INSERT INTO `t_app` (`id`, `name`, `app_website`, `platform_id`, `platform_history_id`, `publish_url`, `editor_url`, `visit_url`, `image_url`, `assets_url`, `state`, `published`, `home_page_id`, `css`, `config`, `constants`, `data_handler`, `description`, `latest`, `git_group`, `project_name`, `branch`, `is_demo`, `is_default`, `template_type`, `set_template_time`, `set_template_by`, `set_default_by`, `framework`, `global_state`, `default_lang`, `extend_config`, `data_hash`, `can_associate`, `data_source_global`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, 'portal-app', NULL, 1, '1', NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, '{}', NULL, '{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}', 'demo应用', '22', NULL, NULL, 'develop', NULL, NULL, 'serviceDevelop', '2023-11-19 18:14:37', '1', '1', 'Vue', '[{\"id\":\"test2\",\"state\":{\"name1\":\"xxx1\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}},{\"id\":\"test3\",\"state\":{\"name1\":\"xxx\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}},{\"id\":\"test4\",\"state\":{\"region\":\"\",\"scenario\":\"all\",\"productId\":\"\",\"planId\":\"\",\"addEvs\":false,\"addHss\":false,\"addCbr\":false,\"period\":{\"value\":1,\"unit\":\"month\"},\"amount\":1},\"getters\":{},\"actions\":{}},{\"id\":\"test1\",\"state\":{\"name1\":\"xxx\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}}]', NULL, '{\"business\":{\"serviceName\":\"\",\"endpointName\":\"cce\",\"endpointId\":\"ee\",\"serviceId\":\"ee\",\"router\":\"ee\"},\"env\":{\"alpha\":{\"regions\":[{\"name\":\"\",\"baseUrl\":\"\",\"isDefault\":false}],\"isDefault\":true}},\"type\":\"console\"}', '8b0eba6ad055532a586f9f669108fabb', '1', '{\"dataHandler\":{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}}', '1', '1', '2024-10-16 23:27:10', '2024-10-16 23:27:10', '1', '1'); diff --git a/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java b/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java index a4e8d514..e0307757 100644 --- a/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java +++ b/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java @@ -40,7 +40,7 @@ public class GlobalExceptionAdvice { * @param e the e * @return the result */ - @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + @ResponseStatus(HttpStatus.OK) @ExceptionHandler(Exception.class) public Result> handleException(Exception e) { // 修改为 log.error，传递异常对象以打印堆栈信息 @@ -69,7 +69,7 @@ public Result> handleNullPointerException(HttpServletRequest * @param e the e * @return the result */ - @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + @ResponseStatus(HttpStatus.OK) @ExceptionHandler(ServiceException.class) public Result> handleServiceException(ServiceException e) { // 修改为 log.error，传递异常对象以打印堆栈信息 diff --git a/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java index 62ea9109..ed869676 100644 --- a/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java @@ -114,7 +114,7 @@ public Integer updateTenantById(Tenant tenant) { @Override public Integer createTenant(Tenant tenant) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("name_cn", tenant.getNameCn()); + queryWrapper.eq("name_en", tenant.getNameEn()); Tenant tenantResult = this.baseMapper.selectOne(queryWrapper); if (tenantResult != null) { throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg()); diff --git a/docker-deploy-data/mysql/init/create_all_tables_ddl_v1.0.0.mysql.sql b/docker-deploy-data/mysql/init/01_create_all_tables_ddl_v1.0.0.mysql.sql similarity index 100% rename from docker-deploy-data/mysql/init/create_all_tables_ddl_v1.0.0.mysql.sql rename to docker-deploy-data/mysql/init/01_create_all_tables_ddl_v1.0.0.mysql.sql diff --git a/docker-deploy-data/mysql/init/create_model_ddl_2025_0717.sql b/docker-deploy-data/mysql/init/02_create_model_ddl_2025_0717.sql similarity index 56% rename from docker-deploy-data/mysql/init/create_model_ddl_2025_0717.sql rename to docker-deploy-data/mysql/init/02_create_model_ddl_2025_0717.sql index dbbe651e..149ed8b3 100644 --- a/docker-deploy-data/mysql/init/create_model_ddl_2025_0717.sql +++ b/docker-deploy-data/mysql/init/02_create_model_ddl_2025_0717.sql @@ -1,20 +1,22 @@ -drop table if exists `t_model`; - -create table `t_model` -( - `id` int not null auto_increment comment '主键id', - `name` varchar(255) comment '名称', - `version` varchar(255) comment '版本', - `parameters` varchar(2000) not null comment '字段参数', - `method` longtext comment '方法', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_model` (`name`,`version`) using btree -) engine = innodb comment = '模型表'; +drop table if exists `t_model`; + +create table `t_model` +( + `id` int not null auto_increment comment '主键id', + `name_cn` varchar(255) not null comment '中文名称', + `name_en` varchar(255) not null comment '英文名称', + `version` varchar(255) comment '版本', + `model_url` varchar(255) comment '模型url', + `parameters` varchar(2000) not null comment '字段参数', + `method` longtext comment '方法', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_model` (`name_en`,`version`) using btree +) engine = innodb comment = '模型表'; diff --git a/app/src/main/resources/sql/h2/create_resources_ddl_2025_0902.sql b/docker-deploy-data/mysql/init/03_create_resources_ddl_2025_0902.sql similarity index 98% rename from app/src/main/resources/sql/h2/create_resources_ddl_2025_0902.sql rename to docker-deploy-data/mysql/init/03_create_resources_ddl_2025_0902.sql index 00e6e670..e6b44079 100644 --- a/app/src/main/resources/sql/h2/create_resources_ddl_2025_0902.sql +++ b/docker-deploy-data/mysql/init/03_create_resources_ddl_2025_0902.sql @@ -1,58 +1,58 @@ -drop table if exists `t_resource`; - -create table `t_resource` -( - `id` int not null auto_increment comment '主键id', - `app_id` int not null comment '关联appId', - `platform_id` int not null comment '关联设计器id', - `name` varchar(255) not null comment '名称', - `thumbnail_name` varchar(255) not null comment '缩略图名称', - `resource_url` varchar(255) comment '资源url', - `thumbnail_url` varchar(255) comment '缩略图url', - `category` varchar(255) not null comment '分类', - `description` varchar(2000) comment '描述', - `thumbnail_data` longtext comment '缩略图数据', - `resource_data` longtext comment '资源数据', - `public_status` int comment '公开状态：0，1，2', - `is_default` tinyint(1) comment '是否是默认', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_resource` (`category`,`name`, `tenant_id`) using btree -) engine = innodb comment = '资源表'; - -drop table if exists `t_resource_group`; - -create table `t_resource_group` -( - `id` int not null auto_increment comment '主键id', - `name` varchar(255) not null comment '中文名称', - `app_id` int not null comment '关联appId', - `platform_id` int not null comment '关联设计器id', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - `tenant_id` varchar(60) comment '租户id', - `renter_id` varchar(60) comment '业务租户id', - `site_id` varchar(60) comment '站点id，设计预留字段', - primary key (`id`) using btree, - unique index `u_idx_resource_group` (`name`,`app_id`, `tenant_id`) using btree -) engine = innodb comment = '资源分组表'; - -drop table if exists `r_resource_group_resource`; - -CREATE TABLE `r_resource_group_resource` -( - `id` int NOT NULL AUTO_INCREMENT COMMENT '主键id', - `resource_id` int NOT NULL COMMENT '资源id', - `resource_group_id` int NOT NULL COMMENT '资源分组id', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `u_idx_resource_group_resource` (`resource_id`,`resource_group_id`) USING BTREE +drop table if exists `t_resource`; + +create table `t_resource` +( + `id` int not null auto_increment comment '主键id', + `app_id` int not null comment '关联appId', + `platform_id` int not null comment '关联设计器id', + `name` varchar(255) not null comment '名称', + `thumbnail_name` varchar(255) not null comment '缩略图名称', + `resource_url` varchar(255) comment '资源url', + `thumbnail_url` varchar(255) comment '缩略图url', + `category` varchar(255) not null comment '分类', + `description` varchar(2000) comment '描述', + `thumbnail_data` longtext comment '缩略图数据', + `resource_data` longtext comment '资源数据', + `public_status` int comment '公开状态：0，1，2', + `is_default` tinyint(1) comment '是否是默认', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_resource` (`category`,`name`, `tenant_id`) using btree +) engine = innodb comment = '资源表'; + +drop table if exists `t_resource_group`; + +create table `t_resource_group` +( + `id` int not null auto_increment comment '主键id', + `name` varchar(255) not null comment '中文名称', + `app_id` int not null comment '关联appId', + `platform_id` int not null comment '关联设计器id', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + `tenant_id` varchar(60) comment '租户id', + `renter_id` varchar(60) comment '业务租户id', + `site_id` varchar(60) comment '站点id，设计预留字段', + primary key (`id`) using btree, + unique index `u_idx_resource_group` (`name`,`app_id`, `tenant_id`) using btree +) engine = innodb comment = '资源分组表'; + +drop table if exists `r_resource_group_resource`; + +CREATE TABLE `r_resource_group_resource` +( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键id', + `resource_id` int NOT NULL COMMENT '资源id', + `resource_group_id` int NOT NULL COMMENT '资源分组id', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `u_idx_resource_group_resource` (`resource_id`,`resource_group_id`) USING BTREE ) engine = innodb comment = '资源及资源分组关系表'; \ No newline at end of file diff --git a/docker-deploy-data/mysql/init/create_permission_table_ddl_2025_1029.sql b/docker-deploy-data/mysql/init/04_create_permission_table_ddl_2025_1029.sql similarity index 98% rename from docker-deploy-data/mysql/init/create_permission_table_ddl_2025_1029.sql rename to docker-deploy-data/mysql/init/04_create_permission_table_ddl_2025_1029.sql index 64101625..6242cd20 100644 --- a/docker-deploy-data/mysql/init/create_permission_table_ddl_2025_1029.sql +++ b/docker-deploy-data/mysql/init/04_create_permission_table_ddl_2025_1029.sql @@ -1,34 +1,34 @@ -drop table if exists `t_permission_role`; - -create table `t_permission_role` -( - `id` int not null auto_increment comment '主键id', - `name` varchar(255) not null comment '名称', - `description` varchar(2000) comment '描述', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - primary key (`id`) using btree, - unique index `u_idx_permission_role` (`name`) using btree -) engine = innodb comment = ''; - -drop table if exists `r_auth_users_units_roles`; - -create table `r_auth_users_units_roles` -( - `id` int not null auto_increment comment '主键id', - `user_id` int not null comment '用户', - `unit_id` int not null comment '业务单元', - `unit_type` varchar(60) not null comment '业务单元类型', - `tenant_id` int not null comment '组织id', - `role_id` int not null comment '角色id', - `expired_time` timestamp comment '过期时间', - `created_by` varchar(60) not null comment '创建人', - `created_time` timestamp not null default current_timestamp comment '创建时间', - `last_updated_by` varchar(60) not null comment '最后修改人', - `last_updated_time` timestamp not null default current_timestamp comment '更新时间', - primary key (`id`) using btree, - unique index `u_idx_auth_users_units_roles` (`user_id`, `unit_id`, `unit_type`) using btree -) engine = innodb comment = ''; - +drop table if exists `t_permission_role`; + +create table `t_permission_role` +( + `id` int not null auto_increment comment '主键id', + `name` varchar(255) not null comment '名称', + `description` varchar(2000) comment '描述', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + primary key (`id`) using btree, + unique index `u_idx_permission_role` (`name`) using btree +) engine = innodb comment = ''; + +drop table if exists `r_auth_users_units_roles`; + +create table `r_auth_users_units_roles` +( + `id` int not null auto_increment comment '主键id', + `user_id` int not null comment '用户', + `unit_id` int not null comment '业务单元', + `unit_type` varchar(60) not null comment '业务单元类型', + `tenant_id` int not null comment '组织id', + `role_id` int not null comment '角色id', + `expired_time` timestamp comment '过期时间', + `created_by` varchar(60) not null comment '创建人', + `created_time` timestamp not null default current_timestamp comment '创建时间', + `last_updated_by` varchar(60) not null comment '最后修改人', + `last_updated_time` timestamp not null default current_timestamp comment '更新时间', + primary key (`id`) using btree, + unique index `u_idx_auth_users_units_roles` (`user_id`, `unit_id`, `unit_type`) using btree +) engine = innodb comment = ''; + diff --git a/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql b/docker-deploy-data/mysql/init/05_update_all_tables_ddl.sql similarity index 98% rename from app/src/main/resources/sql/mysql/update_all_tables_ddl.sql rename to docker-deploy-data/mysql/init/05_update_all_tables_ddl.sql index e7963c1f..f39d08e7 100644 --- a/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql +++ b/docker-deploy-data/mysql/init/05_update_all_tables_ddl.sql @@ -1,31 +1,30 @@ -ALTER TABLE t_component DROP INDEX u_idx_component; -ALTER TABLE t_component ADD INDEX u_idx_component (tenant_id, name_en, version, library_id); - -ALTER TABLE t_datasource DROP INDEX u_idx_datasource; -ALTER TABLE t_datasource ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_platform_history MODIFY sub_count int NULL; -ALTER TABLE t_platform_history MODIFY publish_url varchar(255) NULL; - -ALTER TABLE t_app MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_app_extension MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_carriers_relation MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_group MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_block_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_business_category MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_component MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_component_library MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_datasource MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_i18n_entry MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_material MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_material_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_page_template MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; -ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; - - +ALTER TABLE t_component DROP INDEX u_idx_component; +ALTER TABLE t_component ADD INDEX u_idx_component (tenant_id, name_en, version, library_id); + +ALTER TABLE t_datasource DROP INDEX u_idx_datasource; +ALTER TABLE t_datasource ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_platform_history MODIFY sub_count int NULL; +ALTER TABLE t_platform_history MODIFY publish_url varchar(255) NULL; + +ALTER TABLE t_app MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_app_extension MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_carriers_relation MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_group MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_block_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_business_category MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_component MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_component_library MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_datasource MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_i18n_entry MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_material MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_material_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_page_template MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_platform MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL; +ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL; + diff --git a/docker-deploy-data/mysql/init/update_tables_ddl_v1.0.0_2025_0527.sql b/docker-deploy-data/mysql/init/06_update_tables_ddl_v1.0.0_2025_0527.sql similarity index 99% rename from docker-deploy-data/mysql/init/update_tables_ddl_v1.0.0_2025_0527.sql rename to docker-deploy-data/mysql/init/06_update_tables_ddl_v1.0.0_2025_0527.sql index 460a83aa..7ed6d0b4 100644 --- a/docker-deploy-data/mysql/init/update_tables_ddl_v1.0.0_2025_0527.sql +++ b/docker-deploy-data/mysql/init/06_update_tables_ddl_v1.0.0_2025_0527.sql @@ -1,2 +1,2 @@ -ALTER TABLE t_block_group DROP INDEX u_idx_block_group; +ALTER TABLE t_block_group DROP INDEX u_idx_block_group; ALTER TABLE t_block_group ADD INDEX u_idx_block_group (`tenant_id`, `platform_id`, `name`, `app_id`); \ No newline at end of file diff --git a/docker-deploy-data/mysql/init/update_table_ddl_2025_1014.sql b/docker-deploy-data/mysql/init/07_update_table_ddl_2025_1014.sql similarity index 97% rename from docker-deploy-data/mysql/init/update_table_ddl_2025_1014.sql rename to docker-deploy-data/mysql/init/07_update_table_ddl_2025_1014.sql index aec687b3..a66dba27 100644 --- a/docker-deploy-data/mysql/init/update_table_ddl_2025_1014.sql +++ b/docker-deploy-data/mysql/init/07_update_table_ddl_2025_1014.sql @@ -1,46 +1,46 @@ -ALTER TABLE t_app - ADD COLUMN is_template VARCHAR(100) AFTER is_default; -ALTER TABLE t_app - ADD COLUMN industry_id INT AFTER platform_id; -ALTER TABLE t_app - ADD COLUMN scene_id INT AFTER industry_id; - -ALTER TABLE t_app DROP INDEX u_idx_app; -ALTER TABLE t_app - ADD INDEX u_idx_app (`tenant_id`, `platform_id`, `name`, `is_template`); - -ALTER TABLE t_business_category - ADD COLUMN business_group VARCHAR(100) AFTER `name`; - -ALTER TABLE t_datasource DROP INDEX u_idx_datasource; -ALTER TABLE t_datasource - ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_app_extension - ADD COLUMN platform_id INT AFTER app_id; -ALTER TABLE t_app_extension DROP INDEX u_idx_app_extension; -ALTER TABLE t_app_extension - ADD INDEX u_idx_app_extension (`tenant_id`, `platform_id`, `name`, `app_id`); - -ALTER TABLE t_model - ADD COLUMN app_id INT AFTER id; -ALTER TABLE t_model - ADD COLUMN platform_id INT AFTER app_id; -ALTER TABLE t_model DROP INDEX u_idx_model; -ALTER TABLE t_model - ADD INDEX u_idx_model (`tenant_id`, `platform_id`, `app_id`, `name_cn`,`version`); - -ALTER TABLE t_user DROP COLUMN email, DROP COLUMN tenant_id, DROP COLUMN site_id,DROP COLUMN renter_id,DROP COLUMN created_by,DROP COLUMN last_updated_by; - - -ALTER TABLE t_user - ADD COLUMN password VARCHAR(200) AFTER username; -ALTER TABLE t_user - ADD COLUMN email VARCHAR(200) AFTER password; -ALTER TABLE t_user - ADD COLUMN salt VARCHAR(200) AFTER password; -ALTER TABLE t_user - ADD COLUMN public_key VARCHAR(200) AFTER salt; -ALTER TABLE t_user - ADD COLUMN private_key VARCHAR(200) AFTER public_key; - +ALTER TABLE t_app + ADD COLUMN is_template VARCHAR(100) AFTER is_default; +ALTER TABLE t_app + ADD COLUMN industry_id INT AFTER platform_id; +ALTER TABLE t_app + ADD COLUMN scene_id INT AFTER industry_id; + +ALTER TABLE t_app DROP INDEX u_idx_app; +ALTER TABLE t_app + ADD INDEX u_idx_app (`tenant_id`, `platform_id`, `name`, `is_template`); + +ALTER TABLE t_business_category + ADD COLUMN business_group VARCHAR(100) AFTER `name`; + +ALTER TABLE t_datasource DROP INDEX u_idx_datasource; +ALTER TABLE t_datasource + ADD INDEX u_idx_datasource (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_app_extension + ADD COLUMN platform_id INT AFTER app_id; +ALTER TABLE t_app_extension DROP INDEX u_idx_app_extension; +ALTER TABLE t_app_extension + ADD INDEX u_idx_app_extension (`tenant_id`, `platform_id`, `name`, `app_id`); + +ALTER TABLE t_model + ADD COLUMN app_id INT AFTER id; +ALTER TABLE t_model + ADD COLUMN platform_id INT AFTER app_id; +ALTER TABLE t_model DROP INDEX u_idx_model; +ALTER TABLE t_model + ADD INDEX u_idx_model (`tenant_id`, `platform_id`, `app_id`, `name_cn`,`version`); + +ALTER TABLE t_user DROP COLUMN email, DROP COLUMN tenant_id, DROP COLUMN site_id,DROP COLUMN renter_id,DROP COLUMN created_by,DROP COLUMN last_updated_by; + + +ALTER TABLE t_user + ADD COLUMN password VARCHAR(200) AFTER username; +ALTER TABLE t_user + ADD COLUMN email VARCHAR(200) AFTER password; +ALTER TABLE t_user + ADD COLUMN salt VARCHAR(200) AFTER password; +ALTER TABLE t_user + ADD COLUMN public_key VARCHAR(200) AFTER salt; +ALTER TABLE t_user + ADD COLUMN private_key VARCHAR(200) AFTER public_key; + diff --git a/docker-deploy-data/mysql/init/update_table_ddl_2025_1217.sql b/docker-deploy-data/mysql/init/08_update_table_ddl_2025_1217.sql similarity index 98% rename from docker-deploy-data/mysql/init/update_table_ddl_2025_1217.sql rename to docker-deploy-data/mysql/init/08_update_table_ddl_2025_1217.sql index 7329c08b..e7885329 100644 --- a/docker-deploy-data/mysql/init/update_table_ddl_2025_1217.sql +++ b/docker-deploy-data/mysql/init/08_update_table_ddl_2025_1217.sql @@ -1,2 +1,2 @@ -ALTER TABLE t_resource +ALTER TABLE t_resource ADD COLUMN hash VARCHAR(100) AFTER thumbnail_url; \ No newline at end of file diff --git a/docker-deploy-data/mysql/init/09_update_table_ddl_2025_1229.sql b/docker-deploy-data/mysql/init/09_update_table_ddl_2025_1229.sql new file mode 100644 index 00000000..1e8f009f --- /dev/null +++ b/docker-deploy-data/mysql/init/09_update_table_ddl_2025_1229.sql @@ -0,0 +1,5 @@ +ALTER TABLE t_tenant DROP INDEX u_idx_tenant; +ALTER TABLE t_tenant ADD UNIQUE INDEX u_idx_tenant (`name_en`); + +ALTER TABLE t_tenant MODIFY COLUMN name_en VARCHAR(255) NOT NULL COMMENT '组织英文名'; +ALTER TABLE t_tenant MODIFY COLUMN name_cn VARCHAR(255) NULL COMMENT '组织中文名'; \ No newline at end of file diff --git a/docker-deploy-data/mysql/init/init_data_for_test_v1.0.0.sql b/docker-deploy-data/mysql/init/init_data_for_test_v1.0.0.sql index ddaa047a..4ace1721 100644 --- a/docker-deploy-data/mysql/init/init_data_for_test_v1.0.0.sql +++ b/docker-deploy-data/mysql/init/init_data_for_test_v1.0.0.sql @@ -1,7 +1,7 @@ INSERT INTO `t_material_history` (`id`, `ref_id`, `version`, `content`, `name`, `npm_name`, `framework`, `assets_url`, `image_url`, `description`, `material_size`, `tgz_url`, `unzip_tgz_root_path_url`, `unzip_tgz_files`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, 1, '1.0.8', '{}', 'materialstwo', '@opentiny/lowcode-alpha-material-materialstwo-1505', 'Vue', '{\"material\":[\"\"],\"scripts\":[\"\",\"\"],\"styles\":[]}', NULL, '1.0.8', NULL, NULL, NULL, NULL, '1', '1', '2024-10-16 19:28:53', '2024-10-16 19:28:53', '1', '1'); -INSERT INTO `t_tenant` (`id`, `name_cn`, `name_en`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`) VALUES (1, 'public', '公共租户', 'Default tenant for new user to explore.', '1', '1', '2024-10-16 19:31:28', '2024-10-16 19:31:28'); +INSERT INTO `t_tenant` (`id`, `name_cn`, `name_en`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`) VALUES (1, '公共租户','public', 'Default tenant for new user to explore.', '1', '1', '2024-10-16 19:31:28', '2024-10-16 19:31:28'); INSERT INTO `t_app` (`id`, `name`, `app_website`, `platform_id`, `platform_history_id`, `publish_url`, `editor_url`, `visit_url`, `image_url`, `assets_url`, `state`, `published`, `home_page_id`, `css`, `config`, `constants`, `data_handler`, `description`, `latest`, `git_group`, `project_name`, `branch`, `is_demo`, `is_default`, `template_type`, `set_template_time`, `set_template_by`, `set_default_by`, `framework`, `global_state`, `default_lang`, `extend_config`, `data_hash`, `can_associate`, `data_source_global`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, 'portal-app', NULL, 1, '1', NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, '{}', NULL, '{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}', 'demo应用', '22', NULL, NULL, 'develop', NULL, NULL, 'serviceDevelop', '2023-11-19 18:14:37', '1', '1', 'Vue', '[{\"id\":\"test2\",\"state\":{\"name1\":\"xxx1\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}},{\"id\":\"test3\",\"state\":{\"name1\":\"xxx\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}},{\"id\":\"test4\",\"state\":{\"region\":\"\",\"scenario\":\"all\",\"productId\":\"\",\"planId\":\"\",\"addEvs\":false,\"addHss\":false,\"addCbr\":false,\"period\":{\"value\":1,\"unit\":\"month\"},\"amount\":1},\"getters\":{},\"actions\":{}},{\"id\":\"test1\",\"state\":{\"name1\":\"xxx\"},\"getters\":{\"count\":{\"type\":\"JSFunction\",\"value\":\"function count() {}\"}},\"actions\":{\"actions\":{\"type\":\"JSFunction\",\"value\":\"function actions() {}\"}}}]', NULL, '{\"business\":{\"serviceName\":\"\",\"endpointName\":\"cce\",\"endpointId\":\"ee\",\"serviceId\":\"ee\",\"router\":\"ee\"},\"env\":{\"alpha\":{\"regions\":[{\"name\":\"\",\"baseUrl\":\"\",\"isDefault\":false}],\"isDefault\":true}},\"type\":\"console\"}', '8b0eba6ad055532a586f9f669108fabb', '1', '{\"dataHandler\":{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}}', '1', '1', '2024-10-16 23:27:10', '2024-10-16 23:27:10', '1', '1');