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

🎉 2.0.6.RELEASE

test
smallchill 6 years ago
parent
98a64c1e67
commit
4cfb0b0cea
15 changed files with 37 additions and 35 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-common/pom.xml
  2. 19
      blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
  3. 2
      blade-example-api/blade-dubbo-provider-api/pom.xml
  4. 4
      blade-example-api/pom.xml
  5. 2
      blade-example/blade-dubbo-consumer/pom.xml
  6. 2
      blade-example/blade-dubbo-provider/pom.xml
  7. 4
      blade-example/pom.xml
  8. 6
      blade-gateway/pom.xml
  9. 2
      blade-service-api/blade-demo-api/pom.xml
  10. 4
      blade-service-api/pom.xml
  11. 2
      blade-service/blade-demo/pom.xml
  12. 7
      blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java
  13. 4
      blade-service/pom.xml
  14. 10
      pom.xml
  15. 2
      script/docker/.env

2
blade-common/pom.xml
Unescape View File

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

19
blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
Unescape View File

@ -20,6 +20,7 @@ import org.springblade.common.constant.CommonConstant;
import org.springblade.core.auto.service.AutoService; import org.springblade.core.auto.service.AutoService;
import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.launch.service.LauncherService; import org.springblade.core.launch.service.LauncherService;
import org.springblade.core.launch.utils.PropsUtil;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import java.util.Properties; import java.util.Properties;
@ -36,16 +37,16 @@ public class LauncherServiceImpl implements LauncherService {
public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
Properties props = System.getProperties(); Properties props = System.getProperties();
// 通用注册 // 通用注册
props.setProperty("spring.cloud.nacos.discovery.server-addr", CommonConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", CommonConstant.nacosAddr(profile));
props.setProperty("spring.cloud.nacos.config.server-addr", CommonConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", CommonConstant.nacosAddr(profile));
props.setProperty("spring.cloud.sentinel.transport.dashboard", CommonConstant.sentinelAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", CommonConstant.sentinelAddr(profile));
// dubbo注册 // dubbo注册
props.setProperty("dubbo.application.name", appName); PropsUtil.setProperty(props, "dubbo.application.name", appName);
props.setProperty("dubbo.application.qos.enable", "false"); PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false");
props.setProperty("dubbo.protocol.name", "dubbo"); PropsUtil.setProperty(props, "dubbo.protocol.name", "dubbo");
props.setProperty("dubbo.registry.address", "nacos://" + CommonConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "dubbo.registry.address", "nacos://" + CommonConstant.nacosAddr(profile));
props.setProperty("dubbo.version", AppConstant.APPLICATION_VERSION); PropsUtil.setProperty(props, "dubbo.version", AppConstant.APPLICATION_VERSION);
props.setProperty("dubbo.scan.base-packages", AppConstant.BASE_PACKAGES); PropsUtil.setProperty(props, "dubbo.scan.base-packages", AppConstant.BASE_PACKAGES);
} }
} }

2
blade-example-api/blade-dubbo-provider-api/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-example-api</artifactId> <artifactId>blade-example-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

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

2
blade-example/blade-dubbo-consumer/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-example</artifactId> <artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-example/blade-dubbo-provider/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-example</artifactId> <artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
blade-example/pom.xml
Unescape View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX-Biz</artifactId> <artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-example</artifactId> <artifactId>blade-example</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务范例集合</description> <description>BladeX 微服务范例集合</description>

6
blade-gateway/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>BladeX-Biz</artifactId> <artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -69,12 +69,12 @@
</dependency> </dependency>
<!-- Nacos --> <!-- Nacos -->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId> <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
<version>${alibaba.cloud.version}</version> <version>${alibaba.cloud.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId> <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>${alibaba.cloud.version}</version> <version>${alibaba.cloud.version}</version>
</dependency> </dependency>

2
blade-service-api/blade-demo-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.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,14 +5,14 @@
<parent> <parent>
<artifactId>BladeX-Biz</artifactId> <artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.5.RELEASE</version> <version>2.0.6.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.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务API集合</description> <description>BladeX 微服务API集合</description>

2
blade-service/blade-demo/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.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

7
blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java
Unescape View File

@ -19,6 +19,7 @@ package com.example.demo.launcher;
import org.springblade.core.auto.service.AutoService; import org.springblade.core.auto.service.AutoService;
import org.springblade.core.launch.constant.NacosConstant; import org.springblade.core.launch.constant.NacosConstant;
import org.springblade.core.launch.service.LauncherService; import org.springblade.core.launch.service.LauncherService;
import org.springblade.core.launch.utils.PropsUtil;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import java.util.Properties; import java.util.Properties;
@ -34,9 +35,9 @@ public class DemoLauncherServiceImpl implements LauncherService {
@Override @Override
public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
Properties props = System.getProperties(); Properties props = System.getProperties();
props.setProperty("spring.cloud.nacos.config.ext-config[0].data-id", NacosConstant.dataId(appName, profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].data-id", NacosConstant.dataId(appName, profile));
props.setProperty("spring.cloud.nacos.config.ext-config[0].group", NacosConstant.NACOS_CONFIG_GROUP); PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].group", NacosConstant.NACOS_CONFIG_GROUP);
props.setProperty("spring.cloud.nacos.config.ext-config[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH);
} }
@Override @Override

4
blade-service/pom.xml
Unescape View File

@ -7,12 +7,12 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX-Biz</artifactId> <artifactId>BladeX-Biz</artifactId>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
</parent> </parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务集合</description> <description>BladeX 微服务集合</description>

10
pom.xml
Unescape View File

@ -5,17 +5,17 @@
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX-Biz</artifactId> <artifactId>BladeX-Biz</artifactId>
<version>2.0.5.RELEASE</version> <version>2.0.6.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<bladex.tool.version>2.0.5.RELEASE</bladex.tool.version> <bladex.tool.version>2.0.6.RELEASE</bladex.tool.version>
<bladex.project.version>2.0.5.RELEASE</bladex.project.version> <bladex.project.version>2.0.6.RELEASE</bladex.project.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
<swagger.models.version>1.5.21</swagger.models.version> <swagger.models.version>1.5.21</swagger.models.version>
<swagger.bootstrapui.version>1.9.4</swagger.bootstrapui.version> <swagger.bootstrapui.version>1.9.5</swagger.bootstrapui.version>
<mybatis.plus.version>3.1.0</mybatis.plus.version> <mybatis.plus.version>3.1.0</mybatis.plus.version>
<curator.framework.version>4.0.1</curator.framework.version> <curator.framework.version>4.0.1</curator.framework.version>
<protostuff.version>1.6.0</protostuff.version> <protostuff.version>1.6.0</protostuff.version>
@ -23,7 +23,7 @@
<mysql.connector.version>8.0.16</mysql.connector.version> <mysql.connector.version>8.0.16</mysql.connector.version>
<spring.boot.admin.version>2.1.4</spring.boot.admin.version> <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
<alibaba.cloud.version>0.9.0.RELEASE</alibaba.cloud.version> <alibaba.cloud.version>2.1.0.RELEASE</alibaba.cloud.version>
<dubbo.version>2.7.1</dubbo.version> <dubbo.version>2.7.1</dubbo.version>
<spring.boot.version>2.1.6.RELEASE</spring.boot.version> <spring.boot.version>2.1.6.RELEASE</spring.boot.version>

2
script/docker/.env
Unescape View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade REGISTER=192.168.0.157/blade
TAG=2.0.5.RELEASE TAG=2.0.6.RELEASE

Write Preview
Loading…
Cancel
Save