diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index 9783ddbc..adcbf84e 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
BladeX
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
blade-auth
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index ff667c73..9577590c 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
BladeX
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index f2f8cdeb..3e5fff66 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
BladeX
org.springblade
- 2.3.1.RELEASE
+ 2.4.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 55afec85..2780fb15 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.3.1.RELEASE
+ 2.4.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 0c5f541c..ce4552ef 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.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml
index bd835fce..3199965e 100644
--- a/blade-ops-api/pom.xml
+++ b/blade-ops-api/pom.xml
@@ -5,13 +5,13 @@
BladeX
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
blade-ops-api
${project.artifactId}
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
pom
BladeX 微服务API集合
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index b743b46c..bf264607 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index f99e7c2d..2ef2c671 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-ops
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml
index 41c1a1bb..1bafe668 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.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/doc/nacos/blade-flow-dev.yaml b/blade-ops/blade-flow/doc/nacos/blade-flow-dev.yaml
similarity index 100%
rename from doc/nacos/blade-flow-dev.yaml
rename to blade-ops/blade-flow/doc/nacos/blade-flow-dev.yaml
diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml
index f97a6e56..848020e1 100644
--- a/blade-ops/blade-flow/pom.xml
+++ b/blade-ops/blade-flow/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops/blade-flow/src/main/resources/application-dev.yml b/blade-ops/blade-flow/src/main/resources/application-dev.yml
index f216bb2a..29ece1c4 100644
--- a/blade-ops/blade-flow/src/main/resources/application-dev.yml
+++ b/blade-ops/blade-flow/src/main/resources/application-dev.yml
@@ -1,7 +1,3 @@
-#服务器端口
-server:
- port: 8008
-
#数据源配置
spring:
datasource:
diff --git a/blade-ops/blade-flow/src/main/resources/application-prod.yml b/blade-ops/blade-flow/src/main/resources/application-prod.yml
index 6dd671b5..a967e8c7 100644
--- a/blade-ops/blade-flow/src/main/resources/application-prod.yml
+++ b/blade-ops/blade-flow/src/main/resources/application-prod.yml
@@ -1,7 +1,3 @@
-#服务器端口
-server:
- port: 8008
-
#数据源配置
spring:
datasource:
diff --git a/blade-ops/blade-flow/src/main/resources/application-test.yml b/blade-ops/blade-flow/src/main/resources/application-test.yml
index 1ba9049f..2a393d57 100644
--- a/blade-ops/blade-flow/src/main/resources/application-test.yml
+++ b/blade-ops/blade-flow/src/main/resources/application-test.yml
@@ -1,7 +1,3 @@
-#服务器端口
-server:
- port: 8008
-
#数据源配置
spring:
datasource:
diff --git a/blade-ops/blade-flow/src/main/resources/application.yml b/blade-ops/blade-flow/src/main/resources/application.yml
index bbdac577..8b5bff33 100644
--- a/blade-ops/blade-flow/src/main/resources/application.yml
+++ b/blade-ops/blade-flow/src/main/resources/application.yml
@@ -1,3 +1,8 @@
+#服务器端口
+server:
+ port: 8008
+
+#flowable配置
flowable:
activity-font-name: \u5B8B\u4F53
label-font-name: \u5B8B\u4F53
diff --git a/blade-ops/blade-flow/src/main/resources/registry.conf b/blade-ops/blade-flow/src/main/resources/registry.conf
deleted file mode 100644
index da0dda80..00000000
--- a/blade-ops/blade-flow/src/main/resources/registry.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-registry {
- # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
- type = "nacos"
-
- nacos {
- serverAddr = "localhost"
- namespace = ""
- cluster = "default"
- }
-}
-
-config {
- # file、nacos 、apollo、zk、consul、etcd3
- type = "nacos"
-
- nacos {
- serverAddr = "localhost"
- namespace = ""
- }
-}
diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml
index d0fbc37a..bf0e8f48 100644
--- a/blade-ops/blade-log/pom.xml
+++ b/blade-ops/blade-log/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml
index 387e233a..b3cf7a07 100644
--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml
index cb032e2d..e120f96a 100644
--- a/blade-ops/blade-turbine/pom.xml
+++ b/blade-ops/blade-turbine/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops/blade-xxljob/pom.xml b/blade-ops/blade-xxljob/pom.xml
index 99519e91..6a02c7e5 100644
--- a/blade-ops/blade-xxljob/pom.xml
+++ b/blade-ops/blade-xxljob/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
blade-xxljob
diff --git a/blade-ops/blade-xxljob/src/main/resources/application.properties b/blade-ops/blade-xxljob/src/main/resources/application.properties
deleted file mode 100644
index c332cbe1..00000000
--- a/blade-ops/blade-xxljob/src/main/resources/application.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# web port
-server.port=7008
-
-# log config
-logging.config=classpath:logback.xml
-
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://127.0.0.1:7009/xxl-job-admin
-
-### xxl-job executor address
-xxl.job.executor.appname=blade-xxljob
-xxl.job.executor.ip=127.0.0.1
-xxl.job.executor.port=7018
-
-### xxl-job, access token
-xxl.job.accessToken=
-
-### xxl-job log path
-xxl.job.executor.logpath=../data/applogs/xxl-job/jobhandler
-### xxl-job log retention days
-xxl.job.executor.logretentiondays=-1
diff --git a/blade-ops/blade-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml
index 23f99f62..d70677fc 100644
--- a/blade-ops/blade-zipkin/pom.xml
+++ b/blade-ops/blade-zipkin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index f835a844..c5897820 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,13 +5,13 @@
BladeX
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
blade-ops
${project.artifactId}
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
pom
diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml
index 4e86b33d..99f251cb 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.3.1.RELEASE
+ 2.4.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 85281f9b..51a26771 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.3.1.RELEASE
+ 2.4.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 7c103c50..07d71de1 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.3.1.RELEASE
+ 2.4.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 30d47674..95993954 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.3.1.RELEASE
+ 2.4.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 e6adcf4d..6f387fc7 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.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 2961f22c..5f80d34b 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
BladeX
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
blade-service-api
${project.artifactId}
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
pom
BladeX 微服务API集合
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index ec47ee33..d7651b08 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-service
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index b8ac1f04..594c9c49 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index 3672e1a0..af7ce130 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index cf2c4afa..d484b069 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -6,14 +6,14 @@
org.springblade
BladeX
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
4.0.0
blade-service
${project.artifactId}
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
pom
BladeX 微服务集合
diff --git a/pom.xml b/pom.xml
index ecbe21b0..eabe4b3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
org.springblade
BladeX
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
pom
- 2.3.1.RELEASE
+ 2.4.0.RELEASE
1.8
3.8.1
@@ -43,14 +43,14 @@
org.springblade.platform
blade-bom
- ${project.version}
+ ${bladex.project.version}
pom
import
org.springblade
blade-common
- ${project.version}
+ ${bladex.project.version}
org.springframework.boot
diff --git a/script/docker/app/.env b/script/docker/app/.env
index 44890564..c8448c72 100644
--- a/script/docker/app/.env
+++ b/script/docker/app/.env
@@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
-TAG=2.3.1.RELEASE
+TAG=2.4.0.RELEASE