Skip to content

M
matrix
Commit 589d5ff3 by 共享中心代码生成
Options

Merge branch 'feature_protocol' into 'master' 

增加hbase

See merge request mall/arch/matrix!61
parents 74708514 2eae2111
Showing with 236 additions and 172 deletions
matrix-bigdata/matrix-bigdata-hbase-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-bigdata</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.3.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-bigdata-hbase-starter</artifactId>
</project>
\ No newline at end of file
matrix-bigdata/matrix-bigdata-spark-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-bigdata</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.3.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-bigdata-spark-starter</artifactId>
</project>
\ No newline at end of file
matrix-bigdata/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.3.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-bigdata</artifactId>
<packaging>pom</packaging>
<modules>
<module>matrix-bigdata-hbase-starter</module>
<module>matrix-bigdata-spark-starter</module>
</modules>
</project>
\ No newline at end of file
matrix-job/matrix-job-xxl-starter/src/test/resources/application.yml
......@@ -8,4 +8,3 @@ xxl:
log-retention-days: #日志保存时间，默认7天
#app-name: 默认会读取spring.application.name或者-Dapp.id
admin-addresses: #xxl-admin访问地址，如开发环境 http://job.secoolocal.com
matrix-job/pom.xml
......@@ -31,7 +31,7 @@
<dependency>
<groupId>com.secoo</groupId>
<artifactId>secoo-xxl-job-core</artifactId>
<version>2.1.0-secoo1.2</version>
<version>2.1.0-secoo1.3</version>
</dependency>
</dependencies>
</dependencyManagement>
......
matrix-mybatis/matrix-mybatis-starter/src/main/java/com/secoo/mall/mybatis/spring/boot/autoconfigure/MatrixMybatisBootProperties.java
......@@ -10,7 +10,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
@Data
@ConfigurationProperties(prefix = MatrixMybatisBootProperties.PREFIX)
public class MatrixMybatisBootProperties extends MatrixMybatisProperties {
public static final String PREFIX = "matrix.mybatis";
public static final String PREFIX = "mybatis";
@NestedConfigurationProperty
private MatrixMybatisConfiguration configuration;
......
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/filter/AbsExceptionFilter.java 0 → 100644
package com.secoo.mall.dubbo.filter;
import com.secoo.mall.dubbo.listener.ExceptionListener;
import org.apache.dubbo.rpc.*;
public abstract class AbsExceptionFilter extends ListenableFilter {
public AbsExceptionFilter() {
super.listener = getExceptionListener();
}
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
return invoker.invoke(invocation);
}
protected abstract ExceptionListener getExceptionListener();
}
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/filter/MatrixExceptionFilter.java
package com.secoo.mall.dubbo.filter;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.*;
import org.apache.dubbo.rpc.service.GenericService;
import java.lang.reflect.Method;
import com.secoo.mall.dubbo.listener.ExceptionListener;
import com.secoo.mall.dubbo.listener.MatrixExceptionListener;
/**
* 统一拦截异常。
......@@ -17,85 +9,10 @@ import java.lang.reflect.Method;
/*@Activate(
group = {CommonConstants.PROVIDER}
)*/
public class MatrixExceptionFilter extends ListenableFilter {
public MatrixExceptionFilter() {
super.listener = new MatrixExceptionFilter.ExceptionListener();
}
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
return invoker.invoke(invocation);
}
static class ExceptionListener implements Listener {
private Logger logger = LoggerFactory.getLogger(this.getClass());
public class MatrixExceptionFilter extends AbsExceptionFilter {
@Override
public void onResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {
if (appResponse.hasException() && GenericService.class != invoker.getInterface()) {
try {
Throwable exception = appResponse.getException();
// directly throw if it's checked exception
if (!(exception instanceof RuntimeException) && (exception instanceof Exception)) {
return;
}
// directly throw if the exception appears in the signature
try {
Method method = invoker.getInterface().getMethod(invocation.getMethodName(), invocation.getParameterTypes());
Class<?>[] exceptionClassses = method.getExceptionTypes();
for (Class<?> exceptionClass : exceptionClassses) {
if (exception.getClass().equals(exceptionClass)) {
return;
}
}
} catch (NoSuchMethodException e) {
return;
}
//防止报警信息错误
String msg = "Got unchecked and undeclared exception which called by " + RpcContext.getContext().getRemoteHost() + ". service: " + invoker.getInterface().getName() + ", method: " + invocation.getMethodName() + ", exception: " + exception.getClass().getName() + ": " + exception.getMessage();
if (exception instanceof RuntimeException) {
logger.warn(msg, exception);
} else {
logger.error(msg, exception);
}
// directly throw if exception class and interface class are in the same jar file.
String serviceFile = ReflectUtils.getCodeBase(invoker.getInterface());
String exceptionFile = ReflectUtils.getCodeBase(exception.getClass());
if (serviceFile == null || exceptionFile == null || serviceFile.equals(exceptionFile)) {
return;
protected ExceptionListener getExceptionListener() {
return new MatrixExceptionListener();
}
// directly throw if it's JDK exception
String className = exception.getClass().getName();
if (className.startsWith("java.") || className.startsWith("javax.")) {
return;
}
// directly throw if it's dubbo exception
if (exception instanceof RpcException) {
return;
}
// otherwise, wrap with RuntimeException and throw back to the client
appResponse.setException(new RuntimeException(StringUtils.toString(exception)));
return;
} catch (Throwable e) {
logger.warn("Fail to ExceptionFilter when called by " + RpcContext.getContext().getRemoteHost() + ". service: " + invoker.getInterface().getName() + ", method: " + invocation.getMethodName() + ", exception: " + e.getClass().getName() + ": " + e.getMessage(), e);
return;
}
}
}
@Override
public void onError(Throwable e, Invoker<?> invoker, Invocation invocation) {
logger.error("Got unchecked and undeclared exception which called by " + RpcContext.getContext().getRemoteHost() + ". service: " + invoker.getInterface().getName() + ", method: " + invocation.getMethodName() + ", exception: " + e.getClass().getName() + ": " + e.getMessage(), e);
}
// For test purpose
public void setLogger(Logger logger) {
this.logger = logger;
}
}
}
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/filter/MatrixResponseExceptionFilter.java
package com.secoo.mall.dubbo.filter;
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.handler.ProtocolExceptionHandler;
import com.secoo.mall.common.util.response.ResponseUtil;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.rpc.*;
import org.apache.dubbo.rpc.filter.ExceptionFilter;
import org.apache.dubbo.rpc.service.GenericService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver;
import java.lang.reflect.Method;
import com.secoo.mall.dubbo.listener.ExceptionListener;
import com.secoo.mall.dubbo.listener.MatrixResponseExceptionListener;
/**
* 统一拦截异常。
......@@ -23,72 +10,9 @@ import java.lang.reflect.Method;
/*@Activate(
group = {CommonConstants.PROVIDER}
)*/
public class MatrixResponseExceptionFilter extends ListenableFilter {
private Logger log = LoggerFactory.getLogger(MatrixResponseExceptionFilter.class);
public MatrixResponseExceptionFilter() {
super.listener = new MatrixResponseExceptionFilter.ExceptionListener();
}
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
return invoker.invoke(invocation);
}
static class ExceptionListener extends ProtocolExceptionHandler implements Listener {
private Logger logger = LoggerFactory.getLogger(this.getClass());
private ExceptionHandlerMethodResolver resolver;
public ExceptionListener() {
resolver = new ExceptionHandlerMethodResolver(this.getClass());
}
@Override
public void onResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {
if (appResponse.hasException() && GenericService.class != invoker.getInterface()) {
Exception exception = getException(appResponse.getException());
Method method = resolver.resolveMethod(exception);
try {
Object realResult = method.invoke(this, exception);
appResponse.setValue(realResult);
} catch (Exception e) {
appResponse.setValue(ResponseUtil.getFailResponse(new SystemInternalException()));
}
appResponse.setException(null);
}
}
public class MatrixResponseExceptionFilter extends AbsExceptionFilter {
@Override
public void onError(Throwable e, Invoker<?> invoker, Invocation invocation) {
logger.error("Got unchecked and undeclared exception which called by " + RpcContext.getContext().getRemoteHost() + ". service: " + invoker.getInterface().getName() + ", method: " + invocation.getMethodName() + ", exception: " + e.getClass().getName() + ": " + e.getMessage(), e);
}
private Exception getException(Throwable throwable) {
Exception exception = null;
String className = throwable.getClass().getSimpleName();
switch (className) {
case "BusinessException":
exception = (BusinessException) throwable;
break;
case "SystemInternalException":
exception = (SystemInternalException) throwable;
break;
case "ParameterException":
exception = (ParameterException) throwable;
break;
default:
exception = (Exception) throwable;
}
return exception;
protected ExceptionListener getExceptionListener() {
return new MatrixResponseExceptionListener();
}
}
}
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/listener/ExceptionListener.java 0 → 100644
package com.secoo.mall.dubbo.listener;
import org.apache.dubbo.rpc.*;
import org.apache.dubbo.rpc.service.GenericService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public interface ExceptionListener extends Filter.Listener {
Logger logger = LoggerFactory.getLogger(ExceptionListener.class);
@Override
default void onError(Throwable e, Invoker<?> invoker, Invocation invocation) {
logger.error("Got unchecked and undeclared exception which called by " + RpcContext.getContext().getRemoteHost() + ". service: " + invoker.getInterface().getName() + ", method: " + invocation.getMethodName() + ", exception: " + e.getClass().getName() + ": " + e.getMessage(), e);
}
@Override
default void onResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {
if (appResponse.hasException() && GenericService.class != invoker.getInterface()) {
processResponse(appResponse, invoker, invocation);
}
}
void processResponse(Result appResponse, Invoker<?> invoker, Invocation invocation);
}
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/listener/MatrixExceptionListener.java 0 → 100644
package com.secoo.mall.dubbo.listener;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.*;
import java.lang.reflect.Method;
public class MatrixExceptionListener implements ExceptionListener {
@Override
public void processResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {
try {
Throwable exception = appResponse.getException();
// directly throw if it's checked exception
if (!(exception instanceof RuntimeException) && (exception instanceof Exception)) {
return;
}
// directly throw if the exception appears in the signature
try {
Method method = invoker.getInterface().getMethod(invocation.getMethodName(), invocation.getParameterTypes());
Class<?>[] exceptionClassses = method.getExceptionTypes();
for (Class<?> exceptionClass : exceptionClassses) {
if (exception.getClass().equals(exceptionClass)) {
return;
}
}
} catch (NoSuchMethodException e) {
return;
}
//防止报警信息错误
String msg = "Got unchecked and undeclared exception which called by " + RpcContext.getContext().getRemoteHost() + ". service: " + invoker.getInterface().getName() + ", method: " + invocation.getMethodName() + ", exception: " + exception.getClass().getName() + ": " + exception.getMessage();
if (exception instanceof RuntimeException) {
logger.warn(msg, exception);
} else {
logger.error(msg, exception);
}
// directly throw if exception class and interface class are in the same jar file.
String serviceFile = ReflectUtils.getCodeBase(invoker.getInterface());
String exceptionFile = ReflectUtils.getCodeBase(exception.getClass());
if (serviceFile == null || exceptionFile == null || serviceFile.equals(exceptionFile)) {
return;
}
// directly throw if it's JDK exception
String className = exception.getClass().getName();
if (className.startsWith("java.") || className.startsWith("javax.")) {
return;
}
// directly throw if it's dubbo exception
if (exception instanceof RpcException) {
return;
}
// otherwise, wrap with RuntimeException and throw back to the client
appResponse.setException(new RuntimeException(StringUtils.toString(exception)));
return;
} catch (Throwable e) {
logger.warn("Fail to ExceptionFilter when called by " + RpcContext.getContext().getRemoteHost() + ". service: " + invoker.getInterface().getName() + ", method: " + invocation.getMethodName() + ", exception: " + e.getClass().getName() + ": " + e.getMessage(), e);
return;
}
}
}
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/listener/MatrixResponseExceptionListener.java 0 → 100644
package com.secoo.mall.dubbo.listener;
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.handler.ProtocolExceptionHandler;
import com.secoo.mall.common.util.response.ResponseUtil;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Result;
import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver;
import java.lang.reflect.Method;
public class MatrixResponseExceptionListener extends ProtocolExceptionHandler implements ExceptionListener {
private ExceptionHandlerMethodResolver resolver;
public MatrixResponseExceptionListener() {
resolver = new ExceptionHandlerMethodResolver(this.getClass());
}
@Override
public void processResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {
Exception exception = processException(appResponse.getException());
Method method = resolver.resolveMethod(exception);
try {
Object realResult = method.invoke(this, exception);
appResponse.setValue(realResult);
} catch (Exception e) {
appResponse.setValue(ResponseUtil.getFailResponse(new SystemInternalException()));
}
//将异常堆栈变为空
appResponse.setException(null);
}
protected Exception processException(Throwable throwable) {
Exception exception = null;
String className = throwable.getClass().getSimpleName();
switch (className) {
case "BusinessException":
exception = (BusinessException) throwable;
break;
case "SystemInternalException":
exception = (SystemInternalException) throwable;
break;
case "ParameterException":
exception = (ParameterException) throwable;
break;
default:
exception = (Exception) throwable;
}
return exception;
}
}
pom.xml
......@@ -26,6 +26,7 @@
<module>matrix-datasource</module>
<module>rocketmq-starter</module>
<module>matrix-job</module>
<module>matrix-bigdata</module>
</modules>
......@@ -157,7 +158,13 @@
<artifactId>matrix-job-xxl-starter</artifactId>
<version>1.3.2.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-bigdata-hbase-starter</artifactId>
<version>1.3.2.RELEASE</version>
</dependency>
<!--普通jar-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
......
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