Merge remote-tracking branch 'origin/master'

# Conflicts: # markdown/第7章 RocketMQ.md
bq-xiao · Feb 10, 2020 · 3db0fea · 3db0fea
2 parents 655cfb2 + dc3323b
commit 3db0fea
Show file tree

Hide file tree

Showing 48 changed files with 2,138 additions and 2,050 deletions.
diff --git a/markdown/image/rocketmq-store.jpg b/markdown/image/rocketmq-store.jpg
diff --git a/markdown/image/rocketmq_architecture_1.png b/markdown/image/rocketmq_architecture_1.png
diff --git a/markdown/image/rocketmq_architecture_10.jpg b/markdown/image/rocketmq_architecture_10.jpg
diff --git a/markdown/image/rocketmq_architecture_11.jpg b/markdown/image/rocketmq_architecture_11.jpg
diff --git a/markdown/image/rocketmq_architecture_12.jpg b/markdown/image/rocketmq_architecture_12.jpg
diff --git a/markdown/image/rocketmq_architecture_2.png b/markdown/image/rocketmq_architecture_2.png
diff --git a/markdown/image/rocketmq_architecture_3.png b/markdown/image/rocketmq_architecture_3.png
diff --git a/markdown/image/rocketmq_architecture_4.png b/markdown/image/rocketmq_architecture_4.png
diff --git a/markdown/image/rocketmq_architecture_5.jpg b/markdown/image/rocketmq_architecture_5.jpg
diff --git a/markdown/image/rocketmq_architecture_6.png b/markdown/image/rocketmq_architecture_6.png
diff --git a/markdown/image/rocketmq_architecture_7.jpg b/markdown/image/rocketmq_architecture_7.jpg
diff --git a/markdown/image/rocketmq_architecture_8.jpg b/markdown/image/rocketmq_architecture_8.jpg
diff --git a/markdown/image/rocketmq_architecture_9.jpg b/markdown/image/rocketmq_architecture_9.jpg
diff --git a/markdown/image/sentinel-architecture_1.png b/markdown/image/sentinel-architecture_1.png
diff --git a/markdown/image/sentinel-architecture_2.gif b/markdown/image/sentinel-architecture_2.gif
diff --git a/markdown/image/sentinel-architecture_3.png b/markdown/image/sentinel-architecture_3.png
diff --git a/markdown/image/sentinel-dashboard.jpg b/markdown/image/sentinel-dashboard.jpg
diff --git a/markdown/image/sentinel-log_1.jpg b/markdown/image/sentinel-log_1.jpg
diff --git a/markdown/image/spring-cloud-stream_0.png b/markdown/image/spring-cloud-stream_0.png
diff --git a/markdown/image/spring-cloud-stream_1.jpg b/markdown/image/spring-cloud-stream_1.jpg
diff --git a/markdown/image/spring-cloud-stream_2.png b/markdown/image/spring-cloud-stream_2.png
diff --git a/markdown/第六章 Sentinel.md b/markdown/第六章 Sentinel.md
diff --git a/spring-boot-dubbo-nacos-sample/.idea/workspace.xml b/spring-boot-dubbo-nacos-sample/.idea/workspace.xml
diff --git a/spring-cloud-gateway-sample/.gitignore b/spring-cloud-gateway-sample/.gitignore
@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/
diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.1.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.gupaoedu.springcloud.gateway</groupId>
+	<artifactId>spring-cloud-gateway-sample</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>spring-cloud-gateway-sample</name>
+	<description>Demo project for Spring Boot</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-gateway</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...c/main/java/com/gupaoedu/springcloud/gateway/springcloudgatewaysample/GpDefineFilter.java b/...c/main/java/com/gupaoedu/springcloud/gateway/springcloudgatewaysample/GpDefineFilter.java
@@ -0,0 +1,31 @@
+package com.gupaoedu.springcloud.gateway.springcloudgatewaysample;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+/**
+ * 咕泡学院，只为更好的你
+ * 咕泡学院-Mic: 2227324689
+ * http://www.gupaoedu.com
+ **/
+@Service
+@Slf4j
+public class GpDefineFilter implements GlobalFilter,Ordered{
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        log.info("[pre]-Enter GpDefineFilter");
+        return chain.filter(exchange).then(Mono.fromRunnable(()->{
+            log.info("[post]-Return Result");
+        }));
+    }
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+}
diff --git a/...m/gupaoedu/springcloud/gateway/springcloudgatewaysample/GpDefineGatewayFilterFactory.java b/...m/gupaoedu/springcloud/gateway/springcloudgatewaysample/GpDefineGatewayFilterFactory.java
@@ -0,0 +1,43 @@
+package com.gupaoedu.springcloud.gateway.springcloudgatewaysample;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+/**
+ * 咕泡学院，只为更好的你
+ * 咕泡学院-Mic: 2227324689
+ * http://www.gupaoedu.com
+ **/
+@Service
+@Slf4j
+public class GpDefineGatewayFilterFactory extends AbstractGatewayFilterFactory<GpDefineGatewayFilterFactory.GpConfig>{
+
+    public GpDefineGatewayFilterFactory(){
+        super(GpConfig.class);
+    }
+
+    @Override
+    public GatewayFilter apply(GpConfig config) {
+        return ((exchange, chain) -> {
+            log.info("[Pre] Filter Request,name:"+config.getName());
+            return chain.filter(exchange).then(Mono.fromRunnable(()->{
+                log.info("[Post] Response Filter");
+            }));
+        });
+    }
+
+    public static class GpConfig{
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+}
diff --git a/.../java/com/gupaoedu/springcloud/gateway/springcloudgatewaysample/IpAddressKeyResolver.java b/.../java/com/gupaoedu/springcloud/gateway/springcloudgatewaysample/IpAddressKeyResolver.java
@@ -0,0 +1,19 @@
+package com.gupaoedu.springcloud.gateway.springcloudgatewaysample;
+
+import org.springframework.cloud.gateway.filter.ratelimit.KeyResolver;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+/**
+ * 咕泡学院，只为更好的你
+ * 咕泡学院-Mic: 2227324689
+ * http://www.gupaoedu.com
+ **/
+@Service
+public class IpAddressKeyResolver implements KeyResolver{
+    @Override
+    public Mono<String> resolve(ServerWebExchange exchange) {
+        return Mono.just(exchange.getRequest().getRemoteAddress().getAddress().getHostAddress());
+    }
+}
diff --git a/...edu/springcloud/gateway/springcloudgatewaysample/SpringCloudGatewaySampleApplication.java b/...edu/springcloud/gateway/springcloudgatewaysample/SpringCloudGatewaySampleApplication.java
@@ -0,0 +1,13 @@
+package com.gupaoedu.springcloud.gateway.springcloudgatewaysample;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringCloudGatewaySampleApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SpringCloudGatewaySampleApplication.class, args);
+	}
+
+}
diff --git a/spring-cloud-gateway-sample/src/main/resources/application.yml b/spring-cloud-gateway-sample/src/main/resources/application.yml
@@ -0,0 +1,26 @@
+
+spring:
+  cloud:
+    gateway:
+      routes:
+        - id: define_filter
+          predicates:
+            - Path=/gateway/**
+          filters:
+            - name: GpDefine
+              args:
+                name: Gp_Mic
+            - name: RequestRateLimiter
+              args:
+                denyEmptyKey: false
+                emptyKeyStatus: SERVICE_UNAVAILABLE
+                keyResolver: '#{@ipAddressKeyResolver}'
+                redis-rate-limiter.replenishRate: 1
+                redis-rate-limiter.burstCapacity: 2
+            - StripPrefix=1
+          uri: http://localhost:8080/say
+  redis:
+    host: 192.168.216.128
+    port: 6379
+server:
+  port: 8088
diff --git a/...pringcloud/gateway/springcloudgatewaysample/SpringCloudGatewaySampleApplicationTests.java b/...pringcloud/gateway/springcloudgatewaysample/SpringCloudGatewaySampleApplicationTests.java
@@ -0,0 +1,10 @@
+package com.gupaoedu.springcloud.gateway.springcloudgatewaysample;
+
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class SpringCloudGatewaySampleApplicationTests {
+
+
+
+}
diff --git a/spring-cloud-gateway-service/.gitignore b/spring-cloud-gateway-service/.gitignore
@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/
diff --git a/spring-cloud-gateway-service/pom.xml b/spring-cloud-gateway-service/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.4.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.gupaoedu.springboot.gateway</groupId>
+	<artifactId>spring-cloud-gateway-service</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>spring-cloud-gateway-service</name>
+	<description>Demo project for Spring Boot</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/.../main/java/com/gupaoedu/springboot/gateway/springcloudgatewayservice/HelloController.java b/.../main/java/com/gupaoedu/springboot/gateway/springcloudgatewayservice/HelloController.java
@@ -0,0 +1,18 @@
+package com.gupaoedu.springboot.gateway.springcloudgatewayservice;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 咕泡学院，只为更好的你
+ * 咕泡学院-Mic: 2227324689
+ * http://www.gupaoedu.com
+ **/
+@RestController
+public class HelloController {
+
+    @GetMapping("/say")
+    public String sayHello(){
+        return "[spring-cloud-gateway-service]:say Hello";
+    }
+}
diff --git a/...du/springboot/gateway/springcloudgatewayservice/SpringCloudGatewayServiceApplication.java b/...du/springboot/gateway/springcloudgatewayservice/SpringCloudGatewayServiceApplication.java
@@ -0,0 +1,13 @@
+package com.gupaoedu.springboot.gateway.springcloudgatewayservice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringCloudGatewayServiceApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SpringCloudGatewayServiceApplication.class, args);
+	}
+
+}
diff --git a/spring-cloud-gateway-service/src/main/resources/application.properties b/spring-cloud-gateway-service/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.application.name=spring-cloud-gateway-service
diff --git a/...ringboot/gateway/springcloudgatewayservice/SpringCloudGatewayServiceApplicationTests.java b/...ringboot/gateway/springcloudgatewayservice/SpringCloudGatewayServiceApplicationTests.java
@@ -0,0 +1,13 @@
+package com.gupaoedu.springboot.gateway.springcloudgatewayservice;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class SpringCloudGatewayServiceApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		spring.application.name=spring-cloud-gateway-service