Skip to content

M
matrix
Commit 98c57ecd by 房斌
Options

2.0.14升级到2.0.15 解决空指针问题

parent a5ed5076
Showing with 75 additions and 76 deletions
common-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
common-util/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
config-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
logger-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-bigdata/matrix-bigdata-hbase-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-bigdata</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-bigdata/matrix-bigdata-spark-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-bigdata</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-bigdata/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-bus/matrix-bus-canal-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-bus</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-bus/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-client/matrix-client-openfeign-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-client</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-client/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-datahelper/matrix-datahelper-redis-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-datahelper</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-datahelper/matrix-datahelper-redis-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-datahelper</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-datahelper/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -21,7 +21,7 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datahelper-redis-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
......
matrix-datasource/matrix-datasource-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-datasource</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-datasource/matrix-datasource-druid/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-datasource</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-datasource/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -21,7 +21,7 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
......
matrix-gracefulshutdown/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/hook/DubboCustomerShutDownHook.java
package com.secoo.mall.gracefulshutdown.component.hook;
import com.alibaba.fastjson.JSON;
import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
import com.secoo.mall.common.util.date.DateUtil;
import com.secoo.mall.common.util.log.LoggerUtil;
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/dubbo/service/RegistryServerSync.java
package com.secoo.mall.gracefulshutdown.monitor.dubbo.service;
import com.alibaba.fastjson.JSON;
import com.secoo.mall.common.util.json.FastJsonUtil;
import com.secoo.mall.common.util.string.StringUtil;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.Constants.Constants;
import com.secoo.mall.gracefulshutdown.monitor.utils.CoderUtil;
import com.secoo.mall.gracefulshutdown.monitor.utils.Stack;
import com.secoo.mall.gracefulshutdown.monitor.utils.Tool;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.json.JSON;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.registry.NotifyListener;
import org.apache.dubbo.registry.Registry;
......@@ -184,9 +184,9 @@ public class RegistryServerSync extends Observable implements InitializingBean,
}
public void removeAndNotice(ConcurrentMap<String, Map<String, URL>> services,String serviceKey,String step){
logger.info("collection services:{},servicekey:{},step:{},time:{}",JSON.toJSON(services),serviceKey,step, " time:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS").format(new Date()) +StringUtil.line());
logger.info("collection services:{},servicekey:{},step:{},time:{}",services!=null? FastJsonUtil.toString(services):" is null",StringUtil.isNoneEmpty(serviceKey)?serviceKey:" is kong",step, " time:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS").format(new Date()) +StringUtil.line());
services.remove(serviceKey);
logger.info("collection services:{},servicekey:{},step:{},remove time:{}",JSON.toJSON(services),serviceKey,step, " time:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS").format(new Date()) +StringUtil.line());
logger.info("collection services:{},servicekey:{},step:{},remove time:{}", services!=null? FastJsonUtil.toString(services):" is null",StringUtil.isNoneEmpty(serviceKey)?serviceKey:" is kong",step, " time:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS").format(new Date()) +StringUtil.line());
if(signal) {
this.setChanged();
......
matrix-job/matrix-job-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-job/matrix-job-xxl-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-job/matrix-job-xxl-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-job/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -21,12 +21,12 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo</groupId>
......
matrix-mq/matrix-mq-rocketmq-client/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-mq</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-mq/matrix-mq-rocketmq-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-mq</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-mq/matrix-mq-rocketmq-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-mq</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-mq/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -27,7 +27,7 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
......
matrix-mybatis/matrix-mybatis-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-mybatis</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-mybatis/matrix-mybatis-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-mybatis</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-mybatis/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -25,17 +25,17 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-druid</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
......
matrix-protocol/matrix-protocol-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-dubbo-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-dubbo-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-web-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-web-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-protocol/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -29,27 +29,27 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<!-- Aapche Dubbo -->
......
pom.xml
......@@ -6,7 +6,7 @@
<groupId>com.secoo.mall</groupId>
<artifactId>matrix</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
<packaging>pom</packaging>
......@@ -54,119 +54,119 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>logger-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>common-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>config-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>common-util</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-druid</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-client</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<!--rocketmq-starter废弃，启用matrix-mq-rocketmq-starter-->
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-bigdata-hbase-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<!--redis-->
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datahelper-redis-core</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datahelper-redis-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-client-openfeign-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<!-- bus -->
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-bus-canal-starter</artifactId>
<version>2.0.14.RELEASE</version>
<version>2.0.15.RELEASE</version>
</dependency>
<!--普通jar-->
......
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