Commit ea793295 by qiuweili123

add rokcetmq

parent 13845a29
...@@ -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";
......
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);
......
...@@ -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;
......
...@@ -2,5 +2,5 @@ package com.secoo.mall.common.util.file; ...@@ -2,5 +2,5 @@ package com.secoo.mall.common.util.file;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
public class IOUtil extends IOUtils { public class IOUtil extends IOUtils {
} }
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<property name="LOG_DIR" value="${logPath}/${logName}/%d{yyyyMMdd}"/> <property name="LOG_DIR" value="${logPath}/${logName}/%d{yyyyMMdd}"/>
<property name="MAX_FILE_SIZE" value="128MB"/> <property name="MAX_FILE_SIZE" value="128MB"/>
<property name="MAX_HISTORY" value="7"/> <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"/> <property name="CHARSET" value="UTF-8"/>
<jmxConfigurator/> <jmxConfigurator/>
<!-- 控制台输出 --> <!-- 控制台输出 -->
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<springProperty scope="context" name="logPath" source="logging.path" defaultValue="./logs"/> <springProperty scope="context" name="logPath" source="logging.path" defaultValue="./logs"/>
</springProfile> </springProfile>
<property name="PATTERN" <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"/> <property name="CHARSET" value="UTF-8"/>
<jmxConfigurator/> <jmxConfigurator/>
<!-- 控制台输出 --> <!-- 控制台输出 -->
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<level>DEBUG</level> <level>DEBUG</level>
</filter> </filter>
<immediateFlush>false</immediateFlush> <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">
...@@ -73,11 +74,14 @@ ...@@ -73,11 +74,14 @@
<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 name="ASYN_EMAIL" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="EMAIL"/> <appender-ref ref="EMAIL"/>
...@@ -88,6 +92,7 @@ ...@@ -88,6 +92,7 @@
<appender-ref ref="STDOUT"/> <appender-ref ref="STDOUT"/>
<queueSize>256</queueSize> <queueSize>256</queueSize>
<neverBlock>true</neverBlock> <neverBlock>true</neverBlock>
<includeCallerData>true</includeCallerData>
</appender> </appender>
<logger name="app" level="${logLevel}"> <logger name="app" level="${logLevel}">
......
...@@ -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 {
} }
...@@ -4,7 +4,7 @@ package com.secoo.matrix.monitor.config; ...@@ -4,7 +4,7 @@ package com.secoo.matrix.monitor.config;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class MonitorAutoConfiguration { public class MonitorAutoConfiguration {
} }
...@@ -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";
} }
...@@ -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) {
} }
} }
......
...@@ -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;
} }
...@@ -62,12 +61,12 @@ public class TraceInterceptor extends HandlerInterceptorAdapter { ...@@ -62,12 +61,12 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
Object handler, Exception ex) throws Exception { Object handler, Exception ex) throws Exception {
try { try {
MDC.clear(); MDC.clear();
getConcurrent(request).decrementAndGet(); getConcurrent(request).decrementAndGet();
}catch (Exception e){ } catch (Exception e) {
} }
} }
// 获取并发计数器 // 获取并发计数器
......
...@@ -6,392 +6,374 @@ import java.security.SecureRandom; ...@@ -6,392 +6,374 @@ import java.security.SecureRandom;
import java.util.UUID; import java.util.UUID;
public final class UUIDUtils implements java.io.Serializable, public final class UUIDUtils implements java.io.Serializable,
Comparable<UUIDUtils> { Comparable<UUIDUtils> {
/** /**
* Explicit serialVersionUID for interoperability. * Explicit serialVersionUID for interoperability.
*/ */
private static final long serialVersionUID = -4856846361193249489L; private static final long serialVersionUID = -4856846361193249489L;
/* /*
* The most significant 64 bits of this UUID. * The most significant 64 bits of this UUID.
* *
* @serial * @serial
*/ */
private final long mostSigBits; private final long mostSigBits;
/* /*
* The least significant 64 bits of this UUID. * The least significant 64 bits of this UUID.
* *
* @serial * @serial
*/ */
private final long leastSigBits; private final long leastSigBits;
/* /*
* The random number generator used by this class to create random based * The random number generator used by this class to create random based
* UUIDs. In a holder class to defer initialization until needed. * UUIDs. In a holder class to defer initialization until needed.
*/ */
private static class Holder { private static class Holder {
static final SecureRandom numberGenerator = new SecureRandom(); static final SecureRandom numberGenerator = new SecureRandom();
} }
// Constructors and Factories // Constructors and Factories
/* /*
* Private constructor which uses a byte array to construct the new UUID. * Private constructor which uses a byte array to construct the new UUID.
*/ */
private UUIDUtils(byte[] data) { private UUIDUtils(byte[] data) {
long msb = 0; long msb = 0;
long lsb = 0; long lsb = 0;
assert data.length == 16 : "data must be 16 bytes in length"; assert data.length == 16 : "data must be 16 bytes in length";
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
msb = (msb << 8) | (data[i] & 0xff); msb = (msb << 8) | (data[i] & 0xff);
} }
for (int i = 8; i < 16; i++) { for (int i = 8; i < 16; i++) {
lsb = (lsb << 8) | (data[i] & 0xff); lsb = (lsb << 8) | (data[i] & 0xff);
} }
this.mostSigBits = msb; this.mostSigBits = msb;
this.leastSigBits = lsb; this.leastSigBits = lsb;
} }
/** /**
* Constructs a new {@code UUID} using the specified data. * Constructs a new {@code UUID} using the specified data.
* {@code mostSigBits} is used for the most significant 64 bits of the * {@code mostSigBits} is used for the most significant 64 bits of the
* {@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 public UUIDUtils(long mostSigBits, long leastSigBits) {
* The least significant bits of the {@code UUID} this.mostSigBits = mostSigBits;
*/ this.leastSigBits = leastSigBits;
public UUIDUtils(long mostSigBits, long leastSigBits) { }
this.mostSigBits = mostSigBits;
this.leastSigBits = leastSigBits; /**
} * Static factory to retrieve a type 4 (pseudo randomly generated) UUID.
* <p>
/** * The {@code UUID} is generated using a cryptographically strong pseudo
* Static factory to retrieve a type 4 (pseudo randomly generated) UUID. * random number generator.
* *
* The {@code UUID} is generated using a cryptographically strong pseudo * @return A randomly generated {@code UUID}
* random number generator. */
* public static UUIDUtils randomUUID() {
* @return A randomly generated {@code UUID} SecureRandom ng = Holder.numberGenerator;
*/
public static UUIDUtils randomUUID() { byte[] randomBytes = new byte[16];
SecureRandom ng = Holder.numberGenerator; ng.nextBytes(randomBytes);
randomBytes[6] &= 0x0f; /* clear version */
byte[] randomBytes = new byte[16]; randomBytes[6] |= 0x40; /* set to version 4 */
ng.nextBytes(randomBytes); randomBytes[8] &= 0x3f; /* clear variant */
randomBytes[6] &= 0x0f; /* clear version */ randomBytes[8] |= 0x80; /* set to IETF variant */
randomBytes[6] |= 0x40; /* set to version 4 */ return new UUIDUtils(randomBytes);
randomBytes[8] &= 0x3f; /* clear variant */ }
randomBytes[8] |= 0x80; /* set to IETF variant */
return new UUIDUtils(randomBytes); /**
} * Static factory to retrieve a type 3 (name based) {@code UUID} based on
* the specified byte array.
/** *
* Static factory to retrieve a type 3 (name based) {@code UUID} based on * @param name A byte array to be used to construct a {@code UUID}
* the specified byte array. * @return A {@code UUID} generated from the specified array
* */
* @param name public static UUIDUtils nameUUIDFromBytes(byte[] name) {
* A byte array to be used to construct a {@code UUID} MessageDigest md;
* try {
* @return A {@code UUID} generated from the specified array md = MessageDigest.getInstance("MD5");
*/ } catch (NoSuchAlgorithmException nsae) {
public static UUIDUtils nameUUIDFromBytes(byte[] name) { throw new InternalError("MD5 not supported", nsae);
MessageDigest md; }
try { byte[] md5Bytes = md.digest(name);
md = MessageDigest.getInstance("MD5"); md5Bytes[6] &= 0x0f; /* clear version */
} catch (NoSuchAlgorithmException nsae) { md5Bytes[6] |= 0x30; /* set to version 3 */
throw new InternalError("MD5 not supported", nsae); md5Bytes[8] &= 0x3f; /* clear variant */
} md5Bytes[8] |= 0x80; /* set to IETF variant */
byte[] md5Bytes = md.digest(name); return new UUIDUtils(md5Bytes);
md5Bytes[6] &= 0x0f; /* clear version */ }
md5Bytes[6] |= 0x30; /* set to version 3 */
md5Bytes[8] &= 0x3f; /* clear variant */ /**
md5Bytes[8] |= 0x80; /* set to IETF variant */ * Creates a {@code UUID} from the string standard representation as
return new UUIDUtils(md5Bytes); * described in the {@link #toString} method.
} *
* @param name A string that specifies a {@code UUID}
/** * @return A {@code UUID} with the specified value
* Creates a {@code UUID} from the string standard representation as * @throws IllegalArgumentException If name does not conform to the string representation as
* described in the {@link #toString} method. * described in {@link #toString}
* */
* @param name public static UUIDUtils fromString(String name) {
* A string that specifies a {@code UUID} String[] components = name.split("-");
* if (components.length != 5) {
* @return A {@code UUID} with the specified value
*
* @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("-");
if (components.length != 5) {
throw new IllegalArgumentException("Invalid UUID string: " + name); throw new IllegalArgumentException("Invalid UUID string: " + name);
} }
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
components[i] = "0x" + components[i]; components[i] = "0x" + components[i];
} }
long mostSigBits = Long.decode(components[0]).longValue(); long mostSigBits = Long.decode(components[0]).longValue();
mostSigBits <<= 16; mostSigBits <<= 16;
mostSigBits |= Long.decode(components[1]).longValue(); mostSigBits |= Long.decode(components[1]).longValue();
mostSigBits <<= 16; mostSigBits <<= 16;
mostSigBits |= Long.decode(components[2]).longValue(); mostSigBits |= Long.decode(components[2]).longValue();
long leastSigBits = Long.decode(components[3]).longValue(); long leastSigBits = Long.decode(components[3]).longValue();
leastSigBits <<= 48; leastSigBits <<= 48;
leastSigBits |= Long.decode(components[4]).longValue(); leastSigBits |= Long.decode(components[4]).longValue();
return new UUIDUtils(mostSigBits, leastSigBits); return new UUIDUtils(mostSigBits, leastSigBits);
} }
// Field Accessor Methods // Field Accessor Methods
/** /**
* Returns the least significant 64 bits of this UUID's 128 bit value. * Returns the least significant 64 bits of this UUID's 128 bit value.
* *
* @return The least significant 64 bits of this UUID's 128 bit value * @return The least significant 64 bits of this UUID's 128 bit value
*/ */
public long getLeastSignificantBits() { public long getLeastSignificantBits() {
return leastSigBits; return leastSigBits;
} }
/** /**
* Returns the most significant 64 bits of this UUID's 128 bit value. * Returns the most significant 64 bits of this UUID's 128 bit value.
* *
* @return The most significant 64 bits of this UUID's 128 bit value * @return The most significant 64 bits of this UUID's 128 bit value
*/ */
public long getMostSignificantBits() { public long getMostSignificantBits() {
return mostSigBits; return mostSigBits;
} }
/** /**
* 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
* <li>2 DCE security UUID * <li>2 DCE security UUID
* <li>3 Name-based UUID * <li>3 Name-based UUID
* <li>4 Randomly generated UUID * <li>4 Randomly generated UUID
* </ul> * </ul>
* *
* @return The version number of this {@code UUID} * @return The version number of this {@code UUID}
*/ */
public int version() { public int version() {
// Version is bits masked by 0x000000000000F000 in MS long // Version is bits masked by 0x000000000000F000 in MS long
return (int) ((mostSigBits >> 12) & 0x0f); return (int) ((mostSigBits >> 12) & 0x0f);
} }
/** /**
* 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
* <li>2 <a * <li>2 <a
* href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a> * href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>
* (Leach-Salz), used by this class * (Leach-Salz), used by this class
* <li>6 Reserved, Microsoft Corporation backward compatibility * <li>6 Reserved, Microsoft Corporation backward compatibility
* <li>7 Reserved for future definition * <li>7 Reserved for future definition
* </ul> * </ul>
* *
* @return The variant number of this {@code UUID} * @return The variant number of this {@code UUID}
*/ */
public int variant() { public int variant() {
// This field is composed of a varying number of bits. // This field is composed of a varying number of bits.
// 0 - - Reserved for NCS backward compatibility // 0 - - Reserved for NCS backward compatibility
// 1 0 - The IETF aka Leach-Salz variant (used by this class) // 1 0 - The IETF aka Leach-Salz variant (used by this class)
// 1 1 0 Reserved, Microsoft backward compatibility // 1 1 0 Reserved, Microsoft backward compatibility
// 1 1 1 Reserved for future definition. // 1 1 1 Reserved for future definition.
return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63)); return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
} }
/** /**
* The timestamp value associated with this UUID. * The timestamp value associated with this UUID.
* *
* <p> * <p>
* The 60 bit timestamp value is constructed from the time_low, time_mid, * The 60 bit timestamp value is constructed from the time_low, time_mid,
* and time_hi fields of this {@code UUID}. The resulting timestamp is * and time_hi fields of this {@code UUID}. The resulting timestamp is
* measured in 100-nanosecond units since midnight, October 15, 1582 UTC. * measured in 100-nanosecond units since midnight, October 15, 1582 UTC.
* *
* <p> * <p>
* The timestamp value is only meaningful in a time-based UUID, which has * The timestamp value is only meaningful in a time-based UUID, which has
* 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 * @return The timestamp of this {@code UUID}.
* If this UUID is not a version 1 UUID * @throws UnsupportedOperationException If this UUID is not a version 1 UUID
* @return The timestamp of this {@code UUID}. */
*/ public long timestamp() {
public long timestamp() { if (version() != 1) {
if (version() != 1) { throw new UnsupportedOperationException("Not a time-based UUID");
throw new UnsupportedOperationException("Not a time-based UUID"); }
}
return (mostSigBits & 0x0FFFL) << 48
return (mostSigBits & 0x0FFFL) << 48 | ((mostSigBits >> 16) & 0x0FFFFL) << 32 | mostSigBits >>> 32;
| ((mostSigBits >> 16) & 0x0FFFFL) << 32 | mostSigBits >>> 32; }
}
/**
/** * The clock sequence value associated with this UUID.
* The clock sequence value associated with this UUID. *
* * <p>
* <p> * The 14 bit clock sequence value is constructed from the clock sequence
* The 14 bit clock sequence value is constructed from the clock sequence * field of this UUID. The clock sequence field is used to guarantee
* field of this UUID. The clock sequence field is used to guarantee * temporal uniqueness in a time-based UUID.
* temporal uniqueness in a time-based UUID. *
* * <p>
* <p> * The {@code clockSequence} value is only meaningful in a time-based UUID,
* The {@code clockSequence} value is only meaningful in a time-based UUID, * which has version type 1. If this UUID is not a time-based UUID then this
* which has version type 1. If this UUID is not a time-based UUID then this * 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 public int clockSequence() {
* If this UUID is not a version 1 UUID if (version() != 1) {
*/ throw new UnsupportedOperationException("Not a time-based UUID");
public int clockSequence() { }
if (version() != 1) {
throw new UnsupportedOperationException("Not a time-based UUID"); return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
} }
return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48); /**
} * The node value associated with this UUID.
*
/** * <p>
* The node value associated with this UUID. * The 48 bit node value is constructed from the node field of this UUID.
* * This field is intended to hold the IEEE 802 address of the machine that
* <p> * generated this UUID to guarantee spatial uniqueness.
* The 48 bit node value is constructed from the node field of this UUID. *
* This field is intended to hold the IEEE 802 address of the machine that * <p>
* generated this UUID to guarantee spatial uniqueness. * The node value is only meaningful in a time-based UUID, which has version
* * type 1. If this UUID is not a time-based UUID then this method throws
* <p> * UnsupportedOperationException.
* The node value is only meaningful in a time-based UUID, which has version *
* type 1. If this UUID is not a time-based UUID then this method throws * @return The node value of this {@code UUID}
* UnsupportedOperationException. * @throws UnsupportedOperationException If this UUID is not a version 1 UUID
* */
* @return The node value of this {@code UUID} public long node() {
* if (version() != 1) {
* @throws UnsupportedOperationException throw new UnsupportedOperationException("Not a time-based UUID");
* If this UUID is not a version 1 UUID }
*/
public long node() { return leastSigBits & 0x0000FFFFFFFFFFFFL;
if (version() != 1) { }
throw new UnsupportedOperationException("Not a time-based UUID");
} // Object Inherited Methods
return leastSigBits & 0x0000FFFFFFFFFFFFL; /**
} * Returns a {@code String} object representing this {@code UUID}.
*
// Object Inherited Methods * <p>
* The UUID string representation is as described by this BNF: <blockquote>
/** *
* Returns a {@code String} object representing this {@code UUID}. * <pre>
* * {@code
* <p> * UUID = <time_low> "-" <time_mid> "-"
* The UUID string representation is as described by this BNF: <blockquote> * <time_high_and_version> "-"
* * <variant_and_sequence> "-"
* <pre> * <node>
* {@code * time_low = 4*<hexOctet>
* UUID = <time_low> "-" <time_mid> "-" * time_mid = 2*<hexOctet>
* <time_high_and_version> "-" * time_high_and_version = 2*<hexOctet>
* <variant_and_sequence> "-" * variant_and_sequence = 2*<hexOctet>
* <node> * node = 6*<hexOctet>
* time_low = 4*<hexOctet> * hexOctet = <hexDigit><hexDigit>
* time_mid = 2*<hexOctet> * hexDigit =
* time_high_and_version = 2*<hexOctet> * "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
* variant_and_sequence = 2*<hexOctet> * | "a" | "b" | "c" | "d" | "e" | "f"
* node = 6*<hexOctet> * | "A" | "B" | "C" | "D" | "E" | "F"
* hexOctet = <hexDigit><hexDigit> * }
* hexDigit = * </pre>
* "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" *
* | "a" | "b" | "c" | "d" | "e" | "f" * </blockquote>
* | "A" | "B" | "C" | "D" | "E" | "F" *
* } * @return A string representation of this {@code UUID}
* </pre> */
* @Override
* </blockquote>
*
* @return A string representation of this {@code UUID}
*/
@Override
public String toString() { public String toString() {
return (digits(mostSigBits >> 32, 8) + digits(mostSigBits >> 16, 4) return (digits(mostSigBits >> 32, 8) + digits(mostSigBits >> 16, 4)
+ digits(mostSigBits, 4) + digits(leastSigBits >> 48, 4) + digits( + digits(mostSigBits, 4) + digits(leastSigBits >> 48, 4) + digits(
leastSigBits, 12)); leastSigBits, 12));
} }
/** Returns val represented by the specified number of hex digits. */ /**
private static String digits(long val, int digits) { * Returns val represented by the specified number of hex digits.
long hi = 1L << (digits * 4); */
return Long.toHexString(hi | (val & (hi - 1))).substring(1); private static String digits(long val, int digits) {
} long hi = 1L << (digits * 4);
return Long.toHexString(hi | (val & (hi - 1))).substring(1);
/** }
* Returns a hash code for this {@code UUID}.
* /**
* @return A hash code value for this {@code UUID} * Returns a hash code for this {@code UUID}.
*/ *
@Override * @return A hash code value for this {@code UUID}
*/
@Override
public int hashCode() { public int hashCode() {
long hilo = mostSigBits ^ leastSigBits; long hilo = mostSigBits ^ leastSigBits;
return ((int) (hilo >> 32)) ^ (int) hilo; return ((int) (hilo >> 32)) ^ (int) hilo;
} }
/** /**
* Compares this object to the specified object. The result is {@code true} * Compares this object to the specified object. The result is {@code true}
* if and only if the argument is not {@code null}, is a {@code UUID} * if and only if the argument is not {@code null}, is a {@code UUID}
* 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
public boolean equals(Object obj) { public boolean equals(Object obj) {
if ((null == obj) || (obj.getClass() != UUID.class)) { if ((null == obj) || (obj.getClass() != UUID.class)) {
return false; return false;
} }
UUIDUtils id = (UUIDUtils) obj; UUIDUtils id = (UUIDUtils) obj;
return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits); return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
} }
// Comparison Operations // Comparison Operations
/** /**
* Compares this UUID with the specified UUID. * Compares this UUID with the specified UUID.
* *
* <p> * <p>
* 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
* * greater than {@code val}
* @return -1, 0 or 1 as this {@code UUID} is less than, equal to, or */
* greater than {@code val} @Override
*
*/
@Override
public int compareTo(UUIDUtils val) { public int compareTo(UUIDUtils val) {
// The ordering is intentionally set up so that the UUIDs // The ordering is intentionally set up so that the UUIDs
// can simply be numerically compared as two numbers // can simply be numerically compared as two numbers
return (this.mostSigBits < val.mostSigBits ? -1 return (this.mostSigBits < val.mostSigBits ? -1
: (this.mostSigBits > val.mostSigBits ? 1 : (this.mostSigBits > val.mostSigBits ? 1
: (this.leastSigBits < val.leastSigBits ? -1 : (this.leastSigBits < val.leastSigBits ? -1
: (this.leastSigBits > val.leastSigBits ? 1 : 0)))); : (this.leastSigBits > val.leastSigBits ? 1 : 0))));
} }
} }
...@@ -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());
} }
......
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
......
...@@ -243,6 +243,12 @@ ...@@ -243,6 +243,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>
......
...@@ -10,6 +10,11 @@ ...@@ -10,6 +10,11 @@
<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
...@@ -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());
...@@ -54,7 +53,7 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> { ...@@ -54,7 +53,7 @@ public class ControllerResponseAdvice implements ResponseBodyAdvice<Object> {
@Override @Override
public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) { public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
return ResponseUtil.getSuccessResponse(o); return ResponseUtil.getSuccessResponse(o);
} }
private String getMsg(BusinessException e) { private String getMsg(BusinessException e) {
......
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;
/** /**
......
...@@ -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;
...@@ -29,12 +28,12 @@ public class SwaggerConfig { ...@@ -29,12 +28,12 @@ public class SwaggerConfig {
@Bean @Bean
public Docket createRestApi() { public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.groupName("SecooMall") .groupName("SecooMall")
.select() .select()
.apis(RequestHandlerSelectors.withClassAnnotation(ApiController.class)) .apis(RequestHandlerSelectors.withClassAnnotation(ApiController.class))
.paths( PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build();
} }
......
...@@ -15,7 +15,7 @@ import java.util.List; ...@@ -15,7 +15,7 @@ import java.util.List;
@Configuration @Configuration
public class WebConfig { public class WebConfig {
@Bean @Bean
public HttpMessageConverters fastJsonHttpMessageConverters() { public HttpMessageConverters fastJsonHttpMessageConverters() {
FastJsonHttpMessageConverter fastJsonHttpMessageConverter = new FastJsonHttpMessageConverter(); FastJsonHttpMessageConverter fastJsonHttpMessageConverter = new FastJsonHttpMessageConverter();
......
...@@ -16,8 +16,8 @@ public class DefaultLocaleResolver extends CookieLocaleResolver { ...@@ -16,8 +16,8 @@ public class DefaultLocaleResolver extends CookieLocaleResolver {
protected Locale determineDefaultLocale(HttpServletRequest request) { protected Locale determineDefaultLocale(HttpServletRequest request) {
if (!StringUtil.isEmpty(request.getHeader("Accept-Language"))) { if (!StringUtil.isEmpty(request.getHeader("Accept-Language"))) {
Locale locale = Locale.forLanguageTag(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"); String lang = request.getParameter("lang");
......
...@@ -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