Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
matrix
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mall
arch
matrix
Commits
6746470e
Commit
6746470e
authored
Mar 14, 2020
by
qiuweili123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修复dubbo启动错误
2.增加xxl-job注解支持
parent
000a80fe
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
108 additions
and
84 deletions
+108
-84
pom.xml
common-core/pom.xml
+1
-1
ErrorCode.java
common-core/src/main/java/com/secoo/mall/common/core/errorcode/ErrorCode.java
+3
-1
pom.xml
common-util/pom.xml
+1
-1
SpringUtil.java
common-util/src/main/java/com/secoo/mall/common/util/spring/SpringUtil.java
+1
-2
pom.xml
config-starter/pom.xml
+1
-1
pom.xml
elasticsearch-starter/pom.xml
+1
-1
pom.xml
logger-starter/pom.xml
+1
-1
pom.xml
matrix-datasource/matrix-datasource-core/pom.xml
+1
-1
pom.xml
matrix-datasource/matrix-datasource-druid/pom.xml
+1
-1
pom.xml
matrix-datasource/pom.xml
+2
-2
pom.xml
matrix-job/matrix-job-core/pom.xml
+1
-1
pom.xml
matrix-job/matrix-job-xxl-core/pom.xml
+2
-2
pom.xml
matrix-job/matrix-job-xxl-starter/pom.xml
+1
-1
MatrixXxlJobAutoConfiguration.java
matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobAutoConfiguration.java
+2
-2
MatrixXxlJobBootProperties.java
matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobBootProperties.java
+10
-0
application.yml
matrix-job/matrix-job-xxl-starter/src/test/resources/application.yml
+8
-2
pom.xml
matrix-job/pom.xml
+5
-5
pom.xml
matrix-mq/matrix-rocketmq-core/pom.xml
+1
-1
pom.xml
matrix-mq/matrix-rocketmq-starter/pom.xml
+1
-1
pom.xml
matrix-mq/pom.xml
+1
-1
pom.xml
matrix-mybatis/matrix-mybatis-core/pom.xml
+1
-1
pom.xml
matrix-mybatis/matrix-mybatis-starter/pom.xml
+1
-1
pom.xml
matrix-mybatis/pom.xml
+4
-4
pom.xml
matrix-protocol/matrix-protocol-core/pom.xml
+1
-1
ProtocolExceptionHandler.java
matrix-protocol/matrix-protocol-core/src/main/java/com/secoo/mall/common/handler/ProtocolExceptionHandler.java
+6
-1
pom.xml
matrix-protocol/matrix-protocol-dubbo-core/pom.xml
+1
-1
MatrixExceptionFilter.java
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/filter/MatrixExceptionFilter.java
+3
-3
MatrixResponseExceptionFilter.java
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/filter/MatrixResponseExceptionFilter.java
+9
-4
org.apache.dubbo.rpc.Filter
matrix-protocol/matrix-protocol-dubbo-core/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
+0
-3
pom.xml
matrix-protocol/matrix-protocol-dubbo-starter/pom.xml
+1
-1
pom.xml
matrix-protocol/matrix-protocol-web-core/pom.xml
+1
-1
pom.xml
matrix-protocol/matrix-protocol-web-starter/pom.xml
+1
-1
pom.xml
matrix-protocol/pom.xml
+7
-7
pom.xml
mongodb-starter/pom.xml
+1
-1
pom.xml
monitor-starter/pom.xml
+1
-1
pom.xml
openfeign-starter/pom.xml
+1
-1
pom.xml
pom.xml
+22
-22
pom.xml
redis-starter/pom.xml
+1
-1
pom.xml
rocketmq-starter/pom.xml
+1
-1
No files found.
common-core/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
common-core/src/main/java/com/secoo/mall/common/core/errorcode/ErrorCode.java
View file @
6746470e
package
com
.
secoo
.
mall
.
common
.
core
.
errorcode
;
package
com
.
secoo
.
mall
.
common
.
core
.
errorcode
;
public
class
ErrorCode
{
import
java.io.Serializable
;
public
class
ErrorCode
implements
Serializable
{
private
Integer
code
;
private
Integer
code
;
private
String
msg
;
private
String
msg
;
...
...
common-util/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
common-util/src/main/java/com/secoo/mall/common/util/spring/SpringUtil.java
View file @
6746470e
...
@@ -11,8 +11,7 @@ public class SpringUtil implements ApplicationContextAware {
...
@@ -11,8 +11,7 @@ public class SpringUtil implements ApplicationContextAware {
private
static
ApplicationContext
context
;
private
static
ApplicationContext
context
;
@Override
@Override
public
void
setApplicationContext
(
ApplicationContext
arg0
)
public
void
setApplicationContext
(
ApplicationContext
arg0
)
throws
BeansException
{
throws
BeansException
{
context
=
arg0
;
context
=
arg0
;
}
}
...
...
config-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
elasticsearch-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
logger-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-datasource/matrix-datasource-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-datasource
</artifactId>
<artifactId>
matrix-datasource
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-datasource/matrix-datasource-druid/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-datasource
</artifactId>
<artifactId>
matrix-datasource
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-datasource/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-datasource-core
</artifactId>
<artifactId>
matrix-datasource-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
...
...
matrix-job/matrix-job-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-job
</artifactId>
<artifactId>
matrix-job
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-job/matrix-job-xxl-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-job
</artifactId>
<artifactId>
matrix-job
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo
</groupId>
<groupId>
com.secoo
</groupId>
<artifactId>
xxl-job-core
</artifactId>
<artifactId>
secoo-
xxl-job-core
</artifactId>
</dependency>
</dependency>
</dependencies>
</dependencies>
...
...
matrix-job/matrix-job-xxl-starter/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-job
</artifactId>
<artifactId>
matrix-job
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobAutoConfiguration.java
View file @
6746470e
...
@@ -2,8 +2,8 @@ package com.secoo.mall.xxl.spring.boot.autoconfigure;
...
@@ -2,8 +2,8 @@ package com.secoo.mall.xxl.spring.boot.autoconfigure;
import
com.secoo.mall.job.client.JobClient
;
import
com.secoo.mall.job.client.JobClient
;
import
com.secoo.mall.xxl.client.MatrixXxlJobClient
;
import
com.secoo.mall.xxl.client.MatrixXxlJobClient
;
import
com.xxl.job.core.executor.XxlJobExecutor
;
import
com.
secoo.
xxl.job.core.executor.XxlJobExecutor
;
import
com.xxl.job.core.executor.impl.XxlJobSpringExecutor
;
import
com.
secoo.
xxl.job.core.executor.impl.XxlJobSpringExecutor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
...
...
matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobBootProperties.java
View file @
6746470e
...
@@ -11,9 +11,19 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
...
@@ -11,9 +11,19 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
public
class
MatrixXxlJobBootProperties
extends
MatrixXxlJobProperties
{
public
class
MatrixXxlJobBootProperties
extends
MatrixXxlJobProperties
{
public
static
final
String
PREFIX
=
"xxl.job"
;
public
static
final
String
PREFIX
=
"xxl.job"
;
private
Boolean
enabled
;
@NestedConfigurationProperty
@NestedConfigurationProperty
private
MatrixXxlJobProperties
.
Executor
executor
;
private
MatrixXxlJobProperties
.
Executor
executor
;
public
Boolean
getEnabled
()
{
return
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
@Override
@Override
@Value
(
"${spring.application.name}"
)
@Value
(
"${spring.application.name}"
)
public
void
setAppName
(
String
appName
)
{
public
void
setAppName
(
String
appName
)
{
...
...
matrix-job/matrix-job-xxl-starter/src/test/resources/application.yml
View file @
6746470e
xxl
:
xxl
:
job
:
job
:
executor
:
executor
:
ip
:
190.189.90.1
ip
:
127.0.0.1
# #默认为空
\ No newline at end of file
port
:
access-token
:
#默认为空
log-path
:
#xxl日志存储地址,
log-retention-days
:
#日志保存时间,默认7天
#app-name: 默认会读取spring.application.name或者-Dapp.id
admin-addresses
:
#xxl-admin访问地址,如开发环境 http://job.secoolocal.com
matrix-job/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
@@ -21,17 +21,17 @@
...
@@ -21,17 +21,17 @@
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-job-core
</artifactId>
<artifactId>
matrix-job-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-job-xxl-core
</artifactId>
<artifactId>
matrix-job-xxl-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo
</groupId>
<groupId>
com.secoo
</groupId>
<artifactId>
xxl-job-core
</artifactId>
<artifactId>
secoo-
xxl-job-core
</artifactId>
<version>
2.1.0-secoo1.
1
</version>
<version>
2.1.0-secoo1.
2
</version>
</dependency>
</dependency>
</dependencies>
</dependencies>
</dependencyManagement>
</dependencyManagement>
...
...
matrix-mq/matrix-rocketmq-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-mq
</artifactId>
<artifactId>
matrix-mq
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-mq/matrix-rocketmq-starter/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-mq
</artifactId>
<artifactId>
matrix-mq
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-mq/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-mybatis/matrix-mybatis-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-mybatis
</artifactId>
<artifactId>
matrix-mybatis
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-mybatis/matrix-mybatis-starter/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-mybatis
</artifactId>
<artifactId>
matrix-mybatis
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-mybatis/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
@@ -25,17 +25,17 @@
...
@@ -25,17 +25,17 @@
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-mybatis-core
</artifactId>
<artifactId>
matrix-mybatis-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-datasource-druid
</artifactId>
<artifactId>
matrix-datasource-druid
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-mybatis-starter
</artifactId>
<artifactId>
matrix-mybatis-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.baomidou
</groupId>
<groupId>
com.baomidou
</groupId>
...
...
matrix-protocol/matrix-protocol-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-protocol
</artifactId>
<artifactId>
matrix-protocol
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-protocol/matrix-protocol-core/src/main/java/com/secoo/mall/common/handler/ProtocolExceptionHandler.java
View file @
6746470e
...
@@ -54,6 +54,11 @@ public class ProtocolExceptionHandler {
...
@@ -54,6 +54,11 @@ public class ProtocolExceptionHandler {
if
(
messageSource
==
null
)
{
if
(
messageSource
==
null
)
{
return
e
.
getMsg
();
return
e
.
getMsg
();
}
}
return
messageSource
.
getMessage
(
e
.
getMsg
(),
e
.
getArgs
(),
LocaleContextHolder
.
getLocale
());
try
{
return
messageSource
.
getMessage
(
e
.
getMsg
(),
e
.
getArgs
(),
LocaleContextHolder
.
getLocale
());
}
catch
(
Exception
ex
)
{
return
String
.
format
(
"[%s] not exsits.Please check config message_%s.properties."
,
e
.
getMsg
(),
LocaleContextHolder
.
getLocale
());
}
}
}
}
}
matrix-protocol/matrix-protocol-dubbo-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-protocol
</artifactId>
<artifactId>
matrix-protocol
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/filter/MatrixExceptionFilter.java
View file @
6746470e
...
@@ -14,9 +14,9 @@ import java.lang.reflect.Method;
...
@@ -14,9 +14,9 @@ import java.lang.reflect.Method;
/**
/**
* 统一拦截异常。
* 统一拦截异常。
*/
*/
@Activate
(
/*
@Activate(
group = {CommonConstants.PROVIDER}
group = {CommonConstants.PROVIDER}
)
)
*/
public
class
MatrixExceptionFilter
extends
ListenableFilter
{
public
class
MatrixExceptionFilter
extends
ListenableFilter
{
public
MatrixExceptionFilter
()
{
public
MatrixExceptionFilter
()
{
super
.
listener
=
new
MatrixExceptionFilter
.
ExceptionListener
();
super
.
listener
=
new
MatrixExceptionFilter
.
ExceptionListener
();
...
@@ -29,7 +29,7 @@ public class MatrixExceptionFilter extends ListenableFilter {
...
@@ -29,7 +29,7 @@ public class MatrixExceptionFilter extends ListenableFilter {
static
class
ExceptionListener
implements
Listener
{
static
class
ExceptionListener
implements
Listener
{
private
Logger
logger
=
LoggerFactory
.
getLogger
(
MatrixExceptionFilter
.
ExceptionListener
.
class
);
private
Logger
logger
=
LoggerFactory
.
getLogger
(
this
.
getClass
()
);
@Override
@Override
public
void
onResponse
(
Result
appResponse
,
Invoker
<?>
invoker
,
Invocation
invocation
)
{
public
void
onResponse
(
Result
appResponse
,
Invoker
<?>
invoker
,
Invocation
invocation
)
{
...
...
matrix-protocol/matrix-protocol-dubbo-core/src/main/java/com/secoo/mall/dubbo/filter/MatrixResponseExceptionFilter.java
View file @
6746470e
...
@@ -20,10 +20,10 @@ import java.lang.reflect.Method;
...
@@ -20,10 +20,10 @@ import java.lang.reflect.Method;
* 统一拦截异常。
* 统一拦截异常。
* 不向消费端抛出异常,而是形成response结构
* 不向消费端抛出异常,而是形成response结构
*/
*/
@Activate
(
/*
@Activate(
group = {CommonConstants.PROVIDER}
group = {CommonConstants.PROVIDER}
)
)
*/
public
class
MatrixResponseExceptionFilter
extends
ExceptionFilter
implements
Filter
{
public
class
MatrixResponseExceptionFilter
extends
Listenable
Filter
{
private
Logger
log
=
LoggerFactory
.
getLogger
(
MatrixResponseExceptionFilter
.
class
);
private
Logger
log
=
LoggerFactory
.
getLogger
(
MatrixResponseExceptionFilter
.
class
);
...
@@ -32,9 +32,14 @@ public class MatrixResponseExceptionFilter extends ExceptionFilter implements Fi
...
@@ -32,9 +32,14 @@ public class MatrixResponseExceptionFilter extends ExceptionFilter implements Fi
}
}
@Override
public
Result
invoke
(
Invoker
<?>
invoker
,
Invocation
invocation
)
throws
RpcException
{
return
invoker
.
invoke
(
invocation
);
}
static
class
ExceptionListener
extends
ProtocolExceptionHandler
implements
Listener
{
static
class
ExceptionListener
extends
ProtocolExceptionHandler
implements
Listener
{
private
Logger
logger
=
LoggerFactory
.
getLogger
(
ExceptionListener
.
class
);
private
Logger
logger
=
LoggerFactory
.
getLogger
(
this
.
getClass
()
);
private
ExceptionHandlerMethodResolver
resolver
;
private
ExceptionHandlerMethodResolver
resolver
;
public
ExceptionListener
()
{
public
ExceptionListener
()
{
...
...
matrix-protocol/matrix-protocol-dubbo-core/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
deleted
100644 → 0
View file @
000a80fe
exception=com.secoo.mall.dubbo.filter.MatrixExceptionFilter
responseException=com.secoo.mall.dubbo.filter.MatrixResponseExceptionFilter
\ No newline at end of file
matrix-protocol/matrix-protocol-dubbo-starter/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-protocol
</artifactId>
<artifactId>
matrix-protocol
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-protocol/matrix-protocol-web-core/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-protocol
</artifactId>
<artifactId>
matrix-protocol
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-protocol/matrix-protocol-web-starter/pom.xml
View file @
6746470e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
matrix-protocol
</artifactId>
<artifactId>
matrix-protocol
</artifactId>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
matrix-protocol/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<properties>
<properties>
<dubbo-starter.version>
2.7.4.1
</dubbo-starter.version>
<dubbo-starter.version>
2.7.4.1
</dubbo-starter.version>
<dubbo.version>
2.7.4.1
</dubbo.version>
<dubbo.version>
2.7.4.1
</dubbo.version>
<secoo-dubbo.version>
2.7.4.1-secoo1.
1
</secoo-dubbo.version>
<secoo-dubbo.version>
2.7.4.1-secoo1.
4
</secoo-dubbo.version>
</properties>
</properties>
<dependencyManagement>
<dependencyManagement>
...
@@ -29,27 +29,27 @@
...
@@ -29,27 +29,27 @@
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-core
</artifactId>
<artifactId>
matrix-protocol-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-web-core
</artifactId>
<artifactId>
matrix-protocol-web-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-dubbo-core
</artifactId>
<artifactId>
matrix-protocol-dubbo-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-web-starter
</artifactId>
<artifactId>
matrix-protocol-web-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-dubbo-starter
</artifactId>
<artifactId>
matrix-protocol-dubbo-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<!-- Aapche Dubbo -->
<!-- Aapche Dubbo -->
...
...
mongodb-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
monitor-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
openfeign-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
...
@@ -54,108 +54,108 @@
...
@@ -54,108 +54,108 @@
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
logger-starter
</artifactId>
<artifactId>
logger-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
monitor-starter
</artifactId>
<artifactId>
monitor-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-datasource-druid
</artifactId>
<artifactId>
matrix-datasource-druid
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-mybatis-starter
</artifactId>
<artifactId>
matrix-mybatis-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-rocketmq-core
</artifactId>
<artifactId>
matrix-rocketmq-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-rocketmq-starter
</artifactId>
<artifactId>
matrix-rocketmq-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-core
</artifactId>
<artifactId>
matrix-protocol-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-dubbo-core
</artifactId>
<artifactId>
matrix-protocol-dubbo-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-dubbo-starter
</artifactId>
<artifactId>
matrix-protocol-dubbo-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-web-core
</artifactId>
<artifactId>
matrix-protocol-web-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-protocol-web-starter
</artifactId>
<artifactId>
matrix-protocol-web-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-job-xxl-core
</artifactId>
<artifactId>
matrix-job-xxl-core
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.secoo.mall
</groupId>
<groupId>
com.secoo.mall
</groupId>
<artifactId>
matrix-job-xxl-starter
</artifactId>
<artifactId>
matrix-job-xxl-starter
</artifactId>
<version>
1.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
redis-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
rocketmq-starter/pom.xml
View file @
6746470e
...
@@ -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.3.
1
.RELEASE
</version>
<version>
1.3.
2
.RELEASE
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment