From 8c9e4db53eee12621ee66bf09f04d85bc08d1086 Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 6 Jan 2020 13:35:46 +0800 Subject: [PATCH] :tada: 2.3.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/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 ++-- doc/nacos/blade-dev.yaml | 4 ++++ doc/nacos/blade-prod.yaml | 6 +++++- doc/nacos/blade-test.yaml | 6 +++++- pom.xml | 14 +++++++------- script/docker/app/.env | 2 +- 31 files changed, 52 insertions(+), 40 deletions(-) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 09b02d50..7a471cb6 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 49fbcc76..7cc8568c 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 7bdb7329..19248559 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.2.2.RELEASE + 2.3.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 76b67729..55fd6085 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.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index b3ffb927..713ef12f 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 blade-ops-api ${project.artifactId} - 2.2.2.RELEASE + 2.3.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 0235606e..ac36fef8 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 4c1e7e7d..cda15403 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index 1ba4dd32..9e98a3a7 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.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index d2ab7b91..ab4fa082 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index e9f09d03..257c6380 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 02a0752a..c6122230 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml index 2c70793d..fd02db8e 100644 --- a/blade-ops/blade-turbine/pom.xml +++ b/blade-ops/blade-turbine/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index 35b0d93a..5102d72c 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.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob/pom.xml b/blade-ops/blade-xxljob/pom.xml index 63d4dfea..61cbfd6e 100644 --- a/blade-ops/blade-xxljob/pom.xml +++ b/blade-ops/blade-xxljob/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 blade-xxljob diff --git a/blade-ops/blade-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml index 417e82cf..f6bdd743 100644 --- a/blade-ops/blade-zipkin/pom.xml +++ b/blade-ops/blade-zipkin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 1ed06aa2..71e4efd3 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 blade-ops ${project.artifactId} - 2.2.2.RELEASE + 2.3.0.RELEASE pom diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 9d2d451b..5b49f72b 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.2.2.RELEASE + 2.3.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 bb439c61..69f96a8f 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.2.2.RELEASE + 2.3.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 55f11893..0e4a6db3 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.2.2.RELEASE + 2.3.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 c9a4d4b0..b6939473 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.2.2.RELEASE + 2.3.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 15264b10..46f8c1a0 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.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 94252b1b..55e0ee1c 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.2.2.RELEASE + 2.3.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 5445b017..eda0312f 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index e40f4dc4..ae4d6cf8 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 7973d37d..395a72b4 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 2af044f3..472ac0e6 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ org.springblade BladeX - 2.2.2.RELEASE + 2.3.0.RELEASE 4.0.0 blade-service ${project.artifactId} - 2.2.2.RELEASE + 2.3.0.RELEASE pom BladeX 微服务集合 diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml index 00842b53..55f0a1ee 100644 --- a/doc/nacos/blade-dev.yaml +++ b/doc/nacos/blade-dev.yaml @@ -24,6 +24,10 @@ spring: #项目模块集中配置 blade: + #分布式锁配置 + lock: + enabled: false + address: redis://127.0.0.1:6379 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: dev: diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml index 74b8bded..bd73f818 100644 --- a/doc/nacos/blade-prod.yaml +++ b/doc/nacos/blade-prod.yaml @@ -20,9 +20,13 @@ spring: validation-query: select 1 # Oracle校验 #validation-query: select 1 from dual - + #项目模块集中配置 blade: + #分布式锁配置 + lock: + enabled: false + address: redis://192.168.0.157:3379 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: prod: diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index c3e6a090..9d710062 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -20,9 +20,13 @@ spring: validation-query: select 1 # Oracle校验 #validation-query: select 1 from dual - + #项目模块集中配置 blade: + #分布式锁配置 + lock: + enabled: false + address: redis://192.168.0.157:3379 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: test: diff --git a/pom.xml b/pom.xml index f8238942..40ec5d78 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX - 2.2.2.RELEASE + 2.3.0.RELEASE pom - 2.2.2.RELEASE + 2.3.0.RELEASE 1.8 3.8.1 @@ -138,11 +138,6 @@ - - blade-release - Release Repository - http://nexus.bladex.vip/repository/maven-releases/ - aliyun-repos http://maven.aliyun.com/nexus/content/groups/public/ @@ -150,6 +145,11 @@ false + + blade-release + Release Repository + http://nexus.bladex.vip/repository/maven-releases/ + diff --git a/script/docker/app/.env b/script/docker/app/.env index 07355058..79c706a1 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.2.2.RELEASE +TAG=2.3.0.RELEASE