feat(返回结果):控制层返回组装的BaseResult

coderqianlq · coderqianlq · commit 478b956a33ba · 2018-09-29T11:53:03.000+08:00
diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml
@@ -47,6 +47,11 @@
 			<artifactId>spring-cloud-starter-eureka</artifactId>
 		</dependency>
 
+		<!--<dependency>-->
+			<!--<groupId>org.springframework.cloud</groupId>-->
+			<!--<artifactId>spring-cloud-starter-ribbon</artifactId>-->
+		<!--</dependency>-->
+
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/api-gateway/src/main/resources/application.properties b/api-gateway/src/main/resources/application.properties
@@ -2,8 +2,14 @@ spring.application.name=api-gateway
 server.port=9090
 eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka
 
+# 禁止服务自动添加
+zuul.ignoredServices='*'
+
 zuul.routes.api-a.path=/customer/**
-zuul.routes.api-a.serviceId=spring-customer
+zuul.routes.api-a.serviceId=eureka-customer
 
 zuul.routes.api-b.path=/order/**
-zuul.routes.api-b.serviceId=spring-order
+zuul.routes.api-b.serviceId=eureka-order
+
+#ribbon.ConnectTimeout=6000
+#ribbon.ReadTimeout=6000
diff --git a/eureka-customer/.gitignore b/eureka-customer/.gitignore
diff --git a/eureka-customer/pom.xml b/eureka-customer/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.coderqian</groupId>
-    <artifactId>spring-customer</artifactId>
+    <artifactId>eureka-customer</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/EurekaCustomerApplication.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/EurekaCustomerApplication.java
@@ -1,14 +1,14 @@
-package com.coderqian.springcustomer;
+package com.coderqian.eurekacustomer;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 @SpringBootApplication
 @EnableEurekaClient
-public class SpringCustomerApplication {
+public class EurekaCustomerApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SpringCustomerApplication.class, args);
+		SpringApplication.run(EurekaCustomerApplication.class, args);
 	}
 }
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/BaseResult.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/BaseResult.java
@@ -1,6 +1,4 @@
-package com.coderqian.springcustomer.common;
-
-import com.coderqian.springcustomer.util.DateUtils;
+package com.coderqian.eurekacustomer.common;
 
 /**
  * @author qianliqing
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/constant/Code.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/constant/Code.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.common.constant;
+package com.coderqian.eurekacustomer.common.constant;
 
 /**
  * @author qianliqing
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/exception/BaseException.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/exception/BaseException.java
@@ -1,6 +1,6 @@
-package com.coderqian.springcustomer.common.exception;
+package com.coderqian.eurekacustomer.common.exception;
 
-import com.coderqian.springcustomer.common.BaseResult;
+import com.coderqian.eurekacustomer.common.BaseResult;
 
 /**
  * @author qianliqing
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/exception/BusinessException.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/exception/BusinessException.java
@@ -1,7 +1,7 @@
-package com.coderqian.springcustomer.common.exception;
+package com.coderqian.eurekacustomer.common.exception;
 
-import com.coderqian.springcustomer.common.BaseResult;
-import com.coderqian.springcustomer.common.constant.Code;
+import com.coderqian.eurekacustomer.common.BaseResult;
+import com.coderqian.eurekacustomer.common.constant.Code;
 
 /**
  * @author qianliqing
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/exception/GlobalExceptionHandlerAdvice.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/common/exception/GlobalExceptionHandlerAdvice.java
@@ -1,7 +1,7 @@
-package com.coderqian.springcustomer.common.exception;
+package com.coderqian.eurekacustomer.common.exception;
 
-import com.coderqian.springcustomer.common.BaseResult;
-import com.coderqian.springcustomer.util.LogUtils;
+import com.coderqian.eurekacustomer.common.BaseResult;
+import com.coderqian.eurekacustomer.util.LogUtils;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/config/DruidDBConfig.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/config/DruidDBConfig.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.configuration.config;
+package com.coderqian.eurekacustomer.configuration.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/filter/DruidStatFilter.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/filter/DruidStatFilter.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.configuration.filter;
+package com.coderqian.eurekacustomer.configuration.filter;
 
 import com.alibaba.druid.support.http.WebStatFilter;
 
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/interceptors/WebAppConfigurer.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/interceptors/WebAppConfigurer.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.configuration.interceptors;
+package com.coderqian.eurekacustomer.configuration.interceptors;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/servlet/DruidStatViewServlet.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/servlet/DruidStatViewServlet.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.configuration.servlet;
+package com.coderqian.eurekacustomer.configuration.servlet;
 
 import com.alibaba.druid.support.http.StatViewServlet;
 
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/swagger/Swagger2.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/configuration/swagger/Swagger2.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.configuration.swagger;
+package com.coderqian.eurekacustomer.configuration.swagger;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +38,7 @@ public Docket createRestApi() {
 
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.coderqian.springcustomer.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.coderqian.eurekacustomer.controller"))
                 .paths(PathSelectors.any())
                 .build()
                 .globalOperationParameters(pars)
@@ -47,7 +47,7 @@ public Docket createRestApi() {
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("spring-customer")
+                .title("eureka-customer")
                 .description("Demo project for Spring Boot")
                 .termsOfServiceUrl("http://com.coderqian")
                 .version("1.0")
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java
@@ -1,6 +1,7 @@
-package com.coderqian.springcustomer.controller;
+package com.coderqian.eurekacustomer.controller;
 
-import com.coderqian.springcustomer.service.TestService;
+import com.coderqian.eurekacustomer.common.BaseResult;
+import com.coderqian.eurekacustomer.service.TestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,7 @@
  */
 
 @RestController
