🎉 2.4.0.RELEASE

5 years ago · 7e8fe1e3cf
35 changed files with 40 additions and 88 deletions
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@ -8,7 +8,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>

    <artifactId>blade-auth</artifactId>
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops-api/blade-flow-api/pom.xml
+++ b/blade-ops-api/blade-flow-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops-api/blade-resource-api/pom.xml
+++ b/blade-ops-api/blade-resource-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops-api/pom.xml
+++ b/blade-ops-api/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-ops-api</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.3.1.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
    <packaging>pom</packaging>
    <description>BladeX 微服务API集合</description>

--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-ops</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-ops/blade-flow-design/pom.xml
+++ b/blade-ops/blade-flow-design/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-flow/doc/nacos/blade-flow-dev.yaml
+++ b/blade-ops/blade-flow/doc/nacos/blade-flow-dev.yaml
--- a/blade-ops/blade-flow/pom.xml
+++ b/blade-ops/blade-flow/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- 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:
--- 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:
--- 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:
--- 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
--- a/blade-ops/blade-flow/src/main/resources/registry.conf
+++ b/blade-ops/blade-flow/src/main/resources/registry.conf
@ -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 = ""
-  }
-}
--- a/blade-ops/blade-log/pom.xml
+++ b/blade-ops/blade-log/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-turbine/pom.xml
+++ b/blade-ops/blade-turbine/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-xxljob/pom.xml
+++ b/blade-ops/blade-xxljob/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>blade-xxljob</artifactId>
--- a/blade-ops/blade-xxljob/src/main/resources/application.properties
+++ b/blade-ops/blade-xxljob/src/main/resources/application.properties
@ -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
--- a/blade-ops/blade-zipkin/pom.xml
+++ b/blade-ops/blade-zipkin/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-ops</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.3.1.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
    <packaging>pom</packaging>

    <modules>
--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-scope-api/pom.xml
+++ b/blade-service-api/blade-scope-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-service-api</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.3.1.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
    <packaging>pom</packaging>
    <description>BladeX 微服务API集合</description>

--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-service</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@ -6,14 +6,14 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>BladeX</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-service</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.3.1.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
    <packaging>pom</packaging>
    <description>BladeX 微服务集合</description>

--- a/pom.xml
+++ b/pom.xml
@ -5,11 +5,11 @@

    <groupId>org.springblade</groupId>
    <artifactId>BladeX</artifactId>
-    <version>2.3.1.RELEASE</version>
+    <version>2.4.0.RELEASE</version>
    <packaging>pom</packaging>

    <properties>
-        <bladex.project.version>2.3.1.RELEASE</bladex.project.version>
+        <bladex.project.version>2.4.0.RELEASE</bladex.project.version>

        <java.version>1.8</java.version>
        <maven.plugin.version>3.8.1</maven.plugin.version>
@ -43,14 +43,14 @@
            <dependency>
                <groupId>org.springblade.platform</groupId>
                <artifactId>blade-bom</artifactId>
-                <version>${project.version}</version>
+                <version>${bladex.project.version}</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
            <dependency>
                <groupId>org.springblade</groupId>
                <artifactId>blade-common</artifactId>
-                <version>${project.version}</version>
+                <version>${bladex.project.version}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.boot</groupId>
--- 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