Merge branch 'master' into dev

coderqianlq · coderqianlq · commit c4a8e97d4495 · 2018-12-16T09:56:03.000+08:00
diff --git a/README.md b/README.md
@@ -38,20 +38,6 @@ Spring Cloud 全家桶：
 
 那么我们如何使用Spring Cloud来实现服务治理呢？答案就是Spring Cloud Eureka，也就是本篇博客要介绍的重点。Spring Cloud Eureka是Spring Cloud Netflix项目下的服务治理模块。而Spring Cloud Netflix项目是Spring Cloud的子项目之一，主要内容是对Netflix公司一系列开源产品的包装，它为Spring Boot应用提供了自配置的Netflix OSS整合。通过一些简单的注解，开发者就可以快速的在应用中配置一下常用模块并构建庞大的分布式系统。它主要提供的模块包括：服务发现（Eureka），断路器（Hystrix），智能路由（Zuul），客户端负载均衡（Ribbon）等。
 
-以下是笔者翻阅资料后对zookeeper和eureka进行的比较总结：
-
-* Eureka 保证AP
-Eureka中各个节点都是平等的，几个节点挂掉不会影响正常节点的工作，剩余节点依然可以提供注册和查询服务。而Eureka的客户端在向某个Eureka注册时如果发现连接失败，则会自动切换至其它节点，从而保证注册服务可用（保证可用性），只不过查到的信息可能不是最新的（不保证强一致性）。除此之外，Eureka还有一种自我保护机制，如果在15分钟内超过85%的节点都没有正常的心跳，那么Eureka就认为客户端与注册中心出现了网络故障，此时会出现以下几种情况：
-   1. Eureka不再从注册列表中移除因为长时间没收到心跳而应该过期的服务。
-   2. Eureka仍然能够接受新服务的注册和查询请求，但是不会被同步到其它节点上（即保证当前节点依然可用）。
-   3. 当网络稳定时，当前Eureka新的注册信息会被同步到其它节点中。
-
-  **Eureka还有客户端缓存功能**
-
-* <font size=3>Zookeeper 保证CP
-当master节点因为网络故障与其他节点失去联系时，剩余节点会重新进行leader选举。在选举期间整个zk集群都是不可用的，这就导致在选举期间注册服务瘫痪。</font>
-
-
 **4. 动手搭服务发现和注册**
 
 **第一步：创建服务注册中心**
