From 7d2f6a1fbcd31e6c69159f709b8bc1db5d8aaabf Mon Sep 17 00:00:00 2001
From: winLsy <18332763730@163.com>
Date: Wed, 7 Feb 2018 16:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=B6=88=E6=81=AF=E6=80=BB?=
=?UTF-8?q?=E7=BA=BF=E4=BC=A0=E9=80=92=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MsAuthenticationSuccessHandler.java | 5 ++-
ms/README.md | 6 ++-
ms/gateway/pom.xml | 6 ++-
.../fast/gateway/jwt/ValidateJwtToken.java | 2 +-
ms/monitor-turbine/README.md | 2 -
ms/monitor-turbine/pom.xml | 18 ++++----
....java => MsMonitorTurbineApplication.java} | 7 +--
.../src/main/resources/bootstrap.yml | 4 +-
... => MsMonitorTurbineApplicationTests.java} | 2 +-
ms/monitor-zipkin/README.md | 2 -
ms/monitor-zipkin/pom.xml | 45 +++++++++----------
.../zipkin/MsMonitorZipkinApplication.java | 23 ++++------
.../src/main/resources/bootstrap.yml | 4 +-
ms/oauth/pom.xml | 6 ++-
ms/pom.xml | 3 +-
ms/ucenter/pom.xml | 6 ++-
ms/upms/pom.xml | 12 +++--
17 files changed, 79 insertions(+), 74 deletions(-)
rename ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/{MsMonitorCenterApplication.java => MsMonitorTurbineApplication.java} (72%)
rename ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/{MsMonitorCenterApplicationTests.java => MsMonitorTurbineApplicationTests.java} (86%)
diff --git a/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/config/component/MsAuthenticationSuccessHandler.java b/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/config/component/MsAuthenticationSuccessHandler.java
index 30e6e3f..e60eafb 100644
--- a/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/config/component/MsAuthenticationSuccessHandler.java
+++ b/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/config/component/MsAuthenticationSuccessHandler.java
@@ -68,7 +68,10 @@ public class MsAuthenticationSuccessHandler extends SavedRequestAwareAuthenticat
log.info("登录成功，开始授权令牌");
//1.校验clientId和clientSecret是否对应
String header = request.getHeader("Authorization");
- if (header == null && !header.startsWith("Basic ")) {
+ if (header==null){
+ throw new UnapprovedClientAuthenticationException("请求头中client信息不存在");
+ }
+ if (!header.startsWith("Basic ")) {
throw new UnapprovedClientAuthenticationException("请求头中client信息不存在");
}
String[] tokens = this.extractAndDecodeHeader(header, request);
diff --git a/ms/README.md b/ms/README.md
index 998ec23..4b4007b 100644
--- a/ms/README.md
+++ b/ms/README.md
@@ -18,8 +18,10 @@
用户中心默认启动端口号10010,健康检查端口10011.
### 认证中心 oauth
认证中心默认启动端口号10012，健康检查端口号10013.
-### 监控中心
- 监控中心的默认启动端口是10018
+### 请求监控
+ 请求监控的默认启动端口是10018
+### 服务调用监控
+ 服务调用监控的默认启动端口是10020
### 后台管理界面 manage-system
使用vue.js搭建后台管理界面
## 项目相关约束
diff --git a/ms/gateway/pom.xml b/ms/gateway/pom.xml
index 3db1336..14a299b 100644
--- a/ms/gateway/pom.xml
+++ b/ms/gateway/pom.xml
@@ -65,9 +65,13 @@
spring-retry
+
+
+
+
org.springframework.cloud
- spring-cloud-starter-zipkin
+ spring-cloud-sleuth-zipkin-stream
diff --git a/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java b/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java
index d6acb14..cd74b3c 100644
--- a/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java
+++ b/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java
@@ -23,7 +23,7 @@ public class ValidateJwtToken {
return ServerResponse.error();
}
String token = StringUtils.substringAfter(authorization, "bearer ");
- if (token==null){
+ if (StringUtils.isBlank(token)){
return ServerResponse.error();
}
//解析jwt
diff --git a/ms/monitor-turbine/README.md b/ms/monitor-turbine/README.md
index 6c4e363..266e990 100644
--- a/ms/monitor-turbine/README.md
+++ b/ms/monitor-turbine/README.md
@@ -1,5 +1,3 @@
# 微服务系统监控中心
#### 集群服务熔断情况的监控
界面访问地址`/hystrix`。可使用`http://.../turbine.stream?cluster={集群名称之一}`访问
-#### 集群服务调用情况的监控
-界面访问地址`/`
\ No newline at end of file
diff --git a/ms/monitor-turbine/pom.xml b/ms/monitor-turbine/pom.xml
index ccd66d9..ebcb6f0 100644
--- a/ms/monitor-turbine/pom.xml
+++ b/ms/monitor-turbine/pom.xml
@@ -3,11 +3,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- monitor-center
+ monitor-turbine
jar
- ms-monitor-center
- ms-monitor-center
+ ms-monitor-turbine
+ ms-monitor-turbine
com.micro.fast
@@ -54,14 +54,14 @@
org.springframework.cloud
spring-cloud-netflix-turbine
-
+
- io.zipkin.java
- zipkin-server
+ org.springframework.cloud
+ spring-cloud-starter-bus-amqp
- io.zipkin.java
- zipkin-autoconfigure-ui
+ org.springframework.retry
+ spring-retry
@@ -90,7 +90,7 @@
docker-maven-plugin
- ms-monitor-center
+ ms-monitor-turbine
diff --git a/ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorCenterApplication.java b/ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorTurbineApplication.java
similarity index 72%
rename from ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorCenterApplication.java
rename to ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorTurbineApplication.java
index 36747ee..5f072fe 100644
--- a/ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorCenterApplication.java
+++ b/ms/monitor-turbine/src/main/java/com/micro/fast/monitor/center/MsMonitorTurbineApplication.java
@@ -5,7 +5,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.netflix.hystrix.EnableHystrix;
import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
import org.springframework.cloud.netflix.turbine.EnableTurbine;
-import zipkin.server.EnableZipkinServer;
/**
* @author lsy
@@ -13,13 +12,11 @@ import zipkin.server.EnableZipkinServer;
@SpringCloudApplication
//集群熔断降级情况的聚合展示
@EnableTurbine
-//集群间服务调用情况的聚合展示
-@EnableZipkinServer
@EnableHystrixDashboard
@EnableHystrix
-public class MsMonitorCenterApplication {
+public class MsMonitorTurbineApplication {
public static void main(String[] args) {
- SpringApplication.run(MsMonitorCenterApplication.class, args);
+ SpringApplication.run(MsMonitorTurbineApplication.class, args);
}
}
diff --git a/ms/monitor-turbine/src/main/resources/bootstrap.yml b/ms/monitor-turbine/src/main/resources/bootstrap.yml
index 6edd051..f8b4483 100644
--- a/ms/monitor-turbine/src/main/resources/bootstrap.yml
+++ b/ms/monitor-turbine/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ spring:
config:
profile: dev
label: master
- name: monitorcenter
+ name: turbine
discovery:
service-id: config-server
enabled: true
@@ -14,4 +14,4 @@ eureka:
serviceUrl:
defaultZone: http://micro:fast@www.register1.com:10002/eureka/,http://micro:fast@www.register2.com:10004/eureka/ #配置所有的注册中心
instance:
- hostname: www.monitorcenter.com
+ hostname: www.turbine.com
diff --git a/ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorCenterApplicationTests.java b/ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorTurbineApplicationTests.java
similarity index 86%
rename from ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorCenterApplicationTests.java
rename to ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorTurbineApplicationTests.java
index 209fd9c..96df2d1 100644
--- a/ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorCenterApplicationTests.java
+++ b/ms/monitor-turbine/src/test/java/com/micro/fast/monitor/center/MsMonitorTurbineApplicationTests.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
-public class MsMonitorCenterApplicationTests {
+public class MsMonitorTurbineApplicationTests {
@Test
public void contextLoads() {
diff --git a/ms/monitor-zipkin/README.md b/ms/monitor-zipkin/README.md
index 6c4e363..df86e57 100644
--- a/ms/monitor-zipkin/README.md
+++ b/ms/monitor-zipkin/README.md
@@ -1,5 +1,3 @@
# 微服务系统监控中心
-#### 集群服务熔断情况的监控
-界面访问地址`/hystrix`。可使用`http://.../turbine.stream?cluster={集群名称之一}`访问
#### 集群服务调用情况的监控
界面访问地址`/`
\ No newline at end of file
diff --git a/ms/monitor-zipkin/pom.xml b/ms/monitor-zipkin/pom.xml
index ccd66d9..4c2f442 100644
--- a/ms/monitor-zipkin/pom.xml
+++ b/ms/monitor-zipkin/pom.xml
@@ -3,11 +3,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- monitor-center
+ monitor-zipkin
jar
- ms-monitor-center
- ms-monitor-center
+ ms-monitor-zipkin
+ ms-monitor-zipkin
com.micro.fast
@@ -35,34 +35,30 @@
org.springframework.boot
spring-boot-starter-actuator
-
-
- org.springframework.cloud
- spring-cloud-starter-hystrix
-
-
+
org.springframework.cloud
- spring-cloud-starter-hystrix-dashboard
-
-
-
- org.springframework.cloud
- spring-cloud-starter-turbine
-
-
- org.springframework.cloud
- spring-cloud-netflix-turbine
+ spring-cloud-sleuth-zipkin-stream
-
- io.zipkin.java
- zipkin-server
-
+
+
+
+
io.zipkin.java
zipkin-autoconfigure-ui
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-bus-amqp
+
+
+ org.springframework.retry
+ spring-retry
+
org.springframework.boot
@@ -90,8 +86,7 @@
docker-maven-plugin
- ms-monitor-center
+ ms-monitor-zipkin
-
diff --git a/ms/monitor-zipkin/src/main/java/com/micro/fast/monitor/zipkin/MsMonitorZipkinApplication.java b/ms/monitor-zipkin/src/main/java/com/micro/fast/monitor/zipkin/MsMonitorZipkinApplication.java
index 36747ee..574f558 100644
--- a/ms/monitor-zipkin/src/main/java/com/micro/fast/monitor/zipkin/MsMonitorZipkinApplication.java
+++ b/ms/monitor-zipkin/src/main/java/com/micro/fast/monitor/zipkin/MsMonitorZipkinApplication.java
@@ -1,25 +1,20 @@
-package com.micro.fast.monitor.center;
+package com.micro.fast.monitor.zipkin;
import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.netflix.hystrix.EnableHystrix;
-import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
-import org.springframework.cloud.netflix.turbine.EnableTurbine;
-import zipkin.server.EnableZipkinServer;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.sleuth.zipkin.stream.EnableZipkinStreamServer;
/**
* @author lsy
*/
-@SpringCloudApplication
-//集群熔断降级情况的聚合展示
-@EnableTurbine
+@SpringBootApplication
+@EnableDiscoveryClient
//集群间服务调用情况的聚合展示
-@EnableZipkinServer
-@EnableHystrixDashboard
-@EnableHystrix
-public class MsMonitorCenterApplication {
+@EnableZipkinStreamServer
+public class MsMonitorZipkinApplication {
public static void main(String[] args) {
- SpringApplication.run(MsMonitorCenterApplication.class, args);
+ SpringApplication.run(MsMonitorZipkinApplication.class, args);
}
}
diff --git a/ms/monitor-zipkin/src/main/resources/bootstrap.yml b/ms/monitor-zipkin/src/main/resources/bootstrap.yml
index 6edd051..eb315c2 100644
--- a/ms/monitor-zipkin/src/main/resources/bootstrap.yml
+++ b/ms/monitor-zipkin/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ spring:
config:
profile: dev
label: master
- name: monitorcenter
+ name: zipkin
discovery:
service-id: config-server
enabled: true
@@ -14,4 +14,4 @@ eureka:
serviceUrl:
defaultZone: http://micro:fast@www.register1.com:10002/eureka/,http://micro:fast@www.register2.com:10004/eureka/ #配置所有的注册中心
instance:
- hostname: www.monitorcenter.com
+ hostname: www.zipkin.com
diff --git a/ms/oauth/pom.xml b/ms/oauth/pom.xml
index 9b5817d..2d529eb 100644
--- a/ms/oauth/pom.xml
+++ b/ms/oauth/pom.xml
@@ -66,9 +66,13 @@
spring-retry
+
+
+
+
org.springframework.cloud
- spring-cloud-starter-zipkin
+ spring-cloud-sleuth-zipkin-stream
diff --git a/ms/pom.xml b/ms/pom.xml
index d59742f..2fbc396 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -61,7 +61,8 @@
config-server
register-center1
register-center2
- monitor-center
+ monitor-turbine
+ monitor-zipkin
oauth
gateway
upms
diff --git a/ms/ucenter/pom.xml b/ms/ucenter/pom.xml
index 604430d..0a45ff8 100644
--- a/ms/ucenter/pom.xml
+++ b/ms/ucenter/pom.xml
@@ -76,9 +76,13 @@
spring-retry
+
+
+
+
org.springframework.cloud
- spring-cloud-starter-zipkin
+ spring-cloud-sleuth-zipkin-stream
diff --git a/ms/upms/pom.xml b/ms/upms/pom.xml
index fe573cd..adc05c3 100644
--- a/ms/upms/pom.xml
+++ b/ms/upms/pom.xml
@@ -66,10 +66,14 @@
spring-retry
-
- org.springframework.cloud
- spring-cloud-starter-zipkin
-
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin-stream
+
org.springframework.boot