-@RequestMapping(value = "/customer/test")
+@RequestMapping(value = "/test")
 @Api(value = "测试", description = "测试模块", position = 1)
 public class TestController {
 
@@ -36,4 +37,10 @@ public String test(@RequestParam(value = "text") String text) {
     public void testException(@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) {
+        return testService.testBaseResult(text);
+    }
 }
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/interceptor/log/ServiceLogAOP.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/interceptor/log/ServiceLogAOP.java
@@ -1,6 +1,6 @@
-package com.coderqian.springcustomer.interceptor.log;
+package com.coderqian.eurekacustomer.interceptor.log;
 
-import com.coderqian.springcustomer.util.LogUtils;
+import com.coderqian.eurekacustomer.util.LogUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -23,7 +23,7 @@
 @Aspect
 public class ServiceLogAOP {
 
-    @Pointcut("execution(public * com.coderqian.springcustomer.service.impl.*.*(..))")
+    @Pointcut("execution(public * com.coderqian.eurekacustomer.service.impl.*.*(..))")
     public void logTarget() {
     }
 
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/service/TestService.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/service/TestService.java
@@ -1,4 +1,6 @@
-package com.coderqian.springcustomer.service;
+package com.coderqian.eurekacustomer.service;
+
+import com.coderqian.eurekacustomer.common.BaseResult;
 
 /**
  * @author qianliqing
@@ -23,4 +25,12 @@ public interface TestService {
      * @return
      */
     void testException(String text);
+
+    /**
+     * 测试接口
+     *
+     * @param text 测试数据
+     * @return
+     */
+    BaseResult testBaseResult(String text);
 }
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/service/impl/TestServiceImpl.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/service/impl/TestServiceImpl.java
@@ -1,8 +1,9 @@
-package com.coderqian.springcustomer.service.impl;
+package com.coderqian.eurekacustomer.service.impl;
 
-import com.coderqian.springcustomer.common.constant.Code;
-import com.coderqian.springcustomer.common.exception.BusinessException;
-import com.coderqian.springcustomer.service.TestService;
+import com.coderqian.eurekacustomer.common.BaseResult;
+import com.coderqian.eurekacustomer.common.constant.Code;
+import com.coderqian.eurekacustomer.common.exception.BusinessException;
+import com.coderqian.eurekacustomer.service.TestService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -23,4 +24,9 @@ public String test(String text) {
     public void testException(String text) throws BusinessException {
         throw new BusinessException(Code.UNDEFINED);
     }
+
+    @Override
+    public BaseResult testBaseResult(String text) {
+        return new BaseResult(text);
+    }
 }
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/util/DateUtils.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/util/DateUtils.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.util;
+package com.coderqian.eurekacustomer.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/eureka-customer/src/main/java/com/coderqian/eurekacustomer/util/LogUtils.java b/eureka-customer/src/main/java/com/coderqian/eurekacustomer/util/LogUtils.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer.util;
+package com.coderqian.eurekacustomer.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/eureka-customer/src/main/resources/application.properties b/eureka-customer/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.application.name=spring-customer
+spring.application.name=eureka-customer
 server.port=8200
 eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka
 
diff --git a/eureka-customer/src/main/resources/log4j2.xml b/eureka-customer/src/main/resources/log4j2.xml
diff --git a/eureka-customer/src/test/java/com/coderqian/eurekacustomer/SpringCustomerApplicationTests.java b/eureka-customer/src/test/java/com/coderqian/eurekacustomer/SpringCustomerApplicationTests.java
@@ -1,4 +1,4 @@
-package com.coderqian.springcustomer;
+package com.coderqian.eurekacustomer;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/eureka-order/.gitignore b/eureka-order/.gitignore
diff --git a/eureka-order/pom.xml b/eureka-order/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.coderqian</groupId>
-	<artifactId>spring-order</artifactId>
+	<artifactId>eureka-order</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
diff --git a/eureka-order/src/main/java/com/coderqian/eurekaorder/EurekaOrderApplication.java b/eureka-order/src/main/java/com/coderqian/eurekaorder/EurekaOrderApplication.java
@@ -1,14 +1,14 @@
-package com.coderqian.springorder;
+package com.coderqian.eurekaorder;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 @SpringBootApplication
 @EnableEurekaClient
-public class SpringOrderApplication {
+public class EurekaOrderApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SpringOrderApplication.class, args);
+		SpringApplication.run(EurekaOrderApplication.class, args);
 	}
 }
