From e6c7eb6530f19f5343058bab5f9e1265bd82c901 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 3 Nov 2019 22:13:02 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=202.5.3.RELEASE=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=93=BE=E8=B7=AF=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- blade-auth/pom.xml | 7 +- blade-common/pom.xml | 2 +- .../common/constant/CommonConstant.java | 32 ++++++ .../common/launch/LauncherServiceImpl.java | 1 + blade-gateway/pom.xml | 2 +- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- blade-ops/blade-resource/pom.xml | 2 +- blade-ops/blade-seata-order/pom.xml | 2 +- blade-ops/blade-seata-storage/pom.xml | 2 +- blade-ops/blade-zipkin/Dockerfile | 15 +++ blade-ops/blade-zipkin/pom.xml | 104 ++++++++++++++++++ .../springblade/zipkin/ZipkinApplication.java | 36 ++++++ .../src/main/resources/bootstrap.yml | 18 +++ blade-ops/pom.xml | 3 +- blade-service-api/blade-desk-api/pom.xml | 2 +- blade-service-api/blade-dict-api/pom.xml | 2 +- blade-service-api/blade-system-api/pom.xml | 2 +- blade-service-api/blade-user-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 +- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-log/pom.xml | 2 +- blade-service/blade-system/pom.xml | 7 +- blade-service/blade-user/pom.xml | 7 +- blade-service/pom.xml | 4 +- pom.xml | 8 +- script/docker/.env | 2 +- script/docker/deploy.sh | 3 +- script/docker/docker-compose.yml | 9 ++ 30 files changed, 261 insertions(+), 29 deletions(-) create mode 100644 blade-ops/blade-zipkin/Dockerfile create mode 100644 blade-ops/blade-zipkin/pom.xml create mode 100644 blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java create mode 100644 blade-ops/blade-zipkin/src/main/resources/bootstrap.yml diff --git a/README.md b/README.md index ce0bfc9..c8e861a 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

