From 1a5d0db22016bdd821d6d8992802100dc3516b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=94=BE=E7=89=9B=E6=9E=81=E5=AE=A2?= Date: 2018年9月30日 17:22:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0dubbo=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++++ .../dubbo/bootstarp/DemoProvider.java | 13 +++++++++++ .../dubbo/controller/CustomerController.java | 21 +++++++++++++++++ .../geekcattle/dubbo/service/DemoService.java | 7 ++++++ .../dubbo/service/impl/DemoServiceImpl.java | 15 ++++++++++++ src/main/resources/application.yml | 23 +++++++++++++++++++ 6 files changed, 85 insertions(+) create mode 100644 src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java create mode 100644 src/main/java/com/geekcattle/dubbo/controller/CustomerController.java create mode 100644 src/main/java/com/geekcattle/dubbo/service/DemoService.java create mode 100644 src/main/java/com/geekcattle/dubbo/service/impl/DemoServiceImpl.java diff --git a/pom.xml b/pom.xml index 788a140..742b7ce 100644 --- a/pom.xml +++ b/pom.xml @@ -249,6 +249,12 @@ 3.1.0 + + com.alibaba.boot + dubbo-spring-boot-starter + 0.2.0 + + geek-framework diff --git a/src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java b/src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java new file mode 100644 index 0000000..f2b2d9f --- /dev/null +++ b/src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java @@ -0,0 +1,13 @@ +package com.geekcattle.dubbo.bootstarp; + +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; + +@SpringBootApplication +public class DemoProvider { + + public static void main(String[] args) { + new SpringApplicationBuilder(DemoProvider.class).web(WebApplicationType.NONE).run(args); + } +} diff --git a/src/main/java/com/geekcattle/dubbo/controller/CustomerController.java b/src/main/java/com/geekcattle/dubbo/controller/CustomerController.java new file mode 100644 index 0000000..137704f --- /dev/null +++ b/src/main/java/com/geekcattle/dubbo/controller/CustomerController.java @@ -0,0 +1,21 @@ +package com.geekcattle.dubbo.controller; + +import com.alibaba.dubbo.config.annotation.Reference; +import com.geekcattle.dubbo.service.DemoService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CustomerController { + + + //url = "dubbo://localhost:12345" registry = "${dubbo.registry.address}" + @Reference(url = "dubbo://localhost:12345", check = false) + private DemoService demoService; + + @RequestMapping("/sayHello") + public String sayHello() { + return demoService.sayHello("dubbo"); + } + +} diff --git a/src/main/java/com/geekcattle/dubbo/service/DemoService.java b/src/main/java/com/geekcattle/dubbo/service/DemoService.java new file mode 100644 index 0000000..ca38091 --- /dev/null +++ b/src/main/java/com/geekcattle/dubbo/service/DemoService.java @@ -0,0 +1,7 @@ +package com.geekcattle.dubbo.service; + +public interface DemoService { + + String sayHello(String name); + +} diff --git a/src/main/java/com/geekcattle/dubbo/service/impl/DemoServiceImpl.java b/src/main/java/com/geekcattle/dubbo/service/impl/DemoServiceImpl.java new file mode 100644 index 0000000..5c23be5 --- /dev/null +++ b/src/main/java/com/geekcattle/dubbo/service/impl/DemoServiceImpl.java @@ -0,0 +1,15 @@ +package com.geekcattle.dubbo.service.impl; + +import com.alibaba.dubbo.config.annotation.Service; +import com.geekcattle.dubbo.service.DemoService; + +@Service( + protocol = "${dubbo.protocol.id}", + registry = "${dubbo.registry.id}" +) +public class DemoServiceImpl implements DemoService { + @Override + public String sayHello(String name) { + return "Hello, " + name + " (from Spring Boot)"; + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 47eeb57..944e60a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -68,6 +68,9 @@ spring: min-idle : 0 # 连接超时时间(毫秒) timeout : 500ms + application: + name: geekcattle + #mybaties配置 mybatis: @@ -180,6 +183,26 @@ j2cache: redis-client : lettuce + +dubbo: + application: + id: dubbo-provide-demo + name: dubbo-provide-demo + qos-enable: true + qos-port: 22222 + protocol: + id: dubbo + name: dubbo + port: 12345 + status: server + registry: + address: zookeeper://121.41.17.147:2181 + id: my-registry + scan: + base-packages: com.geekcattle.dubbo.service.impl + + + --- #开发环境 From 85bf4e67fe324c7d3cfbe345a0136a3f33edb014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=94=BE=E7=89=9B=E6=9E=81=E5=AE=A2?= Date: Mon, 8 Oct 2018 15:11:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E6=88=90dubbo=E5=9C=A8=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E5=BA=94=E7=94=A8=E5=86=85=E5=BC=80=E5=90=AFprovider?= =?UTF-8?q?=E5=92=8Ccustomer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geekcattle/dubbo/{service => }/DemoService.java | 2 +- .../geekcattle/dubbo/bootstarp/DemoProvider.java | 13 ------------- .../dubbo/controller/CustomerController.java | 4 +--- .../dubbo/service/{impl => }/DemoServiceImpl.java | 6 +++--- src/main/resources/application.yml | 8 ++++---- 5 files changed, 9 insertions(+), 24 deletions(-) rename src/main/java/com/geekcattle/dubbo/{service => }/DemoService.java (64%) delete mode 100644 src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java rename src/main/java/com/geekcattle/dubbo/service/{impl => }/DemoServiceImpl.java (74%) diff --git a/src/main/java/com/geekcattle/dubbo/service/DemoService.java b/src/main/java/com/geekcattle/dubbo/DemoService.java similarity index 64% rename from src/main/java/com/geekcattle/dubbo/service/DemoService.java rename to src/main/java/com/geekcattle/dubbo/DemoService.java index ca38091..ce278b8 100644 --- a/src/main/java/com/geekcattle/dubbo/service/DemoService.java +++ b/src/main/java/com/geekcattle/dubbo/DemoService.java @@ -1,4 +1,4 @@ -package com.geekcattle.dubbo.service; +package com.geekcattle.dubbo; public interface DemoService { diff --git a/src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java b/src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java deleted file mode 100644 index f2b2d9f..0000000 --- a/src/main/java/com/geekcattle/dubbo/bootstarp/DemoProvider.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.geekcattle.dubbo.bootstarp; - -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; - -@SpringBootApplication -public class DemoProvider { - - public static void main(String[] args) { - new SpringApplicationBuilder(DemoProvider.class).web(WebApplicationType.NONE).run(args); - } -} diff --git a/src/main/java/com/geekcattle/dubbo/controller/CustomerController.java b/src/main/java/com/geekcattle/dubbo/controller/CustomerController.java index 137704f..4970405 100644 --- a/src/main/java/com/geekcattle/dubbo/controller/CustomerController.java +++ b/src/main/java/com/geekcattle/dubbo/controller/CustomerController.java @@ -1,15 +1,13 @@ package com.geekcattle.dubbo.controller; import com.alibaba.dubbo.config.annotation.Reference; -import com.geekcattle.dubbo.service.DemoService; +import com.geekcattle.dubbo.DemoService; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController public class CustomerController { - - //url = "dubbo://localhost:12345" registry = "${dubbo.registry.address}" @Reference(url = "dubbo://localhost:12345", check = false) private DemoService demoService; diff --git a/src/main/java/com/geekcattle/dubbo/service/impl/DemoServiceImpl.java b/src/main/java/com/geekcattle/dubbo/service/DemoServiceImpl.java similarity index 74% rename from src/main/java/com/geekcattle/dubbo/service/impl/DemoServiceImpl.java rename to src/main/java/com/geekcattle/dubbo/service/DemoServiceImpl.java index 5c23be5..beb0ddf 100644 --- a/src/main/java/com/geekcattle/dubbo/service/impl/DemoServiceImpl.java +++ b/src/main/java/com/geekcattle/dubbo/service/DemoServiceImpl.java @@ -1,14 +1,14 @@ -package com.geekcattle.dubbo.service.impl; +package com.geekcattle.dubbo.service; import com.alibaba.dubbo.config.annotation.Service; -import com.geekcattle.dubbo.service.DemoService; +import com.geekcattle.dubbo.DemoService; @Service( protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}" ) public class DemoServiceImpl implements DemoService { - @Override + public String sayHello(String name) { return "Hello, " + name + " (from Spring Boot)"; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 944e60a..df4ad94 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -189,17 +189,17 @@ dubbo: id: dubbo-provide-demo name: dubbo-provide-demo qos-enable: true - qos-port: 22222 + qos-port: 22220 protocol: id: dubbo name: dubbo port: 12345 status: server registry: - address: zookeeper://121.41.17.147:2181 - id: my-registry + address: zookeeper://127.0.0.1:2181 + id: registry scan: - base-packages: com.geekcattle.dubbo.service.impl + basePackages: com.geekcattle.dubbo.service From d3ae35454ec7b0af16440b7f50af6163c23a83d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=94=BE=E7=89=9B=E6=9E=81=E5=AE=A2?= Date: 2019年1月24日 15:34:25 +0800 Subject: [PATCH 3/3] Merge branch 'master' into dubbo # Conflicts: # src/main/resources/application.yml --- .../core/interceptor/ResourceInterceptor.java | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/geekcattle/core/interceptor/ResourceInterceptor.java b/src/main/java/com/geekcattle/core/interceptor/ResourceInterceptor.java index 79abf83..34725c5 100644 --- a/src/main/java/com/geekcattle/core/interceptor/ResourceInterceptor.java +++ b/src/main/java/com/geekcattle/core/interceptor/ResourceInterceptor.java @@ -1,4 +1,20 @@ -package com.geekcattle.core.interceptor; +/* + * Copyright (c) 2017-2018. 放牛极客 + *

+ * 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 com.geekcattle.core.Interceptor; import com.geekcattle.util.IpUtil; import org.slf4j.Logger; @@ -9,9 +25,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -/** - * @author geekcattle - */ @Component public class ResourceInterceptor extends HandlerInterceptorAdapter { @@ -21,13 +34,14 @@ public class ResourceInterceptor extends HandlerInterceptorAdapter { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - if(logger.isDebugEnabled()){ - String uri = request.getRequestURI(); - logger.info(uri); - logger.info("UserAgent: {}", request.getHeader(USER_AGENT)); - logger.info("用户访问地址: {}, 来路地址: {}", uri, IpUtil.getIpAddr(request)); - } + String uri = request.getRequestURI(); + logger.info(uri); + logger.info("UserAgent: {}", request.getHeader(USER_AGENT)); + logger.info("用户访问地址: {}, 来路地址: {}", uri, IpUtil.getIpAddr(request)); + + return true; + //return super.preHandle(request, response, handler); } }

AltStyle によって変換されたページ (->オリジナル) /