From 77b2b90e0184cbf1156f13c9c7bf0e2bdbb9cd99 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 11 Apr 2020 22:37:41 +0800 Subject: [PATCH] :tada: 2.5.0.RELEASE --- blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- blade-ops-api/blade-flow-api/pom.xml | 2 +- blade-ops-api/blade-resource-api/pom.xml | 2 +- blade-ops-api/pom.xml | 4 ++-- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- blade-ops/blade-flow-design/pom.xml | 2 +- blade-ops/blade-flow/pom.xml | 2 +- blade-ops/blade-log/pom.xml | 2 +- blade-ops/blade-resource/pom.xml | 2 +- blade-ops/blade-turbine/pom.xml | 2 +- blade-ops/blade-xxljob-admin/pom.xml | 2 +- blade-ops/blade-xxljob/pom.xml | 2 +- blade-ops/blade-zipkin/pom.xml | 2 +- blade-ops/pom.xml | 4 ++-- blade-service-api/blade-desk-api/pom.xml | 2 +- blade-service-api/blade-dict-api/pom.xml | 2 +- blade-service-api/blade-scope-api/pom.xml | 2 +- blade-service-api/blade-system-api/pom.xml | 2 +- blade-service-api/blade-user-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 ++-- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-system/pom.xml | 2 +- blade-service/blade-user/pom.xml | 2 +- blade-service/pom.xml | 4 ++-- ...te-2.4.0~2.4.1.sql => mysql-update-2.4.0~2.5.0.sql} | 10 +++++----- ...e-2.4.0~2.4.1.sql => oracle-update-2.4.0~2.5.0.sql} | 10 +++++----- ...4.0~2.4.1.sql => postgresql-update-2.4.0~2.5.0.sql} | 10 +++++----- pom.xml | 4 ++-- script/docker/app/.env | 2 +- 32 files changed, 49 insertions(+), 49 deletions(-) rename doc/sql/update/{mysql-update-2.4.0~2.4.1.sql => mysql-update-2.4.0~2.5.0.sql} (95%) rename doc/sql/update/{oracle-update-2.4.0~2.4.1.sql => oracle-update-2.4.0~2.5.0.sql} (95%) rename doc/sql/update/{postgresql-update-2.4.0~2.4.1.sql => postgresql-update-2.4.0~2.5.0.sql} (95%) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index e177d068..ca2e1b69 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index af520f73..a7e6e17b 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 8e7fa799..e97b9df4 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-flow-api/pom.xml b/blade-ops-api/blade-flow-api/pom.xml index 3ef3a0ff..16c83976 100644 --- a/blade-ops-api/blade-flow-api/pom.xml +++ b/blade-ops-api/blade-flow-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-resource-api/pom.xml b/blade-ops-api/blade-resource-api/pom.xml index c6b7f9d3..d5fba5e0 100644 --- a/blade-ops-api/blade-resource-api/pom.xml +++ b/blade-ops-api/blade-resource-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index 304836cf..e9596e5a 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 blade-ops-api ${project.artifactId} - 2.4.1.SNAPSHOT + 2.5.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 1b9dbf55..08329f2a 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 27b035eb..c3fc55ed 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index fca4f79a..803aef25 100644 --- a/blade-ops/blade-flow-design/pom.xml +++ b/blade-ops/blade-flow-design/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index 187df5e9..309db305 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index 01e3c8b0..38093ff9 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 7fc4c57a..da48bab4 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml index 5080bb76..52e6963e 100644 --- a/blade-ops/blade-turbine/pom.xml +++ b/blade-ops/blade-turbine/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index 82bdaf77..1323ad29 100644 --- a/blade-ops/blade-xxljob-admin/pom.xml +++ b/blade-ops/blade-xxljob-admin/pom.xml @@ -3,7 +3,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob/pom.xml b/blade-ops/blade-xxljob/pom.xml index 2f888689..4b8a83e4 100644 --- a/blade-ops/blade-xxljob/pom.xml +++ b/blade-ops/blade-xxljob/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 blade-xxljob diff --git a/blade-ops/blade-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml index ea056ad4..a0ffed4b 100644 --- a/blade-ops/blade-zipkin/pom.xml +++ b/blade-ops/blade-zipkin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 5eafd89b..21f1011b 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 blade-ops ${project.artifactId} - 2.4.1.SNAPSHOT + 2.5.0.RELEASE pom diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 766e9dc4..0fea414b 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 74cf6272..fb56774c 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml index 64719770..5fe7d03b 100644 --- a/blade-service-api/blade-scope-api/pom.xml +++ b/blade-service-api/blade-scope-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 52e4d1b3..3c1ff989 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 6d1b49be..e6cea269 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 99a62686..ee4911bd 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.4.1.SNAPSHOT + 2.5.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index e1f6a7de..ca90c8ce 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 42d3e808..5f36e53b 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index d3772fde..eba06aa3 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 97318426..02b6b4de 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ org.springblade BladeX - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 4.0.0 blade-service ${project.artifactId} - 2.4.1.SNAPSHOT + 2.5.0.RELEASE pom BladeX 微服务集合 diff --git a/doc/sql/update/mysql-update-2.4.0~2.4.1.sql b/doc/sql/update/mysql-update-2.4.0~2.5.0.sql similarity index 95% rename from doc/sql/update/mysql-update-2.4.0~2.4.1.sql rename to doc/sql/update/mysql-update-2.4.0~2.5.0.sql index a81dd390..2e85c08a 100644 --- a/doc/sql/update/mysql-update-2.4.0~2.4.1.sql +++ b/doc/sql/update/mysql-update-2.4.0~2.5.0.sql @@ -91,12 +91,12 @@ VALUES ('1161272893875225006', '1164733389668962256', '1123598816738675201'); -- 增加岗位类型字典数据 -- ---------------------------- INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`) -VALUES (1123598814738777220, 0, 'post', '-1', '岗位类型', 12, NULL, 0, 0); +VALUES (1123598814738777220, 0, 'post_category', '-1', '岗位类型', 12, NULL, 0, 0); INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`) -VALUES (1123598814738777221, 1123598814738777220, 'post', '1', '高层', 1, NULL, 0, 0); +VALUES (1123598814738777221, 1123598814738777220, 'post_category', '1', '高层', 1, NULL, 0, 0); INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`) -VALUES (1123598814738777222, 1123598814738777220, 'post', '2', '中层', 2, NULL, 0, 0); +VALUES (1123598814738777222, 1123598814738777220, 'post_category', '2', '中层', 2, NULL, 0, 0); INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`) -VALUES (1123598814738777223, 1123598814738777220, 'post', '3', '基层', 3, NULL, 0, 0); +VALUES (1123598814738777223, 1123598814738777220, 'post_category', '3', '基层', 3, NULL, 0, 0); INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`) -VALUES (1123598814738777224, 1123598814738777220, 'post', '4', '其他', 4, NULL, 0, 0); +VALUES (1123598814738777224, 1123598814738777220, 'post_category', '4', '其他', 4, NULL, 0, 0); diff --git a/doc/sql/update/oracle-update-2.4.0~2.4.1.sql b/doc/sql/update/oracle-update-2.4.0~2.5.0.sql similarity index 95% rename from doc/sql/update/oracle-update-2.4.0~2.4.1.sql rename to doc/sql/update/oracle-update-2.4.0~2.5.0.sql index 02a6d737..4d62333f 100644 --- a/doc/sql/update/oracle-update-2.4.0~2.4.1.sql +++ b/doc/sql/update/oracle-update-2.4.0~2.5.0.sql @@ -109,12 +109,12 @@ VALUES ('1161272893875225006', '1164733389668962256', '1123598816738675201'); -- 增加岗位类型字典数据 -- ---------------------------- INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, IS_DELETED) -VALUES (1123598814738777220, 0, 'post', '-1', '岗位类型', 12, NULL, 0, 0); +VALUES (1123598814738777220, 0, 'post_category', '-1', '岗位类型', 12, NULL, 0, 0); INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, IS_DELETED) -VALUES (1123598814738777221, 1123598814738777220, 'post', '1', '高层', 1, NULL, 0, 0); +VALUES (1123598814738777221, 1123598814738777220, 'post_category', '1', '高层', 1, NULL, 0, 0); INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, IS_DELETED) -VALUES (1123598814738777222, 1123598814738777220, 'post', '2', '中层', 2, NULL, 0, 0); +VALUES (1123598814738777222, 1123598814738777220, 'post_category', '2', '中层', 2, NULL, 0, 0); INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, IS_DELETED) -VALUES (1123598814738777223, 1123598814738777220, 'post', '3', '基层', 3, NULL, 0, 0); +VALUES (1123598814738777223, 1123598814738777220, 'post_category', '3', '基层', 3, NULL, 0, 0); INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, IS_DELETED) -VALUES (1123598814738777224, 1123598814738777220, 'post', '4', '其他', 4, NULL, 0, 0); +VALUES (1123598814738777224, 1123598814738777220, 'post_category', '4', '其他', 4, NULL, 0, 0); diff --git a/doc/sql/update/postgresql-update-2.4.0~2.4.1.sql b/doc/sql/update/postgresql-update-2.4.0~2.5.0.sql similarity index 95% rename from doc/sql/update/postgresql-update-2.4.0~2.4.1.sql rename to doc/sql/update/postgresql-update-2.4.0~2.5.0.sql index 6bb3751d..26543b75 100644 --- a/doc/sql/update/postgresql-update-2.4.0~2.4.1.sql +++ b/doc/sql/update/postgresql-update-2.4.0~2.5.0.sql @@ -108,12 +108,12 @@ VALUES ('1161272893875225006', '1164733389668962256', '1123598816738675201'); -- 增加岗位类型字典数据 -- ---------------------------- INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_sealed", "is_deleted") -VALUES (1123598814738777220, 0, 'post', '-1', '岗位类型', 12, NULL, 0, 0); +VALUES (1123598814738777220, 0, 'post_category', '-1', '岗位类型', 12, NULL, 0, 0); INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_sealed", "is_deleted") -VALUES (1123598814738777221, 1123598814738777220, 'post', '1', '高层', 1, NULL, 0, 0); +VALUES (1123598814738777221, 1123598814738777220, 'post_category', '1', '高层', 1, NULL, 0, 0); INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_sealed", "is_deleted") -VALUES (1123598814738777222, 1123598814738777220, 'post', '2', '中层', 2, NULL, 0, 0); +VALUES (1123598814738777222, 1123598814738777220, 'post_category', '2', '中层', 2, NULL, 0, 0); INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_sealed", "is_deleted") -VALUES (1123598814738777223, 1123598814738777220, 'post', '3', '基层', 3, NULL, 0, 0); +VALUES (1123598814738777223, 1123598814738777220, 'post_category', '3', '基层', 3, NULL, 0, 0); INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_sealed", "is_deleted") -VALUES (1123598814738777224, 1123598814738777220, 'post', '4', '其他', 4, NULL, 0, 0); +VALUES (1123598814738777224, 1123598814738777220, 'post_category', '4', '其他', 4, NULL, 0, 0); diff --git a/pom.xml b/pom.xml index 70fc797f..d95bd265 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX - 2.4.1.SNAPSHOT + 2.5.0.RELEASE pom - 2.4.1.SNAPSHOT + 2.5.0.RELEASE 1.8 3.8.1 diff --git a/script/docker/app/.env b/script/docker/app/.env index efe04196..85471bbd 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.4.1.SNAPSHOT +TAG=2.5.0.RELEASE