java_project
/
logisticsplatform
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

🎉 2.4.0.RELEASE

test
smallchill 5 years ago
parent
93f533d668
commit
7e8fe1e3cf
35 changed files with 40 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-auth/pom.xml
  2. 2
      blade-common/pom.xml
  3. 2
      blade-gateway/pom.xml
  4. 2
      blade-ops-api/blade-flow-api/pom.xml
  5. 2
      blade-ops-api/blade-resource-api/pom.xml
  6. 4
      blade-ops-api/pom.xml
  7. 2
      blade-ops/blade-admin/pom.xml
  8. 2
      blade-ops/blade-develop/pom.xml
  9. 2
      blade-ops/blade-flow-design/pom.xml
  10. 0
      blade-ops/blade-flow/doc/nacos/blade-flow-dev.yaml
  11. 2
      blade-ops/blade-flow/pom.xml
  12. 4
      blade-ops/blade-flow/src/main/resources/application-dev.yml
  13. 4
      blade-ops/blade-flow/src/main/resources/application-prod.yml
  14. 4
      blade-ops/blade-flow/src/main/resources/application-test.yml
  15. 5
      blade-ops/blade-flow/src/main/resources/application.yml
  16. 20
      blade-ops/blade-flow/src/main/resources/registry.conf
  17. 2
      blade-ops/blade-log/pom.xml
  18. 2
      blade-ops/blade-resource/pom.xml
  19. 2
      blade-ops/blade-turbine/pom.xml
  20. 2
      blade-ops/blade-xxljob/pom.xml
  21. 21
      blade-ops/blade-xxljob/src/main/resources/application.properties
  22. 2
      blade-ops/blade-zipkin/pom.xml
  23. 4
      blade-ops/pom.xml
  24. 2
      blade-service-api/blade-desk-api/pom.xml
  25. 2
      blade-service-api/blade-dict-api/pom.xml
  26. 2
      blade-service-api/blade-scope-api/pom.xml
  27. 2
      blade-service-api/blade-system-api/pom.xml
  28. 2
      blade-service-api/blade-user-api/pom.xml
  29. 4
      blade-service-api/pom.xml
  30. 2
      blade-service/blade-desk/pom.xml
  31. 2
      blade-service/blade-system/pom.xml
  32. 2
      blade-service/blade-user/pom.xml
  33. 4
      blade-service/pom.xml
  34. 8
      pom.xml
  35. 2
      script/docker/app/.env

2
blade-auth/pom.xml
Unescape View File

@ -8,7 +8,7 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<artifactId>blade-auth</artifactId> <artifactId>blade-auth</artifactId>

2
blade-common/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-gateway/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops-api/blade-flow-api/pom.xml
Unescape View File

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

2
blade-ops-api/blade-resource-api/pom.xml
Unescape View File

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

4
blade-ops-api/pom.xml
Unescape View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops-api</artifactId> <artifactId>blade-ops-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务API集合</description> <description>BladeX 微服务API集合</description>

2
blade-ops/blade-admin/pom.xml
Unescape View File

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

2
blade-ops/blade-develop/pom.xml
Unescape View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-flow-design/pom.xml
Unescape View File

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

0
doc/nacos/blade-flow-dev.yaml → blade-ops/blade-flow/doc/nacos/blade-flow-dev.yaml
Unescape View File

2
blade-ops/blade-flow/pom.xml
Unescape View File

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

4
blade-ops/blade-flow/src/main/resources/application-dev.yml
Unescape View File

@ -1,7 +1,3 @@
#服务器端口
server:
port: 8008
#数据源配置 #数据源配置
spring: spring:
datasource: datasource:

4
blade-ops/blade-flow/src/main/resources/application-prod.yml
Unescape View File

@ -1,7 +1,3 @@
#服务器端口
server:
port: 8008
#数据源配置 #数据源配置
spring: spring:
datasource: datasource:

4
blade-ops/blade-flow/src/main/resources/application-test.yml
Unescape View File

@ -1,7 +1,3 @@
#服务器端口
server:
port: 8008
#数据源配置 #数据源配置
spring: spring:
datasource: datasource:

5
blade-ops/blade-flow/src/main/resources/application.yml
Unescape View File

@ -1,3 +1,8 @@
#服务器端口
server:
port: 8008
#flowable配置
flowable: flowable:
activity-font-name: \u5B8B\u4F53 activity-font-name: \u5B8B\u4F53
label-font-name: \u5B8B\u4F53 label-font-name: \u5B8B\u4F53

20
blade-ops/blade-flow/src/main/resources/registry.conf
Unescape View File

@ -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 = ""
}
}

2
blade-ops/blade-log/pom.xml
Unescape View File

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

2
blade-ops/blade-resource/pom.xml
Unescape View File

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

2
blade-ops/blade-turbine/pom.xml
Unescape View File

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

2
blade-ops/blade-xxljob/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-xxljob</artifactId> <artifactId>blade-xxljob</artifactId>

21
blade-ops/blade-xxljob/src/main/resources/application.properties
Unescape View File

@ -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

2
blade-ops/blade-zipkin/pom.xml
Unescape View File

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

4
blade-ops/pom.xml
Unescape View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

2
blade-service-api/blade-desk-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-dict-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-scope-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-system-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-user-api/pom.xml
Unescape View File

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

4
blade-service-api/pom.xml
Unescape View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务API集合</description> <description>BladeX 微服务API集合</description>

2
blade-service/blade-desk/pom.xml
Unescape View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service/blade-system/pom.xml
Unescape View File

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

2
blade-service/blade-user/pom.xml
Unescape View File

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

4
blade-service/pom.xml
Unescape View File

@ -6,14 +6,14 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.3.1.RELEASE</version> <version>2.4.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务集合</description> <description>BladeX 微服务集合</description>

8
pom.xml
Unescape View File

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

2
script/docker/app/.env
Unescape View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade REGISTER=192.168.0.157/blade
TAG=2.3.1.RELEASE TAG=2.4.0.RELEASE

Write Preview
Loading…
Cancel
Save