add rokcetmq

common-core/src/main/java/com/secoo/mall/common/constant/CommonConstant.java

@@ -6,6 +6,7 @@ public interface CommonConstant {
         Integer CODE = 0;
         String MSG = "success";
     }
+
     interface Env {
         String LOCAL = "local";
         String DEV = "dev";

common-util/src/main/java/com/secoo/mall/common/util/bean/BeanUtil.java

 package com.secoo.mall.common.util.bean;
 
+import com.google.common.collect.Maps;
 import com.secoo.mall.common.core.errorcode.CommonErrorCode;
 import com.secoo.mall.common.core.exception.BusinessException;
+import com.secoo.mall.common.core.exception.SystemInternalException;
 import com.secoo.mall.common.util.json.FastJsonUtil;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.lang.reflect.Field;
 import java.util.Map;
 
 public class BeanUtil extends BeanUtils {
+    private static final String[] DEFUALT_IGNORE_KEY = {"class", "empty"};
+
     public static boolean containsInteger(Integer[] arr, Integer obj) {
         return ArrayUtils.contains(arr, obj);
     }
@@ -25,14 +30,23 @@ public class BeanUtil extends BeanUtils {
         return field.get(obj);
     }
 
-    public static <T> T transMap2Bean(Object object, Class<T> classOfT) {
-        if (object == null || !(object instanceof Map)) {
-            return null;
+    public static <T> Map<String, Object> transBean2Map(T object) {
+        if (object == null) {
+            return Maps.newHashMapWithExpectedSize(0);
+        }
+        try {
+            return PropertyUtils.describe(object);
+        } catch (Exception e) {
+            throw new SystemInternalException();
         }
+    }
+
+    public static <T> T transMap2Bean(Map<String, Object> object, Class<T> classOfT) {
         String tmp = FastJsonUtil.toString(object);
         return FastJsonUtil.toBean(tmp, classOfT);
     }
 
+
     public static void copyProps(Object dest, Object orig) {
         try {
             copyProperties(dest, orig);

common-util/src/main/java/com/secoo/mall/common/util/checker/BeanChecker.java

@@ -3,8 +3,8 @@ package com.secoo.mall.common.util.checker;
 
 import com.secoo.mall.common.core.errorcode.ErrorCode;
 import com.secoo.mall.common.core.exception.ParameterException;
-import com.secoo.mall.common.util.decimal.DecimalUtil;
 import com.secoo.mall.common.util.colletion.MapUtil;
+import com.secoo.mall.common.util.decimal.DecimalUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 

common-util/src/main/resources/logback-spring-test.xml

@@ -10,7 +10,8 @@
     <property name="LOG_DIR" value="${logPath}/${logName}/%d{yyyyMMdd}"/>
     <property name="MAX_FILE_SIZE" value="128MB"/>
     <property name="MAX_HISTORY" value="7"/>
-    <property name="PATTERN" value="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{traceId}|%thread|%logger{36}.%M:%L-%msg%n"/>
+    <property name="PATTERN"
+              value="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{traceId}|%thread|%logger{36}.%M:%L-%msg%n"/>
     <property name="CHARSET" value="UTF-8"/>
     <jmxConfigurator/>
     <!-- 控制台输出 -->

common-util/src/main/resources/logback-spring.xml

@@ -17,7 +17,7 @@
         <springProperty scope="context" name="logPath" source="logging.path" defaultValue="./logs"/>
     </springProfile>
     <property name="PATTERN"
-              value="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{traceId}|%thread|%logger{36}|%msg%n"/>
+              value="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{traceId}|%thread|%logger{36}.%M:%L-%msg%n"/>
     <property name="CHARSET" value="UTF-8"/>
     <jmxConfigurator/>
     <!-- 控制台输出 -->
@@ -31,6 +31,7 @@
             <level>DEBUG</level>
         </filter>
         <immediateFlush>false</immediateFlush>
+
     </appender>
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -73,11 +74,14 @@
         <appender-ref ref="APP"/>
         <queueSize>1024</queueSize>
         <neverBlock>true</neverBlock>
+        <!--防止问号出现-->
+        <includeCallerData>true</includeCallerData>
     </appender>
     <appender name="ASYN_ERROR" class="ch.qos.logback.classic.AsyncAppender">
         <appender-ref ref="ERROR"/>
         <queueSize>256</queueSize>
         <neverBlock>true</neverBlock>
+        <includeCallerData>true</includeCallerData>
     </appender>
     <!--    <appender name="ASYN_EMAIL" class="ch.qos.logback.classic.AsyncAppender">
             <appender-ref ref="EMAIL"/>
@@ -88,6 +92,7 @@
         <appender-ref ref="STDOUT"/>
         <queueSize>256</queueSize>
         <neverBlock>true</neverBlock>
+        <includeCallerData>true</includeCallerData>
     </appender>
 
     <logger name="app" level="${logLevel}">

config-starter/src/main/java/com/secoo/mall/config/boot/ApolloAutoConfiguration.java

@@ -11,5 +11,4 @@ import org.springframework.context.annotation.Configuration;
 public class ApolloAutoConfiguration {
 
 
-
 }

monitor-starter/src/main/java/com/secoo/matrix/monitor/config/MonitorAutoConfiguration.java

@@ -7,4 +7,4 @@ import org.springframework.context.annotation.Configuration;
 public class MonitorAutoConfiguration {
 
 
- }
+}

monitor-starter/src/main/java/com/secoo/matrix/monitor/constant/MonitorConstant.java

@@ -35,11 +35,7 @@ public interface MonitorConstant {
 
     String ROLE = "Dubbo-RPC";
 
-    String ERROR_MSG="errorMsg";
-
-
-
-
+    String ERROR_MSG = "errorMsg";
 
 
 }

monitor-starter/src/main/java/com/secoo/matrix/monitor/filter/HttpTraceFilter.java

@@ -19,7 +19,7 @@ public class HttpTraceFilter implements Filter {
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         try {
             TraceIDUtils.continueTraceID();
-            filterChain.doFilter(servletRequest,servletResponse);
+            filterChain.doFilter(servletRequest, servletResponse);
         } catch (Exception e) {
         }
     }

monitor-starter/src/main/java/com/secoo/matrix/monitor/http/TraceInterceptor.java

@@ -27,7 +27,6 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
     private ThreadLocal<Long> stime = new ThreadLocal<>();
 
 
-
     /**
      * This implementation always returns {@code true}.
      */
@@ -42,7 +41,7 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
 //            // 并发计数
 //            getConcurrent(request).incrementAndGet();
 
-        }catch (Exception e){//容灾
+        } catch (Exception e) {//容灾
         }
         return true;
     }
@@ -66,7 +65,7 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
             MDC.clear();
 
             getConcurrent(request).decrementAndGet();
-    }catch (Exception e){
+        } catch (Exception e) {
         }
     }
 

monitor-starter/src/main/java/com/secoo/matrix/monitor/utils/UUIDUtils.java

@@ -60,11 +60,8 @@ public final class UUIDUtils implements java.io.Serializable,
      * {@code UUID} and {@code leastSigBits} becomes the least significant 64
      * bits of the {@code UUID}.
      *
-	 * @param mostSigBits
-	 *            The most significant bits of the {@code UUID}
-	 *
-	 * @param leastSigBits
-	 *            The least significant bits of the {@code UUID}
+     * @param mostSigBits  The most significant bits of the {@code UUID}
+     * @param leastSigBits The least significant bits of the {@code UUID}
      */
     public UUIDUtils(long mostSigBits, long leastSigBits) {
         this.mostSigBits = mostSigBits;
@@ -73,7 +70,7 @@ public final class UUIDUtils implements java.io.Serializable,
 
     /**
      * Static factory to retrieve a type 4 (pseudo randomly generated) UUID.
-	 *
+     * <p>
      * The {@code UUID} is generated using a cryptographically strong pseudo
      * random number generator.
      *
@@ -95,9 +92,7 @@ public final class UUIDUtils implements java.io.Serializable,
      * Static factory to retrieve a type 3 (name based) {@code UUID} based on
      * the specified byte array.
      *
-	 * @param name
-	 *            A byte array to be used to construct a {@code UUID}
-	 *
+     * @param name A byte array to be used to construct a {@code UUID}
      * @return A {@code UUID} generated from the specified array
      */
     public static UUIDUtils nameUUIDFromBytes(byte[] name) {
@@ -119,15 +114,10 @@ public final class UUIDUtils implements java.io.Serializable,
      * Creates a {@code UUID} from the string standard representation as
      * described in the {@link #toString} method.
      *
-	 * @param name
-	 *            A string that specifies a {@code UUID}
-	 *
+     * @param name A string that specifies a {@code UUID}
      * @return A {@code UUID} with the specified value
-	 *
-	 * @throws IllegalArgumentException
-	 *             If name does not conform to the string representation as
+     * @throws IllegalArgumentException If name does not conform to the string representation as
      *                                  described in {@link #toString}
-	 *
      */
     public static UUIDUtils fromString(String name) {
         String[] components = name.split("-");
@@ -174,7 +164,7 @@ public final class UUIDUtils implements java.io.Serializable,
     /**
      * The version number associated with this {@code UUID}. The version number
      * describes how this {@code UUID} was generated.
-	 *
+     * <p>
      * The version number has the following meaning:
      * <ul>
      * <li>1 Time-based UUID
@@ -193,7 +183,7 @@ public final class UUIDUtils implements java.io.Serializable,
     /**
      * The variant number associated with this {@code UUID}. The variant number
      * describes the layout of the {@code UUID}.
-	 *
+     * <p>
      * The variant number has the following meaning:
      * <ul>
      * <li>0 Reserved for NCS backward compatibility
@@ -228,9 +218,8 @@ public final class UUIDUtils implements java.io.Serializable,
      * version type 1. If this {@code UUID} is not a time-based UUID then this
      * method throws UnsupportedOperationException.
      *
-	 * @throws UnsupportedOperationException
-	 *             If this UUID is not a version 1 UUID
      * @return The timestamp of this {@code UUID}.
+     * @throws UnsupportedOperationException If this UUID is not a version 1 UUID
      */
     public long timestamp() {
         if (version() != 1) {
@@ -255,9 +244,7 @@ public final class UUIDUtils implements java.io.Serializable,
      * method throws UnsupportedOperationException.
      *
      * @return The clock sequence of this {@code UUID}
-	 *
-	 * @throws UnsupportedOperationException
-	 *             If this UUID is not a version 1 UUID
+     * @throws UnsupportedOperationException If this UUID is not a version 1 UUID
      */
     public int clockSequence() {
         if (version() != 1) {
@@ -281,9 +268,7 @@ public final class UUIDUtils implements java.io.Serializable,
      * UnsupportedOperationException.
      *
      * @return The node value of this {@code UUID}
-	 *
-	 * @throws UnsupportedOperationException
-	 *             If this UUID is not a version 1 UUID
+     * @throws UnsupportedOperationException If this UUID is not a version 1 UUID
      */
     public long node() {
         if (version() != 1) {
@@ -331,7 +316,9 @@ public final class UUIDUtils implements java.io.Serializable,
                 leastSigBits, 12));
     }
 
-	/** Returns val represented by the specified number of hex digits. */
+    /**
+     * Returns val represented by the specified number of hex digits.
+     */
     private static String digits(long val, int digits) {
         long hi = 1L << (digits * 4);
         return Long.toHexString(hi | (val & (hi - 1))).substring(1);
@@ -354,9 +341,7 @@ public final class UUIDUtils implements java.io.Serializable,
      * object, has the same variant, and contains the same value, bit for bit,
      * as this {@code UUID}.
      *
-	 * @param obj
-	 *            The object to be compared
-	 *
+     * @param obj The object to be compared
      * @return {@code true} if the objects are the same; {@code false} otherwise
      */
     @Override
@@ -377,12 +362,9 @@ public final class UUIDUtils implements java.io.Serializable,
      * The first of two UUIDs is greater than the second if the most significant
      * field in which the UUIDs differ is greater for the first UUID.
      *
-	 * @param val
-	 *            {@code UUID} to which this {@code UUID} is to be compared
-	 *
+     * @param val {@code UUID} to which this {@code UUID} is to be compared
      * @return -1, 0 or 1 as this {@code UUID} is less than, equal to, or
      * greater than {@code val}
-	 *
      */
     @Override
     public int compareTo(UUIDUtils val) {

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

@@ -50,7 +50,7 @@ public class MybatisConfig {
         /* 乐观锁插件 */
         //   configuration.addInterceptor(new OptimisticLockerInterceptor());
         //非生产环境加载的插件
-        if (!CommonConstant.Env.PRO.equals(profile) ) {
+        if (!CommonConstant.Env.PRO.equals(profile)) {
             configuration.addInterceptor(new PerformanceInterceptor());
         }
 

openfeign-starter/src/main/java/com/secoo/mall/openfeign/config/FeignConfig.java

 package com.secoo.mall.openfeign.config;
 
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration

pom.xml

@@ -243,6 +243,12 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!--rocketmq-->
+            <dependency>
+                <groupId>org.apache.rocketmq</groupId>
+                <artifactId>rocketmq-spring-boot-starter</artifactId>
+                <version>2.0.3</version>
+            </dependency>
             <!--swagger-->
             <dependency>
                 <groupId>io.springfox</groupId>

rocketmq-starter/pom.xml

@@ -10,6 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rocketmq-starter</artifactId>
-
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>
\ No newline at end of file

web-starter/src/main/java/com/secoo/mall/web/advice/ControllerResponseAdvice.java

@@ -3,12 +3,12 @@ package com.secoo.mall.web.advice;
 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.util.log.LoggerUtil;
 import com.secoo.mall.common.util.response.ResponseUtil;
 import com.secoo.mall.web.annotation.ApiController;
 import com.secoo.mall.web.annotation.ApiIgnoreJson;
 import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 import javax.annotation.Resource;
-import java.util.Locale;
 
 @RestControllerAdvice(annotations = ApiController.class)
 public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
@@ -41,7 +40,7 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
         return ResponseUtil.getFailResponse(e.getCode(), msg);
     }
 
-    @ExceptionHandler(Exception.class)
+    @ExceptionHandler({SystemInternalException.class, Exception.class})
     public Object exceptionHandler(Exception e) {
         LoggerUtil.error(e);
         return ResponseUtil.getFailResponse(CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getCode(), CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getMsg());

web-starter/src/main/java/com/secoo/mall/web/config/MultLangConfig.java

 package com.secoo.mall.web.config;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.secoo.mall.web.resolver.DefaultLocaleResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,7 +9,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
-import java.text.SimpleDateFormat;
 import java.util.Locale;
 
 /**

web-starter/src/main/java/com/secoo/mall/web/config/SwaggerConfig.java

@@ -4,7 +4,6 @@ import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrap
 import com.secoo.mall.common.core.condition.ProdEnvCondition;
 import com.secoo.mall.web.annotation.ApiController;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -34,7 +33,7 @@ public class SwaggerConfig {
                 .groupName("SecooMall")
                 .select()
                 .apis(RequestHandlerSelectors.withClassAnnotation(ApiController.class))
-                .paths( PathSelectors.any())
+                .paths(PathSelectors.any())
                 .build();
     }
 

web-starter/src/main/java/com/secoo/mall/web/resolver/DefaultLocaleResolver.java

@@ -17,7 +17,7 @@ public class DefaultLocaleResolver extends CookieLocaleResolver {
 
         if (!StringUtil.isEmpty(request.getHeader("Accept-Language"))) {
             Locale locale = Locale.forLanguageTag(request.getHeader("Accept-Language"));
-            return "zh".equalsIgnoreCase(locale.toLanguageTag())?super.determineDefaultLocale(request):locale;
+            return "zh".equalsIgnoreCase(locale.toLanguageTag()) ? super.determineDefaultLocale(request) : locale;
         }
 
         String lang = request.getParameter("lang");

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

@@ -39,8 +39,8 @@ public class WebUtil {
         return (ServletRequestAttributes) attributes;
     }
 
-    public static <T> void setAttribute(String name,T obj) {
-           getRequest().setAttribute(name,obj);
+    public static <T> void setAttribute(String name, T obj) {
+        getRequest().setAttribute(name, obj);
     }
 
 }