Merge branch 'dev' into 'master'

Dev

See merge request mall/arch/matrix!23

common-util/pom.xml

@@ -63,6 +63,10 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
     </dependencies>
 

common-util/src/main/java/com/secoo/mall/common/util/web/WebUtil.java

@@ -41,7 +41,7 @@ public class WebUtil {
     }
 
     public static <T> void setAttribute(String name, T obj) {
-        getRequest().setAttribute(sessionUser, obj);
+        getRequest().setAttribute(name, obj);
     }
 
     public static <T> void setSessionUser(T obj) {

mybatis-starter/src/main/java/com/secoo/mall/mybatis/config/MybatisConfig.java

 package com.secoo.mall.mybatis.config;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
@@ -17,6 +18,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
+import javax.annotation.Resource;
 import javax.sql.DataSource;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -29,6 +31,9 @@ public class MybatisConfig {
     @Value("${spring.profiles.active}")
     private String profile;
 
+    @Resource
+    private MybatisPlusProperties mybatisPlusProperties;
+
     @Bean("mybatisSqlSession")
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource, GlobalConfig globalConfig) throws Exception {
         MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();

protocol-starter/src/main/java/com/secoo/mall/common/handler/ProtocolExceptionHandler.java

@@ -4,8 +4,10 @@ import com.secoo.mall.common.core.errorcode.CommonErrorCode;
 import com.secoo.mall.common.core.exception.BusinessException;
 import com.secoo.mall.common.core.exception.ParameterException;
 import com.secoo.mall.common.core.exception.SystemInternalException;
+import com.secoo.mall.common.processor.ExceptionProcessor;
 import com.secoo.mall.common.util.log.LoggerUtil;
 import com.secoo.mall.common.util.response.ResponseUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -17,23 +19,34 @@ public class ProtocolExceptionHandler {
     @Resource
     private MessageSource messageSource;
 
-    @ExceptionHandler(BusinessException.class)
-    public Object businessExcepstionHandler(BusinessException e) {
-        LoggerUtil.warn("businessException info:", e);
-        return ResponseUtil.getFailResponse(e.getCode(), getMsg(e));
-    }
+    @Autowired(required = false)
+    private ExceptionProcessor exceptionProcessor;
 
-    @ExceptionHandler(ParameterException.class)
-    public Object parameterExceptionHandler(ParameterException e) {
-        String msg = getMsg(e);
-        LoggerUtil.info(msg);
-        return ResponseUtil.getFailResponse(e.getCode(), msg);
+    @ExceptionHandler({Exception.class})
+    public Object exceptionHandler(Exception e) {
+        try {
+            if (exceptionProcessor == null) {
+                throw e;
             }
 
-    @ExceptionHandler({SystemInternalException.class, Exception.class})
-    public Object exceptionHandler(Exception e) {
+            exceptionProcessor.process(e);
+
+        } catch (ParameterException ex) {
+            String msg = getMsg(ex);
+            LoggerUtil.info(msg);
+            return ResponseUtil.getFailResponse(ex.getCode(), msg);
+        } catch (SystemInternalException ex) {
             LoggerUtil.error(e);
             return ResponseUtil.getFailResponse(CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getCode(), CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getMsg());
+        } catch (BusinessException ex) {
+            LoggerUtil.warn("businessException info:", ex);
+            return ResponseUtil.getFailResponse(ex.getCode(), getMsg(ex));
+        } catch (Exception ex) {
+            LoggerUtil.error(ex);
+            return ResponseUtil.getFailResponse(CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getCode(), CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getMsg());
+        }
+
+        return null;
     }
 
 

protocol-starter/src/main/java/com/secoo/mall/common/processor/AbsExceptionProcessor.java

+package com.secoo.mall.common.processor;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public  abstract  class AbsExceptionProcessor implements ExceptionProcessor{
+
+    public  void process(Exception e) throws Exception{
+        log.warn("warn:",e);
+        convertException(e);
+        throw e;
+    }
+
+    protected  abstract  void convertException(Exception e);
+
+}

protocol-starter/src/main/java/com/secoo/mall/common/processor/ExceptionProcessor.java

+package com.secoo.mall.common.processor;
+
+
+import com.secoo.mall.common.core.errorcode.ErrorCode;
+import com.secoo.mall.common.core.exception.BusinessException;
+import com.secoo.mall.common.util.spring.SpringUtil;
+
+import java.util.Map;
+
+public interface ExceptionProcessor {
+    /**
+     * 处理异常
+     * @param e
+     * @return
+     */
+    void process(Exception e) throws Exception;
+}

protocol-starter/src/main/java/com/secoo/mall/dubbo/filter/DefaultExceptionFilter.java → protocol-starter/src/main/java/com/secoo/mall/dubbo/filter/ResponseExceptionFilter.java

@@ -16,15 +16,19 @@ import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver;
 
 import java.lang.reflect.Method;
 
+/**
+ * 统一拦截异常。
+ * 不向消费端抛出异常，而是形成response结构
+ */
 @Activate(
-        group = {CommonConstants.PROVIDER}, order = 1000
+        group = {CommonConstants.PROVIDER}
 )
-public class DefaultExceptionFilter extends ExceptionFilter implements Filter {
-    private Logger log = LoggerFactory.getLogger(DefaultExceptionFilter.class);
+public class ResponseExceptionFilter extends ExceptionFilter implements Filter {
+    private Logger log = LoggerFactory.getLogger(ResponseExceptionFilter.class);
 
 
-    public DefaultExceptionFilter() {
-        super.listener = new DefaultExceptionFilter.ExceptionListener();
+    public ResponseExceptionFilter() {
+        super.listener = new ResponseExceptionFilter.ExceptionListener();
 
     }
 

protocol-starter/src/main/java/com/secoo/mall/web/annotation/ApiIgnoreJson.java

 package com.secoo.mall.web.annotation;
 
+import java.lang.annotation.*;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
 public @interface ApiIgnoreJson {
 }

protocol-starter/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter

-exception=com.secoo.mall.dubbo.filter.DefaultExceptionFilter
+exception=com.secoo.mall.dubbo.filter.ResponseExceptionFilter
\ No newline at end of file