- Downloads + Downloads Build Status Build Status Coverage Status - Downloads + Downloads Downloads diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 21ceca9..d3f873d 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 2.5.2 + 2.5.3 blade-auth @@ -54,6 +54,11 @@ mysql-connector-java runtime + + diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 2a862d4..43907fd 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java index ae0dd06..fccf3e3 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java @@ -39,6 +39,21 @@ public interface CommonConstant { */ String SENTINEL_TEST_ADDR = "172.30.0.58:8858"; + /** + * zipkin dev 地址 + */ + String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411"; + + /** + * zipkin prod 地址 + */ + String ZIPKIN_PROD_ADDR = "http://172.30.0.58:9411"; + + /** + * zipkin test 地址 + */ + String ZIPKIN_TEST_ADDR = "http://172.30.0.58:9411"; + /** * sword 系统名 */ @@ -101,4 +116,21 @@ public interface CommonConstant { } } + /** + * 动态获取zipkin地址 + * + * @param profile 环境变量 + * @return addr + */ + static String zipkinAddr(String profile) { + switch (profile) { + case (AppConstant.PROD_CODE): + return ZIPKIN_PROD_ADDR; + case (AppConstant.TEST_CODE): + return ZIPKIN_TEST_ADDR; + default: + return ZIPKIN_DEV_ADDR; + } + } + } diff --git a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index f7f1a13..9937a89 100644 --- a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -34,6 +34,7 @@ public class LauncherServiceImpl implements LauncherService { props.setProperty("spring.cloud.nacos.discovery.server-addr", CommonConstant.nacosAddr(profile)); props.setProperty("spring.cloud.nacos.config.server-addr", CommonConstant.nacosAddr(profile)); props.setProperty("spring.cloud.sentinel.transport.dashboard", CommonConstant.sentinelAddr(profile)); + props.setProperty("spring.zipkin.base-url", CommonConstant.zipkinAddr(profile)); } } diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index fb1092d..0a77607 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 3b81fcd..198f9f0 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 564a7f4..5d68a4a 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index b785add..a9961e9 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 3b17a96..a753666 100644 --- a/blade-ops/blade-seata-order/pom.xml +++ b/blade-ops/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index 3e676a9..53083c6 100644 --- a/blade-ops/blade-seata-storage/pom.xml +++ b/blade-ops/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-ops/blade-zipkin/Dockerfile b/blade-ops/blade-zipkin/Dockerfile new file mode 100644 index 0000000..313e11e --- /dev/null +++ b/blade-ops/blade-zipkin/Dockerfile @@ -0,0 +1,15 @@ +FROM anapsix/alpine-java:8_server-jre_unlimited + +MAINTAINER smallchill@163.com + +RUN mkdir -p /blade/zipkin + +WORKDIR /blade/zipkin + +EXPOSE 9411 + +ADD ./target/blade-zipkin.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] + +CMD ["--spring.profiles.active=test"] diff --git a/blade-ops/blade-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml new file mode 100644 index 0000000..e68ca37 --- /dev/null +++ b/blade-ops/blade-zipkin/pom.xml @@ -0,0 +1,104 @@ + + + + blade-ops + org.springblade + 2.5.3 + + 4.0.0 + + blade-zipkin + ${project.artifactId} + ${bladex.project.version} + jar + + + + + org.springblade + blade-common + ${blade.project.version} + + + org.springblade + blade-core-tool + ${blade.tool.version} + + + org.springblade + blade-core-cloud + + + org.springblade + blade-core-secure + + + ${blade.tool.version} + + + + io.zipkin.java + zipkin-server + 2.12.3 + + + log4j-slf4j-impl + org.apache.logging.log4j + + + + + io.zipkin.java + zipkin-autoconfigure-ui + 2.12.3 + + + + + + + com.spotify + docker-maven-plugin + ${docker.plugin.version} + + ${docker.registry.url}/blade/${project.artifactId}:${project.version} + ${project.basedir} + ${docker.registry.host} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + ${docker.registry.url} + ${docker.registry.url} + true + + + + org.apache.maven.plugins + maven-antrun-plugin + + + package + + run + + + + + + + + + + + + + + diff --git a/blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java b/blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java new file mode 100644 index 0000000..2dd0890 --- /dev/null +++ b/blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springblade.zipkin; + +import org.springblade.core.launch.BladeApplication; +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import zipkin2.server.internal.EnableZipkinServer; + +/** + * Zipkin启动器 + * + * @author Chill + */ +@EnableZipkinServer +@SpringBootApplication +public class ZipkinApplication { + + public static void main(String[] args) { + BladeApplication.run(AppConstant.APPLICATION_ZIPKIN_NAME, ZipkinApplication.class, args); + } + +} diff --git a/blade-ops/blade-zipkin/src/main/resources/bootstrap.yml b/blade-ops/blade-zipkin/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..b5fe10d --- /dev/null +++ b/blade-ops/blade-zipkin/src/main/resources/bootstrap.yml @@ -0,0 +1,18 @@ +server: + port: 9411 + undertow: + # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 + io-threads: 4 + # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 + worker-threads: 20 + # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 + buffer-size: 1024 + # 是否分配的直接内存 + direct-buffers: true + +#zipkin启动报错无法访问的解决方法 +management: + metrics: + web: + server: + auto-time-requests: false diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 6fcd2c8..7b331cb 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.5.2 + 2.5.3 4.0.0 @@ -17,6 +17,7 @@ blade-resource blade-seata-order blade-seata-storage + blade-zipkin diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index a0d36a7..0ecc436 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.5.2 + 2.5.3 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index b3ff5dd..5c81a1a 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.5.2 + 2.5.3 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 95b4d61..8c83e62 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.5.2 + 2.5.3 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 4c52b9e..6b90516 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.5.2 + 2.5.3 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 099cd22..d93fe37 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 2.5.2 + 2.5.3 4.0.0 blade-service-api ${project.artifactId} - 2.5.2 + 2.5.3 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 4d4c171..ff0e83d 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index 29db6a4..595e603 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 2119d45..7c999cb 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.2 + 2.5.3 4.0.0 @@ -30,6 +30,11 @@ blade-system-api ${blade.project.version} + + diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 8ccb0cf..b0d675f 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.2 + 2.5.3 4.0.0 @@ -31,6 +31,11 @@ blade-dict-api ${blade.project.version} + + diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 559114a..f6a3c1c 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 2.5.2 + 2.5.3 blade-service ${project.artifactId} - 2.5.2 + 2.5.3 pom SpringBlade 微服务集合 diff --git a/pom.xml b/pom.xml index 046ff6f..65536f5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade SpringBlade - 2.5.2 + 2.5.3 pom - 2.5.2 - 2.5.2 + 2.5.3 + 2.5.3 1.8 2.9.2 @@ -23,7 +23,7 @@ 2.1.0.RELEASE 2.1.5 - 2.1.8.RELEASE + 2.1.9.RELEASE Greenwich.SR3 Cairo-SR8 diff --git a/script/docker/.env b/script/docker/.env index c5cb1dd..1c580e8 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.5.2 +TAG=2.5.3 diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh index 12b559c..db20953 100644 --- a/script/docker/deploy.sh +++ b/script/docker/deploy.sh @@ -14,6 +14,7 @@ port(){ firewall-cmd --add-port=3306/tcp --permanent firewall-cmd --add-port=3379/tcp --permanent firewall-cmd --add-port=7002/tcp --permanent + firewall-cmd --add-port=9411/tcp --permanent service firewalld restart } @@ -41,7 +42,7 @@ base(){ #启动程序模块 modules(){ - docker-compose up -d blade-gateway1 blade-gateway2 blade-admin blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log + docker-compose up -d blade-gateway1 blade-gateway2 blade-admin blade-zipkin blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log } #关闭所有模块 diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 1a50537..28d07e0 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -71,6 +71,15 @@ services: networks: - blade_net + blade-zipkin: + image: "${REGISTER}/blade/blade-zipkin:${TAG}" + ports: + - 9411:9411 + privileged: true + restart: always + networks: + - blade_net + blade-gateway1: image: "${REGISTER}/blade/blade-gateway:${TAG}" privileged: true