From 2d3402cb98a27043341cb452310ba99708a7d8ed Mon Sep 17 00:00:00 2001 From: wangzx Date: Thu, 29 Mar 2018 09:38:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?dev=E6=B5=8B=E8=AF=95merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/controller/TestController.java b/src/main/java/controller/TestController.java index 2b694d7..dea8bc2 100644 --- a/src/main/java/controller/TestController.java +++ b/src/main/java/controller/TestController.java @@ -39,7 +39,7 @@ public class TestController { private JedisCluster jedisCluster; /** - * 获取数据合并分支 + * 获取数据合并分支sssssss * @return */ @RequestMapping("/userData") From 1f28669288a6d9d1e998d3c6054dcc6e3fbb7ce0 Mon Sep 17 00:00:00 2001 From: wangzx Date: Tue, 3 Apr 2018 16:12:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?dubbo=E7=94=9F=E4=BA=A7=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 ++++++++++++++++++++ src/main/java/controller/TestController.java | 1 - src/main/java/impl/ShareServiceImpl.java | 3 +-- src/main/resources/spring/spring-dubbo.xml | 28 ++++++++++++++++++++ 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/spring/spring-dubbo.xml diff --git a/pom.xml b/pom.xml index e41d204..813014d 100644 --- a/pom.xml +++ b/pom.xml @@ -226,6 +226,34 @@ lombok 1.16.10 + + + com.101tec + zkclient + 0.9 + + + org.slf4j + slf4j-log4j12 + + + + + + com.alibaba + dubbo + 2.5.3 + + + org.springframework + spring + + + log4j + log4j + + + diff --git a/src/main/java/controller/TestController.java b/src/main/java/controller/TestController.java index dea8bc2..16cc5ee 100644 --- a/src/main/java/controller/TestController.java +++ b/src/main/java/controller/TestController.java @@ -3,7 +3,6 @@ import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.sun.deploy.net.HttpResponse; import common.Excel.ExcelUtil; import domain.Book; import impl.MailServiceImpl; diff --git a/src/main/java/impl/ShareServiceImpl.java b/src/main/java/impl/ShareServiceImpl.java index 3ec9b89..8b0ec1e 100644 --- a/src/main/java/impl/ShareServiceImpl.java +++ b/src/main/java/impl/ShareServiceImpl.java @@ -1,10 +1,9 @@ package impl; -import com.google.common.collect.Maps; +import com.alibaba.dubbo.config.annotation.Service; import dao.ShareMapper; import domain.Book; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import service.ShareService; import java.util.List; diff --git a/src/main/resources/spring/spring-dubbo.xml b/src/main/resources/spring/spring-dubbo.xml new file mode 100644 index 0000000..001c5ac --- /dev/null +++ b/src/main/resources/spring/spring-dubbo.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9706defa67c7444038e0232cac9c04ee2850e8c3 Mon Sep 17 00:00:00 2001 From: wangzx Date: Tue, 3 Apr 2018 16:40:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?dubbo=E7=94=9F=E4=BA=A7=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/spring/spring-dubbo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/spring/spring-dubbo.xml b/src/main/resources/spring/spring-dubbo.xml index 001c5ac..adf6f92 100644 --- a/src/main/resources/spring/spring-dubbo.xml +++ b/src/main/resources/spring/spring-dubbo.xml @@ -8,7 +8,7 @@ "> - + @@ -23,6 +23,6 @@ - + \ No newline at end of file From 904d2f27db8d7c52bc603ec154d10fc7dc7cc249 Mon Sep 17 00:00:00 2001 From: wangzx Date: Mon, 9 Apr 2018 14:06:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=9E=8E=E6=90=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 +++++++++++++------- src/main/java/controller/TestController.java | 20 ++++++------ src/main/java/impl/ShareServiceImpl.java | 2 +- src/main/resources/spring/spring-dubbo.xml | 29 +++++------------- 4 files changed, 39 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 813014d..0aa2f53 100644 --- a/pom.xml +++ b/pom.xml @@ -227,17 +227,17 @@ 1.16.10 - - com.101tec - zkclient - 0.9 - - - org.slf4j - slf4j-log4j12 - - - + + + + + + + + + + + com.alibaba @@ -254,6 +254,16 @@ + + com.github.sgroschupf + zkclient + 0.1 + + + org.apache.zookeeper + zookeeper + 3.4.10 + diff --git a/src/main/java/controller/TestController.java b/src/main/java/controller/TestController.java index 16cc5ee..00cc7cb 100644 --- a/src/main/java/controller/TestController.java +++ b/src/main/java/controller/TestController.java @@ -30,8 +30,8 @@ * @author wangzhenxing */ public class TestController { - @Autowired - private ShareService shareService; +// @Autowired +// private ShareService shareService; @Autowired private MailService mailService; @Autowired @@ -41,14 +41,14 @@ public class TestController { * 获取数据合并分支sssssss * @return */ - @RequestMapping("/userData") - @ResponseBody - @SneakyThrows - public List userData(){ - HashMap map = Maps.newHashMap(); - List list = shareService.findShare(map); - return list; - } +// @RequestMapping("/userData") +// @ResponseBody +// @SneakyThrows +// public List userData(){ +// HashMap map = Maps.newHashMap(); +// List list = shareService.findShare(map); +// return list; +// } /** * 主页 diff --git a/src/main/java/impl/ShareServiceImpl.java b/src/main/java/impl/ShareServiceImpl.java index 8b0ec1e..b307d1a 100644 --- a/src/main/java/impl/ShareServiceImpl.java +++ b/src/main/java/impl/ShareServiceImpl.java @@ -12,7 +12,7 @@ /** * @author wangzx */ -@Service +@Service(timeout = 5000) public class ShareServiceImpl implements ShareService { @Autowired private ShareMapper shareMapper; diff --git a/src/main/resources/spring/spring-dubbo.xml b/src/main/resources/spring/spring-dubbo.xml index adf6f92..cdc13b6 100644 --- a/src/main/resources/spring/spring-dubbo.xml +++ b/src/main/resources/spring/spring-dubbo.xml @@ -1,28 +1,13 @@ + http://www.springframework.org/schema/beans/spring-beans.xsd + http://code.alibabatech.com/schema/dubbo + http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - - - - - - - - - - - - + + - - - - \ No newline at end of file