@@ -171,6 +157,6 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka
 同时启动两个服务，再访问 http://localhost:8761/  出现下图内容则表示服务注册成功：
 ![](https://preview.ibb.co/kvyTu9/2018_09_29_4_53_47_2.png)
 
-这样就基本完成了基础的Spring Cloud搭建。Spring Cloud其它组件的搭建的程可参考[我的博客](https://blog.csdn.net/weixin_36759405)。
+这样就基本完成了基础的Spring Cloud搭建。Spring Cloud其它组件的搭建教程可参考[我的博客](https://blog.csdn.net/weixin_36759405)。
 
 
diff --git a/feign-server/pom.xml b/feign-server/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.coderqian</groupId>
-	<artifactId>fegin-server</artifactId>
+	<artifactId>feign-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
diff --git a/feign-server/src/main/java/com/coderqian/feignserver/FeignServerApplication.java b/feign-server/src/main/java/com/coderqian/feignserver/FeignServerApplication.java
@@ -1,4 +1,4 @@
-package com.coderqian.feginserver;
+package com.coderqian.feignserver;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/feign-server/src/main/java/com/coderqian/feignserver/configuration/FeignServerConfiguration.java b/feign-server/src/main/java/com/coderqian/feignserver/configuration/FeignServerConfiguration.java
@@ -1,4 +1,4 @@
-package com.coderqian.feginserver.configuration;
+package com.coderqian.feignserver.configuration;
 
 import com.netflix.hystrix.HystrixCommand;
 import feign.Feign;
@@ -7,7 +7,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
 /**
diff --git a/feign-server/src/main/java/com/coderqian/feignserver/configuration/fallback/HystrixClientFallback.java b/feign-server/src/main/java/com/coderqian/feignserver/configuration/fallback/HystrixClientFallback.java
@@ -1,6 +1,6 @@
-package com.coderqian.feginserver.configuration.fallback;
+package com.coderqian.feignserver.configuration.fallback;
 
-import com.coderqian.feginserver.service.TestCustomerService;
+import com.coderqian.feignserver.service.TestCustomerService;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/feign-server/src/main/java/com/coderqian/feignserver/controller/TestController.java b/feign-server/src/main/java/com/coderqian/feignserver/controller/TestController.java
@@ -1,7 +1,7 @@
-package com.coderqian.feginserver.controller;
+package com.coderqian.feignserver.controller;
 
-import com.coderqian.feginserver.service.TestCustomerService;
-import com.coderqian.feginserver.service.TestOrderService;
+import com.coderqian.feignserver.service.TestCustomerService;
+import com.coderqian.feignserver.service.TestOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/feign-server/src/main/java/com/coderqian/feignserver/service/TestCustomerService.java b/feign-server/src/main/java/com/coderqian/feignserver/service/TestCustomerService.java
@@ -1,6 +1,6 @@
-package com.coderqian.feginserver.service;
+package com.coderqian.feignserver.service;
 
-import com.coderqian.feginserver.configuration.fallback.HystrixClientFallback;
+import com.coderqian.feignserver.configuration.fallback.HystrixClientFallback;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/feign-server/src/main/java/com/coderqian/feignserver/service/TestOrderService.java b/feign-server/src/main/java/com/coderqian/feignserver/service/TestOrderService.java
@@ -1,4 +1,4 @@
-package com.coderqian.feginserver.service;
+package com.coderqian.feignserver.service;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/feign-server/src/test/java/com/coderqian/feignserver/FeginServerApplicationTests.java b/feign-server/src/test/java/com/coderqian/feignserver/FeginServerApplicationTests.java
@@ -1,4 +1,4 @@
-package com.coderqian.feginserver;
+package com.coderqian.feignserver;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/service-customer/pom.xml b/service-customer/pom.xml
@@ -100,6 +100,13 @@
             <version>1.3.2</version>
         </dependency>
 
+        <!-- 引入PageHelper依赖 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
         <!-- 引入Mybatis-Plus依赖 -->
         <!--<dependency>-->
             <!--<groupId>com.baomidou</groupId>-->
diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/configuration/interceptors/WebAppConfigurer.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/configuration/interceptors/WebAppConfigurer.java
@@ -3,6 +3,9 @@
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.coderqian.eurekacustomer.interceptor.MonitorInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -17,11 +20,16 @@
  * 配置自定义拦截器
  */
 
+@Configuration
 public class WebAppConfigurer extends WebMvcConfigurerAdapter {
 
+    @Autowired
+    private MonitorInterceptor monitorInterceptor;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
 //        registry.addInterceptor(new AuthInterceptor()).addPathPatterns("/**");
+        registry.addInterceptor(monitorInterceptor);
         super.addInterceptors(registry);
     }
 
diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java
@@ -4,6 +4,7 @@
 import com.coderqian.eurekacustomer.service.TestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -26,7 +27,7 @@
 @Api(value = "测试", description = "测试模块", position = 1)
 public class TestController {
 
-//    @Value("${profile}")
+    //    @Value("${profile}")
     private String profile;
 
 //    @Value("${mysql}")
@@ -40,25 +41,25 @@ public class TestController {
 
     @ApiOperation(value = "返回用户输入的结果", notes = "返回用户输入的结果")
     @RequestMapping(value = "/result", method = RequestMethod.GET)
-    public String test(@RequestParam(value = "text") String text) {
+    public String test(@ApiParam(value = "测试内容", required = true) @RequestParam(value = "text") String text) {
         return testService.test(text);
     }
 
     @ApiOperation(value = "测试全局异常捕获", notes = "测试全局异常捕获")
     @RequestMapping(value = "/exception", method = RequestMethod.GET)
-    public void testException(@RequestParam(value = "text") String text) {
+    public void testException(@ApiParam(value = "测试内容", required = true) @RequestParam(value = "text") String text) {
         testService.testException(text);
     }
 
     @ApiOperation(value = "返回统一的baseResult", notes = "返回统一的baseResult，推荐使用这种方式，所有的返回结果统一用baseResult组装")
-    @RequestMapping(value = "/baseresult", method = RequestMethod.GET)
-    public BaseResult testBaseResult(@RequestParam(value = "text") String text) {
+    @RequestMapping(value = "/baseResult", method = RequestMethod.GET)
+    public BaseResult testBaseResult(@ApiParam(value = "测试内容", required = true) @RequestParam(value = "text") String text) {
         return testService.testBaseResult(text);
     }
 
     @ApiOperation(value = "根据用户id获取用户信息", notes = "根据用户id获取用户信息")
     @RequestMapping(value = "/find", method = RequestMethod.GET)
-    public BaseResult testMybatis(@RequestParam("id") String id) {
+    public BaseResult testMybatis(@ApiParam(value = "用户id", required = true) @RequestParam("id") String id) {
         return testService.testMybatis(id);
     }
 
@@ -73,4 +74,11 @@ public String testConfig() {
     public String testBus() {
         return profile;
     }
+
+    @ApiOperation(value = "测试分页插件", notes = "测试分页插件")
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    public BaseResult testPage(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum,
+                               @ApiParam(value = "每页长度", required = true) @RequestParam("pageSize") Integer pageSize) {
+        return testService.testPageHelper(pageNum, pageSize);
+    }
 }
diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/interceptor/MonitorInterceptor.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/interceptor/MonitorInterceptor.java
@@ -0,0 +1,36 @@
+package com.coderqian.eurekacustomer.interceptor;
+
+import com.coderqian.eurekacustomer.util.LogUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author qianliqing
+ * @date 2018-12-14 3:38 PM
+ * mail: qianlq0824@gmail.com
+ */
+
+@Component
+public class MonitorInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler) throws Exception {
+        httpServletRequest.setAttribute("startTime", System.currentTimeMillis());
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler, ModelAndView modelAndView) throws Exception {
+        LogUtils.info("耗时: " + (System.currentTimeMillis() - (long) httpServletRequest.getAttribute("startTime")) + "ms");
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler, Exception e) throws Exception {
+        LogUtils.info("耗时: " + (System.currentTimeMillis() - (long) httpServletRequest.getAttribute("startTime")) + "ms");
+    }
+}
diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/interceptor/log/ServiceLogAOP.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/interceptor/log/ServiceLogAOP.java
@@ -35,11 +35,11 @@ public Object serviceThreadLocalHandle(ProceedingJoinPoint joinPoint) throws Thr
         Parameter[] parameters = method.getParameters();
         String targetClassName = joinPoint.getTarget().getClass().getName();
         Object[] args = joinPoint.getArgs();
-        LogUtils.info("className:" + targetClassName);
-        LogUtils.info("methodName:" + methodName);
+        LogUtils.info("className: " + targetClassName);
+        LogUtils.info("methodName: " + methodName);
         if (args != null && args.length > 0) {
             for (int i = 0; i < args.length; i++) {
-                LogUtils.info(parameters[i].getName() + " : " + parameters[i].getType().getName() + " : " + args[i]);
+                LogUtils.info(parameters[i].getName() + ": " + parameters[i].getType().getName() + ": " + args[i]);
             }
         }
         return joinPoint.proceed();
diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/mapper/UserMapper.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/mapper/UserMapper.java
@@ -3,6 +3,8 @@
 import com.coderqian.eurekacustomer.entity.User;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author qianliqing
  * @date 2018-10-02 下午2:31
@@ -12,11 +14,18 @@
 @Mapper
 public interface UserMapper {
 
+    /**
+     * 查询所有用户
+     *
+     * @return List<User>
+     */
+    List<User> findAll();
+
     /**
      * 根据用户id查询
      *
      * @param id 用户id
-     * @return
+     * @return User
      */
     User findUserById(String id);
 }
diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/service/TestService.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/service/TestService.java
@@ -14,31 +14,40 @@ public interface TestService {
      * 测试接口
      *
      * @param text 测试数据
-     * @return
+     * @return String
      */
     String test(String text);
 
     /**
      * 测试接口
      *
      * @param text 测试数据
-     * @return
+     * @return void
      */
     void testException(String text);
 
     /**
      * 测试接口
      *
      * @param text 测试数据
-     * @return
+     * @return BaseResult
      */
     BaseResult testBaseResult(String text);
 
     /**
      * 测试mybatis接口
      *
      * @param id 用户id
-     * @return
+     * @return BaseResult
      */
     BaseResult testMybatis(String id);
+
+    /**
+     * 测试Mybatis分页插件
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页长度
+     * @return BaseResult
+     */
+    BaseResult testPageHelper(Integer pageNum, Integer pageSize);
 }
diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/service/impl/TestServiceImpl.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/service/impl/TestServiceImpl.java
@@ -4,11 +4,16 @@
 import com.coderqian.eurekacustomer.common.BaseResultFactory;
 import com.coderqian.eurekacustomer.common.constant.Code;
 import com.coderqian.eurekacustomer.common.exception.BusinessException;
+import com.coderqian.eurekacustomer.entity.User;
 import com.coderqian.eurekacustomer.mapper.UserMapper;
 import com.coderqian.eurekacustomer.service.TestService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author qianliqing
  * @date 2018-09-28 下午2:39
@@ -40,4 +45,12 @@ public BaseResult testBaseResult(String text) {
     public BaseResult testMybatis(String id) {
         return BaseResultFactory.createSuccessResult(userMapper.findUserById(id));
     }
+
+    @Override
+    public BaseResult testPageHelper(Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<User> users = userMapper.findAll();
+        PageInfo<User> page = new PageInfo<>(users);
+        return BaseResultFactory.createSuccessResult(page);
+    }
 }
diff --git a/service-customer/src/main/resources/application.properties b/service-customer/src/main/resources/application.properties
@@ -24,4 +24,9 @@ spring.datasource.filters=stat,wall
 logging.config=classpath:log4j2.xml
 
 mybatis.mapper-locations=classpath:mapper/*.xml
-mybatis.config-location=classpath:config/mybatis-config.xml
+mybatis.config-location=classpath:config/mybatis-config.xml
+
+pagehelper.helperDialect=mysql
+pagehelper.reasonable=true
+pagehelper.supportMethodsArguments=true
+pagehelper.params=count=countSql
diff --git a/service-customer/src/main/resources/mapper/UserMapper.xml b/service-customer/src/main/resources/mapper/UserMapper.xml
@@ -2,7 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.coderqian.eurekacustomer.mapper.UserMapper">
 
+    <sql id="user">
+            id id,
+            name name
+    </sql>
+
+    <select id="findAll" resultType="User">
+        select
+            <include refid="user"/>
+        from user
+    </select>
+
     <select id="findUserById" parameterType="java.lang.String" resultType="User">
-      SELECT * FROM user WHERE id = #{id}
+        select
+            <include refid="user"/>
+        from user
+        <where>
+            id = #{id}
+        </where>
     </select>
 </mapper>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.coderqian.feginserver;`
	`1`	`+package com.coderqian.feignserver;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.coderqian.feginserver.service;`
	`1`	`+package com.coderqian.feignserver.service;`
`2`	`2`
`3`	`3`	`import org.springframework.cloud.netflix.feign.FeignClient;`
`4`	`4`	`import org.springframework.web.bind.annotation.RequestMapping;`