diff --git a/eureka-order/src/main/java/com/coderqian/eurekaorder/configuration/swagger/Swagger2.java b/eureka-order/src/main/java/com/coderqian/eurekaorder/configuration/swagger/Swagger2.java
@@ -1,4 +1,4 @@
-package com.coderqian.springorder.configuration.swagger;
+package com.coderqian.eurekaorder.configuration.swagger;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,7 +36,7 @@ public Docket createRestApi(){
 
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.coderqian.springorder.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.coderqian.eurekaorder.controller"))
                 .paths(PathSelectors.any())
                 .build()
                 .globalOperationParameters(pars)
@@ -45,7 +45,7 @@ public Docket createRestApi(){
 
     private ApiInfo apiInfo(){
         return new ApiInfoBuilder()
-                .title("spring-order")
+                .title("eureka-order")
                 .description("Demo project for Spring Boot")
                 .termsOfServiceUrl("http://com.coderqian")
                 .version("1.0")
diff --git a/eureka-order/src/main/java/com/coderqian/eurekaorder/controller/TestController.java b/eureka-order/src/main/java/com/coderqian/eurekaorder/controller/TestController.java
@@ -1,4 +1,4 @@
-package com.coderqian.springorder.controller;
+package com.coderqian.eurekaorder.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/eureka-order/src/main/resources/application.properties b/eureka-order/src/main/resources/application.properties
@@ -1,3 +1,3 @@
-spring.application.name=spring-order
+spring.application.name=eureka-order
 server.port=8100
 eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka
diff --git a/eureka-order/src/test/java/com/coderqian/eurekaorder/SpringOrderApplicationTests.java b/eureka-order/src/test/java/com/coderqian/eurekaorder/SpringOrderApplicationTests.java
@@ -1,4 +1,4 @@
-package com.coderqian.springorder;
+package com.coderqian.eurekaorder;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/pom.xml b/pom.xml
@@ -11,8 +11,8 @@
 
     <modules>
         <module>eureka-server</module>
-        <module>spring-order</module>
-        <module>spring-customer</module>
+        <module>eureka-order</module>
+        <module>eureka-customer</module>
         <module>api-gateway</module>
     </modules>
 </project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.coderqian.springcustomer.common.constant;`
	`1`	`+package com.coderqian.eurekacustomer.common.constant;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* @author qianliqing`