diff --git a/pom.xml b/pom.xml index e41d204..0aa2f53 100644 --- a/pom.xml +++ b/pom.xml @@ -226,6 +226,44 @@ lombok 1.16.10 + + + + + + + + + + + + + + + com.alibaba + dubbo + 2.5.3 + + + org.springframework + spring + + + log4j + log4j + + + + + 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 2b694d7..00cc7cb 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; @@ -31,25 +30,25 @@ * @author wangzhenxing */ public class TestController { - @Autowired - private ShareService shareService; +// @Autowired +// private ShareService shareService; @Autowired private MailService mailService; @Autowired private JedisCluster jedisCluster; /** - * 获取数据合并分支 + * 获取数据合并分支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 3ec9b89..b307d1a 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; @@ -13,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 new file mode 100644 index 0000000..cdc13b6 --- /dev/null +++ b/src/main/resources/spring/spring-dubbo.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file