🎉 2.5.1.RELEASE

5 years ago · c01f79fcdb
24 changed files with 83 additions and 34 deletions
--- a/blade-biz-common/pom.xml
+++ b/blade-biz-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX-Biz</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example-api/blade-dubbo-provider-api/pom.xml
+++ b/blade-example-api/blade-dubbo-provider-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example-api/blade-stream-api/pom.xml
+++ b/blade-example-api/blade-stream-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example-api/pom.xml
+++ b/blade-example-api/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX-Biz</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-example-api</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.5.1.SNAPSHOT</version>
+    <version>2.5.1.RELEASE</version>
    <packaging>pom</packaging>
    <description>BladeX 微服务范例API集合</description>

--- a/blade-example/blade-dubbo-consumer/pom.xml
+++ b/blade-example/blade-dubbo-consumer/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-dubbo-provider/pom.xml
+++ b/blade-example/blade-dubbo-provider/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-easypoi/pom.xml
+++ b/blade-example/blade-easypoi/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-mq-kafka/pom.xml
+++ b/blade-example/blade-mq-kafka/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-mq-rabbit/pom.xml
+++ b/blade-example/blade-mq-rabbit/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-seata-order/pom.xml
+++ b/blade-example/blade-seata-order/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-seata-storage/pom.xml
+++ b/blade-example/blade-seata-storage/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-stream-consumer/pom.xml
+++ b/blade-example/blade-stream-consumer/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-stream-provider/pom.xml
+++ b/blade-example/blade-stream-provider/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/blade-websocket/pom.xml
+++ b/blade-example/blade-websocket/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-example</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-example/pom.xml
+++ b/blade-example/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX-Biz</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-example</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.5.1.SNAPSHOT</version>
+    <version>2.5.1.RELEASE</version>
    <packaging>pom</packaging>
    <description>BladeX 微服务范例集合</description>

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

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

--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@ -5,14 +5,14 @@
    <parent>
        <artifactId>BladeX-Biz</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

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

--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-service</artifactId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/blade-demo/src/main/resources/application.yml
+++ b/blade-service/blade-demo/src/main/resources/application.yml
@ -12,7 +12,7 @@ swagger:

 #oss配置
 oss:
-  enable: true
+  enabled: true
  name: minio
  tenant-mode: false
  endpoint: http://127.0.0.1:9000
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@ -7,12 +7,12 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>BladeX-Biz</artifactId>
-        <version>2.5.1.SNAPSHOT</version>
+        <version>2.5.1.RELEASE</version>
    </parent>

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

@ -29,6 +29,10 @@
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-tenant</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-api-crypto</artifactId>
+        </dependency>
    </dependencies>

 </project>
--- a/doc/nacos/blade.yaml
+++ b/doc/nacos/blade.yaml
@ -12,6 +12,9 @@ server:

 #spring配置
 spring:
+  cloud:
+    sentinel:
+      eager: true
  devtools:
    restart:
      log-condition-evaluation-delta: false
@ -22,8 +25,6 @@ spring:
 feign:
  hystrix:
    enabled: true
-  #sentinel:
-    #enabled: true
  okhttp:
    enabled: true
  httpclient:
@ -68,14 +69,51 @@ management:

 #blade配置
 blade:
+  #token配置
+  token:
+    #是否有状态
+    state: false
+  #接口配置
+  api:
+    #报文加密配置
+    crypto:
+      #启用报文加密配置
+      enabled: false
+      #使用AesUtil.genAesKey()生成
+      aes-key: O2BEeIv399qHQNhD6aGW8R8DEj4bqHXm
+      #使用DesUtil.genDesKey()生成
+      des-key: jMVCBsFGDQr1USHo
+  #jackson配置
+  jackson:
+    #null自动转空值
+    null-to-empty: true
+    #大数字自动转字符串
+    big-num-to-string: true
+    #支持text文本请求,与报文加密同时开启
+    support-text-plain: false
+  #xss配置
  xss:
    enabled: true
    skip-url:
      - /weixin
      - /notice/submit
+  #安全框架配置
  secure:
+    #接口放行
    skip-url:
      - /test/**
+    #授权认证配置
+    auth:
+      - method: ALL
+        pattern: /weixin/**
+        expression: "hasAuth()"
+      - method: POST
+        pattern: /dashboard/upload
+        expression: "hasTimeAuth(9, 17)"
+      - method: POST
+        pattern: /dashboard/submit
+        expression: "hasAnyRole('administrator', 'admin', 'user')"
+    #多终端认证配置
    client:
      - client-id: sword
        path-patterns:
@ -83,7 +121,14 @@ blade:
      - client-id: saber
        path-patterns:
          - /saber/**
+  #多租户配置
  tenant:
+    #多租户增强
+    enhance: true
+    #多租户授权保护
+    license: false
+    #多租户字段名
    column: tenant_id
-    tables:
-      - blade_notice
+    #排除多租户逻辑
+    exclude-tables:
+      - blade_user
--- a/pom.xml
+++ b/pom.xml
@ -5,11 +5,11 @@

    <groupId>org.springblade</groupId>
    <artifactId>BladeX-Biz</artifactId>
-    <version>2.5.1.SNAPSHOT</version>
+    <version>2.5.1.RELEASE</version>
    <packaging>pom</packaging>

    <properties>
-        <bladex.project.version>2.5.1.SNAPSHOT</bladex.project.version>
+        <bladex.project.version>2.5.1.RELEASE</bladex.project.version>

        <java.version>1.8</java.version>
        <maven.plugin.version>3.8.1</maven.plugin.version>
@ -19,8 +19,8 @@
        <flowable.version>6.4.2</flowable.version>
        <dubbo.version>2.7.5</dubbo.version>

-        <spring.boot.version>2.1.13.RELEASE</spring.boot.version>
-        <spring.cloud.version>Greenwich.SR5</spring.cloud.version>
+        <spring.boot.version>2.1.14.RELEASE</spring.boot.version>
+        <spring.cloud.version>Greenwich.SR6</spring.cloud.version>
        <spring.platform.version>Cairo-SR8</spring.platform.version>

        <!-- 推荐使用Harbor -->
--- a/script/docker/app/.env
+++ b/script/docker/app/.env
@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.5.1.SNAPSHOT
+TAG=2.5.1.RELEASE