Skip to content

M
matrix
Commit 6cf6964d by qiuweili123
Options

Merge branch 'dev' 

# Conflicts:
#	README.md
#	common-core/pom.xml
#	common-util/pom.xml
#	config-starter/pom.xml
#	dubbo-starter/pom.xml
#	elasticsearch-starter/pom.xml
#	mongodb-starter/pom.xml
#	monitor-starter/pom.xml
#	mybatis-starter/pom.xml
#	openfeign-starter/pom.xml
#	pom.xml
#	redis-starter/pom.xml
#	rocketmq-starter/pom.xml
#	web-starter/pom.xml
parents 3ea20a73 a352c86d
Showing with 227 additions and 165 deletions
README.md
...@@ -25,11 +25,19 @@ ...@@ -25,11 +25,19 @@
* \*-starter:组件依赖 * \*-starter:组件依赖
开发版本 1.0.3-DEV-SNAPSHOT
正式版本 正式版本
1.0.5.RELEASE
1、增加logstater模块
2、修正多语言环境下zh的无法取到错误信息
3、增加rocketmq-starter组件
1.0.4.RELEASE 1.0.4.RELEASE
1\update spring boot to 2.1.6 1、update spring boot to 2.1.6
1.0.3.RELEASE
1、增加monitor traceId监控模块
2、增加防灾冗余
3、优化文件结构
4、增加对controller返回null响应增强
1.0.3.RELEASE 1.0.3.RELEASE
1、增加monitor traceId监控模块 1、增加monitor traceId监控模块
2、增加防灾冗余 2、增加防灾冗余
......
common-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
common-core/src/main/java/com/secoo/mall/common/constant/CommonConstant.java
...@@ -6,6 +6,7 @@ public interface CommonConstant { ...@@ -6,6 +6,7 @@ public interface CommonConstant {
Integer CODE = 0; Integer CODE = 0;
String MSG = "success"; String MSG = "success";
} }
interface Env { interface Env {
String LOCAL = "local"; String LOCAL = "local";
String DEV = "dev"; String DEV = "dev";
......
common-util/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>20.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
......
common-util/src/main/java/com/secoo/mall/common/util/bean/BeanUtil.java
package com.secoo.mall.common.util.bean; 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.errorcode.CommonErrorCode;
import com.secoo.mall.common.core.exception.BusinessException; 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 com.secoo.mall.common.util.json.FastJsonUtil;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Map; import java.util.Map;
public class BeanUtil extends BeanUtils { public class BeanUtil extends BeanUtils {
private static final String[] DEFUALT_IGNORE_KEY = {"class", "empty"};
public static boolean containsInteger(Integer[] arr, Integer obj) { public static boolean containsInteger(Integer[] arr, Integer obj) {
return ArrayUtils.contains(arr, obj); return ArrayUtils.contains(arr, obj);
} }
...@@ -25,14 +30,23 @@ public class BeanUtil extends BeanUtils { ...@@ -25,14 +30,23 @@ public class BeanUtil extends BeanUtils {
return field.get(obj); return field.get(obj);
} }
public static <T> T transMap2Bean(Object object, Class<T> classOfT) { public static <T> Map<String, Object> transBean2Map(T object) {
if (object == null || !(object instanceof Map)) { if (object == null) {
return 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); String tmp = FastJsonUtil.toString(object);
return FastJsonUtil.toBean(tmp, classOfT); return FastJsonUtil.toBean(tmp, classOfT);
} }
public static void copyProps(Object dest, Object orig) { public static void copyProps(Object dest, Object orig) {
try { try {
copyProperties(dest, orig); 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; ...@@ -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.errorcode.ErrorCode;
import com.secoo.mall.common.core.exception.ParameterException; 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.colletion.MapUtil;
import com.secoo.mall.common.util.decimal.DecimalUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
......
config-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
config-starter/src/main/java/com/secoo/mall/config/boot/ApolloAutoConfiguration.java
...@@ -11,5 +11,4 @@ import org.springframework.context.annotation.Configuration; ...@@ -11,5 +11,4 @@ import org.springframework.context.annotation.Configuration;
public class ApolloAutoConfiguration { public class ApolloAutoConfiguration {
} }
dubbo-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
elasticsearch-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
logger-starter/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>logger-starter</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<logback.version>1.2.3</logback.version>
<slf4j.version>1.7.25</slf4j.version>
<janino.version>3.0.6</janino.version>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- 桥接slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- 支持logback condition表达式 -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>${janino.version}</version>
</dependency>
<!-- 打印skywalking tid插件-->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId>
<version>6.2.1-beta.RELEASE</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
common-util/src/main/resources/logback-spring-test.xml → logger-starter/src/main/resources/logback-mvc.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"> --> <!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"> -->
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<property resource="log.properties"/>
<springProperty scope="context" name="logLevel" source="log.level" defaultValue="info"/> <property name="LOG_PATH" value="/data/logs"/>
<springProperty scope="context" name="logName" source="spring.application.name" defaultValue="app"/> <property name="LOG_DIR" value="${LOG_PATH}/${logName}/%d{yyyyMMdd}"/>
<springProperty scope="context" name="logPath" source="log.path" defaultValue="/data/logs"/> <property name="MAX_FILE_SIZE" value="${logFileSize}"/>
<springProperty scope="context" name="STDOUT" source="log.stdout" defaultValue="STDOUT"/> <property name="MAX_HISTORY" value="${logMaxHistory}"/>
<property name="PATTERN" value="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{tid}|%thread|%logger{36}.%M:%L-%msg%n"/>
<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="CHARSET" value="UTF-8"/> <property name="CHARSET" value="UTF-8"/>
<jmxConfigurator/> <jmxConfigurator/>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>${PATTERN}</pattern>
</layout>
</appender>
<appender name="0" class="ch.qos.logback.core.rolling.RollingFileAppender"></appender>
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
...@@ -28,7 +18,7 @@ ...@@ -28,7 +18,7 @@
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
<!-- 定义文件的名称 --> <!-- 定义文件的名称 -->
<file>${logPath}/${logName}/error.log</file> <file>${LOG_PATH}/${logName}/error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_DIR}/err_${logName}%i.log</FileNamePattern> <FileNamePattern>${LOG_DIR}/err_${logName}%i.log</FileNamePattern>
<MaxHistory>${MAX_HISTORY}</MaxHistory> <MaxHistory>${MAX_HISTORY}</MaxHistory>
...@@ -36,14 +26,14 @@ ...@@ -36,14 +26,14 @@
<maxFileSize>${MAX_FILE_SIZE}</maxFileSize> <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy> </timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<layout class="ch.qos.logback.classic.PatternLayout"> <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<Pattern>${PATTERN}</Pattern> <Pattern>${PATTERN}</Pattern>
</layout> </layout>
</appender> </appender>
<appender name="APP" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="APP" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 定义文件的名称 --> <!-- 定义文件的名称 -->
<file>${logPath}/${logName}/app.log</file> <file>${LOG_PATH}/${logName}/app.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_DIR}/all_${logName}%i.log</FileNamePattern> <FileNamePattern>${LOG_DIR}/all_${logName}%i.log</FileNamePattern>
<MaxHistory>${MAX_HISTORY}</MaxHistory> <MaxHistory>${MAX_HISTORY}</MaxHistory>
...@@ -51,7 +41,7 @@ ...@@ -51,7 +41,7 @@
<maxFileSize>${MAX_FILE_SIZE}</maxFileSize> <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy> </timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<layout class="ch.qos.logback.classic.PatternLayout"> <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<pattern>${PATTERN}</pattern> <pattern>${PATTERN}</pattern>
</layout> </layout>
</appender> </appender>
...@@ -60,11 +50,13 @@ ...@@ -60,11 +50,13 @@
<appender-ref ref="APP"/> <appender-ref ref="APP"/>
<queueSize>1024</queueSize> <queueSize>1024</queueSize>
<neverBlock>true</neverBlock> <neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender> </appender>
<appender name="ASYN_ERROR" class="ch.qos.logback.classic.AsyncAppender"> <appender name="ASYN_ERROR" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="ERROR"/> <appender-ref ref="ERROR"/>
<queueSize>256</queueSize> <queueSize>256</queueSize>
<neverBlock>true</neverBlock> <neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender> </appender>
...@@ -74,9 +66,12 @@ ...@@ -74,9 +66,12 @@
<logger name="error" level="${logLevel}"> <logger name="error" level="${logLevel}">
<appender-ref ref="ASYN_ERROR"/> <appender-ref ref="ASYN_ERROR"/>
</logger> </logger>
<!-- 日志排除 -->
<logger name="org.logicalcobwebs.proxool" level="error"/>
<!--统一日志输出级别，其他appender中如果有高于此处等级设置的也会被输出 --> <!--统一日志输出级别，其他appender中如果有高于此处等级设置的也会被输出 -->
<root level="${logLevel}"> <root level="${logLevel}">
<appender-ref ref="${STDOUT}"/>
<appender-ref ref="ASYN_APP"/> <appender-ref ref="ASYN_APP"/>
<appender-ref ref="ASYN_ERROR"/> <appender-ref ref="ASYN_ERROR"/>
</root> </root>
......
common-util/src/main/resources/logback-spring.xml → logger-starter/src/main/resources/logback-spring.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"> --> <!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"> -->
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
<!-- <property name="LOG_HOME" value="./log" /> -->
<!--取得spring boot中的变量值有2种方式，一种是resource,另外一种是使用springProperty，使用springProperty好处能指定默认值-->
<!-- <property resource="application.properties"/>
-->
<springProperty scope="context" name="logLevel" source="log.level" defaultValue="info"/>
<springProperty scope="context" name="logName" source="spring.application.name" defaultValue="app"/> <springProperty scope="context" name="logName" source="spring.application.name" defaultValue="app"/>
<springProperty scope="context" name="logPath" source="logging.path" defaultValue="/data/logs"/> <springProperty scope="context" name="logLevel" source="log.level" defaultValue="info"/>
<springProperty scope="context" name="immediateFlush" source="log.immediateFlush" defaultValue="true"/> <springProperty scope="context" name="LOG_PATH" source="log.path" defaultValue="/data/logs"/>
<springProperty scope="context" name="MAX_FILE_SIZE" source="log.max_file_size" defaultValue="128MB"/>
<springProperty scope="context" name="MAX_HISTORY" source="log.max_history" defaultValue="7"/>
<springProperty scope="context" name="PATTERN" source="log.pattern"
defaultValue="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{tid}|%thread|%logger{36}.%M:%L-%msg%n"/>
<springProfile name="test,dev,local">
<springProperty scope="context" name="logPath" source="logging.path" defaultValue="./logs"/> <property name="LOG_DIR" value="${LOG_PATH}/${logName}/%d{yyyyMMdd}"/>
</springProfile>
<property name="PATTERN"
value="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{traceId}|%thread|%logger{36}|%msg%n"/>
<property name="CHARSET" value="UTF-8"/> <property name="CHARSET" value="UTF-8"/>
<jmxConfigurator/> <jmxConfigurator/>
<!-- 控制台输出 --> <!-- 控制台输出 -->
...@@ -30,8 +23,8 @@ ...@@ -30,8 +23,8 @@
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>DEBUG</level> <level>DEBUG</level>
</filter> </filter>
<immediateFlush>false</immediateFlush>
</appender> </appender>
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level> <!-- 只记录error级别的日志 --> <level>ERROR</level> <!-- 只记录error级别的日志 -->
...@@ -39,56 +32,54 @@ ...@@ -39,56 +32,54 @@
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
<!-- 定义文件的名称 --> <!-- 定义文件的名称 -->
<file>${logPath}/${logName}/error.log <file>${LOG_PATH}/${logName}/error.log</file>
</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- rollover daily --> <FileNamePattern>${LOG_DIR}/err_${logName}%i.log</FileNamePattern>
<!-- 设置达到指定大小限制后输出的日志名称 --> <MaxHistory>${MAX_HISTORY}</MaxHistory>
<fileNamePattern>${logPath}/${logName}/error-%d{yyyy-MM-dd}.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxHistory>30</maxHistory> <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 --> <Pattern>${PATTERN}</Pattern>
<pattern>${PATTERN}</pattern> </layout>
<charset>UTF-8</charset>
</encoder>
</appender> </appender>
<appender name="APP" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="APP" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 定义文件的名称 --> <!-- 定义文件的名称 -->
<file>${logPath}/${logName}/app.log <file>${LOG_PATH}/${logName}/app.log</file>
</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- rollover daily --> <FileNamePattern>${LOG_DIR}/all_${logName}%i.log</FileNamePattern>
<!-- 设置达到指定大小限制后输出的日志名称 --> <MaxHistory>${MAX_HISTORY}</MaxHistory>
<fileNamePattern>${logPath}/${logName}/app-%d{yyyy-MM-dd}.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxHistory>30</maxHistory> <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy> </rollingPolicy>
<encoder> <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<pattern>${PATTERN}</pattern> <pattern>${PATTERN}</pattern>
<charset>UTF-8</charset> </layout>
</encoder> </appender>
<immediateFlush>${immediateFlush}</immediateFlush>
<appender name="ASYN_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="STDOUT"/>
<queueSize>256</queueSize>
<neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender> </appender>
<appender name="ASYN_APP" class="ch.qos.logback.classic.AsyncAppender"> <appender name="ASYN_APP" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="APP"/> <appender-ref ref="APP"/>
<queueSize>1024</queueSize> <queueSize>1024</queueSize>
<neverBlock>true</neverBlock> <neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender> </appender>
<appender name="ASYN_ERROR" class="ch.qos.logback.classic.AsyncAppender"> <appender name="ASYN_ERROR" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="ERROR"/> <appender-ref ref="ERROR"/>
<queueSize>256</queueSize> <queueSize>256</queueSize>
<neverBlock>true</neverBlock> <neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender> </appender>
<!-- <appender name="ASYN_EMAIL" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="EMAIL"/>
<queueSize>256</queueSize>
<neverBlock>true</neverBlock>
</appender>-->
<appender name="ASYN_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="STDOUT"/>
<queueSize>256</queueSize>
<neverBlock>true</neverBlock>
</appender>
<logger name="app" level="${logLevel}"> <logger name="app" level="${logLevel}">
<appender-ref ref="ASYN_APP"/> <appender-ref ref="ASYN_APP"/>
...@@ -96,15 +87,18 @@ ...@@ -96,15 +87,18 @@
<logger name="error" level="${logLevel}"> <logger name="error" level="${logLevel}">
<appender-ref ref="ASYN_ERROR"/> <appender-ref ref="ASYN_ERROR"/>
</logger> </logger>
<!-- 日志排除 -->
<logger name="org.logicalcobwebs.proxool" level="error"/>
<!--统一日志输出级别，其他appender中如果有高于此处等级设置的也会被输出 --> <!--统一日志输出级别，其他appender中如果有高于此处等级设置的也会被输出 -->
<root level="${logLevel}"> <root level="${logLevel}">
<!-- <appender-ref ref="ASYN_EMAIL"/>-->
<springProfile name="test,dev,local"> <springProfile name="test,dev,local">
<appender-ref ref="ASYN_STDOUT"/> <appender-ref ref="ASYN_STDOUT"/>
</springProfile> </springProfile>
<appender-ref ref="ASYN_APP"/> <appender-ref ref="ASYN_APP"/>
<appender-ref ref="ASYN_ERROR"/> <appender-ref ref="ASYN_ERROR"/>
</root> </root>
</configuration> </configuration>
\ No newline at end of file
mongodb-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
monitor-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
monitor-starter/src/main/java/com/secoo/matrix/monitor/config/MonitorAutoConfiguration.java
...@@ -7,4 +7,4 @@ import org.springframework.context.annotation.Configuration; ...@@ -7,4 +7,4 @@ import org.springframework.context.annotation.Configuration;
public class MonitorAutoConfiguration { public class MonitorAutoConfiguration {
} }
monitor-starter/src/main/java/com/secoo/matrix/monitor/constant/MonitorConstant.java
...@@ -35,11 +35,7 @@ public interface MonitorConstant { ...@@ -35,11 +35,7 @@ public interface MonitorConstant {
String ROLE = "Dubbo-RPC"; 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 { ...@@ -19,7 +19,7 @@ public class HttpTraceFilter implements Filter {
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
try { try {
TraceIDUtils.continueTraceID(); TraceIDUtils.continueTraceID();
filterChain.doFilter(servletRequest,servletResponse); filterChain.doFilter(servletRequest, servletResponse);
} catch (Exception e) { } catch (Exception e) {
} }
} }
......
monitor-starter/src/main/java/com/secoo/matrix/monitor/http/TraceInterceptor.java
...@@ -27,7 +27,6 @@ public class TraceInterceptor extends HandlerInterceptorAdapter { ...@@ -27,7 +27,6 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
private ThreadLocal<Long> stime = new ThreadLocal<>(); private ThreadLocal<Long> stime = new ThreadLocal<>();
/** /**
* This implementation always returns {@code true}. * This implementation always returns {@code true}.
*/ */
...@@ -42,7 +41,7 @@ public class TraceInterceptor extends HandlerInterceptorAdapter { ...@@ -42,7 +41,7 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
// // 并发计数 // // 并发计数
// getConcurrent(request).incrementAndGet(); // getConcurrent(request).incrementAndGet();
}catch (Exception e){//容灾 } catch (Exception e) {//容灾
} }
return true; return true;
} }
...@@ -66,7 +65,7 @@ public class TraceInterceptor extends HandlerInterceptorAdapter { ...@@ -66,7 +65,7 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
MDC.clear(); MDC.clear();
getConcurrent(request).decrementAndGet(); 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, ...@@ -60,11 +60,8 @@ public final class UUIDUtils implements java.io.Serializable,
* {@code UUID} and {@code leastSigBits} becomes the least significant 64 * {@code UUID} and {@code leastSigBits} becomes the least significant 64
* bits of the {@code UUID}. * bits of the {@code UUID}.
* *
* @param mostSigBits * @param mostSigBits The most significant bits of the {@code UUID}
* The most significant bits of the {@code UUID} * @param leastSigBits The least significant bits of the {@code UUID}
*
* @param leastSigBits
* The least significant bits of the {@code UUID}
*/ */
public UUIDUtils(long mostSigBits, long leastSigBits) { public UUIDUtils(long mostSigBits, long leastSigBits) {
this.mostSigBits = mostSigBits; this.mostSigBits = mostSigBits;
...@@ -73,7 +70,7 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -73,7 +70,7 @@ public final class UUIDUtils implements java.io.Serializable,
/** /**
* Static factory to retrieve a type 4 (pseudo randomly generated) UUID. * Static factory to retrieve a type 4 (pseudo randomly generated) UUID.
* * <p>
* The {@code UUID} is generated using a cryptographically strong pseudo * The {@code UUID} is generated using a cryptographically strong pseudo
* random number generator. * random number generator.
* *
...@@ -95,9 +92,7 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -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 * Static factory to retrieve a type 3 (name based) {@code UUID} based on
* the specified byte array. * the specified byte array.
* *
* @param name * @param name A byte array to be used to construct a {@code UUID}
* A byte array to be used to construct a {@code UUID}
*
* @return A {@code UUID} generated from the specified array * @return A {@code UUID} generated from the specified array
*/ */
public static UUIDUtils nameUUIDFromBytes(byte[] name) { public static UUIDUtils nameUUIDFromBytes(byte[] name) {
...@@ -119,15 +114,10 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -119,15 +114,10 @@ public final class UUIDUtils implements java.io.Serializable,
* Creates a {@code UUID} from the string standard representation as * Creates a {@code UUID} from the string standard representation as
* described in the {@link #toString} method. * described in the {@link #toString} method.
* *
* @param name * @param name A string that specifies a {@code UUID}
* A string that specifies a {@code UUID}
*
* @return A {@code UUID} with the specified value * @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} * described in {@link #toString}
*
*/ */
public static UUIDUtils fromString(String name) { public static UUIDUtils fromString(String name) {
String[] components = name.split("-"); String[] components = name.split("-");
...@@ -174,7 +164,7 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -174,7 +164,7 @@ public final class UUIDUtils implements java.io.Serializable,
/** /**
* The version number associated with this {@code UUID}. The version number * The version number associated with this {@code UUID}. The version number
* describes how this {@code UUID} was generated. * describes how this {@code UUID} was generated.
* * <p>
* The version number has the following meaning: * The version number has the following meaning:
* <ul> * <ul>
* <li>1 Time-based UUID * <li>1 Time-based UUID
...@@ -193,7 +183,7 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -193,7 +183,7 @@ public final class UUIDUtils implements java.io.Serializable,
/** /**
* The variant number associated with this {@code UUID}. The variant number * The variant number associated with this {@code UUID}. The variant number
* describes the layout of the {@code UUID}. * describes the layout of the {@code UUID}.
* * <p>
* The variant number has the following meaning: * The variant number has the following meaning:
* <ul> * <ul>
* <li>0 Reserved for NCS backward compatibility * <li>0 Reserved for NCS backward compatibility
...@@ -228,9 +218,8 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -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 * version type 1. If this {@code UUID} is not a time-based UUID then this
* method throws UnsupportedOperationException. * method throws UnsupportedOperationException.
* *
* @throws UnsupportedOperationException
* If this UUID is not a version 1 UUID
* @return The timestamp of this {@code UUID}. * @return The timestamp of this {@code UUID}.
* @throws UnsupportedOperationException If this UUID is not a version 1 UUID
*/ */
public long timestamp() { public long timestamp() {
if (version() != 1) { if (version() != 1) {
...@@ -255,9 +244,7 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -255,9 +244,7 @@ public final class UUIDUtils implements java.io.Serializable,
* method throws UnsupportedOperationException. * method throws UnsupportedOperationException.
* *
* @return The clock sequence of this {@code UUID} * @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() { public int clockSequence() {
if (version() != 1) { if (version() != 1) {
...@@ -281,9 +268,7 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -281,9 +268,7 @@ public final class UUIDUtils implements java.io.Serializable,
* UnsupportedOperationException. * UnsupportedOperationException.
* *
* @return The node value of this {@code UUID} * @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() { public long node() {
if (version() != 1) { if (version() != 1) {
...@@ -331,7 +316,9 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -331,7 +316,9 @@ public final class UUIDUtils implements java.io.Serializable,
leastSigBits, 12)); 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) { private static String digits(long val, int digits) {
long hi = 1L << (digits * 4); long hi = 1L << (digits * 4);
return Long.toHexString(hi | (val & (hi - 1))).substring(1); return Long.toHexString(hi | (val & (hi - 1))).substring(1);
...@@ -354,9 +341,7 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -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, * object, has the same variant, and contains the same value, bit for bit,
* as this {@code UUID}. * as this {@code UUID}.
* *
* @param obj * @param obj The object to be compared
* The object to be compared
*
* @return {@code true} if the objects are the same; {@code false} otherwise * @return {@code true} if the objects are the same; {@code false} otherwise
*/ */
@Override @Override
...@@ -377,12 +362,9 @@ public final class UUIDUtils implements java.io.Serializable, ...@@ -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 * 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. * field in which the UUIDs differ is greater for the first UUID.
* *
* @param val * @param val {@code UUID} to which this {@code UUID} is to be compared
* {@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 * @return -1, 0 or 1 as this {@code UUID} is less than, equal to, or
* greater than {@code val} * greater than {@code val}
*
*/ */
@Override @Override
public int compareTo(UUIDUtils val) { public int compareTo(UUIDUtils val) {
......
mybatis-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
mybatis-starter/src/main/java/com/secoo/mall/mybatis/config/MybatisConfig.java
...@@ -50,7 +50,7 @@ public class MybatisConfig { ...@@ -50,7 +50,7 @@ public class MybatisConfig {
/* 乐观锁插件 */ /* 乐观锁插件 */
// configuration.addInterceptor(new OptimisticLockerInterceptor()); // configuration.addInterceptor(new OptimisticLockerInterceptor());
//非生产环境加载的插件 //非生产环境加载的插件
if (!CommonConstant.Env.PRO.equals(profile) ) { if (!CommonConstant.Env.PRO.equals(profile)) {
configuration.addInterceptor(new PerformanceInterceptor()); configuration.addInterceptor(new PerformanceInterceptor());
} }
......
openfeign-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
openfeign-starter/src/main/java/com/secoo/mall/openfeign/config/FeignConfig.java
package com.secoo.mall.openfeign.config; package com.secoo.mall.openfeign.config;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
......
pom.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
<module>web-starter</module> <module>web-starter</module>
<module>openfeign-starter</module> <module>openfeign-starter</module>
<module>rocketmq-starter</module> <module>rocketmq-starter</module>
<module>config-starter</module>
<module>monitor-starter</module> <module>monitor-starter</module>
<module>config-starter</module>
<module>logger-starter</module>
</modules> </modules>
<parent> <parent>
...@@ -98,62 +99,67 @@ ...@@ -98,62 +99,67 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>monitor-starter</artifactId> <artifactId>monitor-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>config-starter</artifactId> <artifactId>config-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>common-util</artifactId> <artifactId>common-util</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>redis-starter</artifactId> <artifactId>redis-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>mybatis-starter</artifactId> <artifactId>mybatis-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>mongodb-starter</artifactId> <artifactId>mongodb-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>elasticsearch-starter</artifactId> <artifactId>elasticsearch-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>dubbo-starter</artifactId> <artifactId>dubbo-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>web-starter</artifactId> <artifactId>web-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>rocketmq-starter</artifactId> <artifactId>rocketmq-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>openfeign-starter</artifactId> <artifactId>openfeign-starter</artifactId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>logger-starter</artifactId>
<version>1.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -243,6 +249,12 @@ ...@@ -243,6 +249,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!--rocketmq-->
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>2.0.3</version>
</dependency>
<!--swagger--> <!--swagger-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
......
redis-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -20,5 +20,9 @@ ...@@ -20,5 +20,9 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
rocketmq-starter/pom.xml
...@@ -5,11 +5,16 @@ ...@@ -5,11 +5,16 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>rocketmq-starter</artifactId> <artifactId>rocketmq-starter</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
web-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>1.0.4.RELEASE</version> <version>1.0.5.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
web-starter/src/main/java/com/secoo/mall/web/advice/ControllerResponseAdvice.java
...@@ -3,12 +3,12 @@ package com.secoo.mall.web.advice; ...@@ -3,12 +3,12 @@ package com.secoo.mall.web.advice;
import com.secoo.mall.common.core.errorcode.CommonErrorCode; import com.secoo.mall.common.core.errorcode.CommonErrorCode;
import com.secoo.mall.common.core.exception.BusinessException; import com.secoo.mall.common.core.exception.BusinessException;
import com.secoo.mall.common.core.exception.ParameterException; 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.log.LoggerUtil;
import com.secoo.mall.common.util.response.ResponseUtil; import com.secoo.mall.common.util.response.ResponseUtil;
import com.secoo.mall.web.annotation.ApiController; import com.secoo.mall.web.annotation.ApiController;
import com.secoo.mall.web.annotation.ApiIgnoreJson; import com.secoo.mall.web.annotation.ApiIgnoreJson;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContext;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
...@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; ...@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Locale;
@RestControllerAdvice(annotations = ApiController.class) @RestControllerAdvice(annotations = ApiController.class)
public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> { public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
...@@ -41,7 +40,7 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> { ...@@ -41,7 +40,7 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
return ResponseUtil.getFailResponse(e.getCode(), msg); return ResponseUtil.getFailResponse(e.getCode(), msg);
} }
@ExceptionHandler(Exception.class) @ExceptionHandler({SystemInternalException.class, Exception.class})
public Object exceptionHandler(Exception e) { public Object exceptionHandler(Exception e) {
LoggerUtil.error(e); LoggerUtil.error(e);
return ResponseUtil.getFailResponse(CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getCode(), CommonErrorCode.SYSTEM_INTERNAL_EXCEPTION.getMsg()); 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; 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 com.secoo.mall.web.resolver.DefaultLocaleResolver;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
...@@ -11,7 +9,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; ...@@ -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.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
import java.text.SimpleDateFormat;
import java.util.Locale; 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 ...@@ -4,7 +4,6 @@ import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrap
import com.secoo.mall.common.core.condition.ProdEnvCondition; import com.secoo.mall.common.core.condition.ProdEnvCondition;
import com.secoo.mall.web.annotation.ApiController; import com.secoo.mall.web.annotation.ApiController;
import org.springframework.beans.factory.annotation.Value; 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.Bean;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
...@@ -34,7 +33,7 @@ public class SwaggerConfig { ...@@ -34,7 +33,7 @@ public class SwaggerConfig {
.groupName("SecooMall") .groupName("SecooMall")
.select() .select()
.apis(RequestHandlerSelectors.withClassAnnotation(ApiController.class)) .apis(RequestHandlerSelectors.withClassAnnotation(ApiController.class))
.paths( PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build();
} }
......
web-starter/src/main/java/com/secoo/mall/web/resolver/DefaultLocaleResolver.java
...@@ -14,8 +14,10 @@ public class DefaultLocaleResolver extends CookieLocaleResolver { ...@@ -14,8 +14,10 @@ public class DefaultLocaleResolver extends CookieLocaleResolver {
@Nullable @Nullable
protected Locale determineDefaultLocale(HttpServletRequest request) { protected Locale determineDefaultLocale(HttpServletRequest request) {
if (!StringUtil.isEmpty(request.getHeader("Accept-Language"))) { if (!StringUtil.isEmpty(request.getHeader("Accept-Language"))) {
return Locale.forLanguageTag(request.getHeader("Accept-Language")); Locale locale = Locale.forLanguageTag(request.getHeader("Accept-Language"));
return "zh".equalsIgnoreCase(locale.toLanguageTag()) ? super.determineDefaultLocale(request) : locale;
} }
String lang = request.getParameter("lang"); String lang = request.getParameter("lang");
......
web-starter/src/main/java/com/secoo/mall/web/util/WebUtil.java
...@@ -39,8 +39,8 @@ public class WebUtil { ...@@ -39,8 +39,8 @@ public class WebUtil {
return (ServletRequestAttributes) attributes; return (ServletRequestAttributes) attributes;
} }
public static <T> void setAttribute(String name,T obj) { public static <T> void setAttribute(String name, T obj) {
getRequest().setAttribute(name,obj); getRequest().setAttribute(name, obj);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment