Skip to content

M
matrix
Commit 3ed15d4d by 房斌
Options

同上 增加了http协议传输

parent 690a2f81
Showing with 132 additions and 73 deletions
common-util/pom.xml
......@@ -69,6 +69,14 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
......
matrix-gracefulshutdown/pom.xml
......@@ -93,6 +93,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>common-core</artifactId>
</dependency>
</dependencies>
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/spring/boot/autoconfigure/MatrixGracefulShutDownAutoConfiguration.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/autoconfigure/MatrixGracefulShutDownAutoConfiguration.java
package com.secoo.mall.dubbo.spring.boot.autoconfigure;
package com.secoo.mall.gracefulshutdown.autoconfigure;
import com.secoo.mall.common.core.service.UpDatas;
import com.secoo.mall.common.util.string.StringUtil;
import com.secoo.mall.dubbo.monitor.config.ConfigCenter;
import com.secoo.mall.dubbo.monitor.dubbo.service.ProviderService;
import com.secoo.mall.dubbo.monitor.dubbo.service.RegistryServerSync;
import com.secoo.mall.dubbo.monitor.dubbo.service.impl.ProviderServiceImpl;
import com.secoo.mall.dubbo.service.GracefulShutDown;
import com.secoo.mall.dubbo.service.ShutDownDataReport;
import com.secoo.mall.dubbo.service.TomcatGracefulShutDown;
import com.secoo.mall.dubbo.service.impl.DubboCustomerShutDownHook;
import com.secoo.mall.dubbo.service.impl.TomcatShutDownHook;
import com.secoo.mall.gracefulshutdown.component.ShutDownDataReportAsyncHttp;
import com.secoo.mall.gracefulshutdown.monitor.config.ConfigCenter;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.exception.ConfigurationException;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.ProviderService;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.RegistryServerSync;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.impl.ProviderServiceImpl;
import com.secoo.mall.gracefulshutdown.monitor.utils.Tool;
import com.secoo.mall.gracefulshutdown.component.GracefulShutDown;
import com.secoo.mall.gracefulshutdown.component.ShutDownDataReport;
import com.secoo.mall.gracefulshutdown.component.TomcatGracefulShutDown;
import com.secoo.mall.gracefulshutdown.component.hook.DubboCustomerShutDownHook;
import com.secoo.mall.gracefulshutdown.component.hook.TomcatShutDownHook;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.RegistryFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.core.env.Environment;
@Configuration
......@@ -44,14 +52,15 @@ public class MatrixGracefulShutDownAutoConfiguration {
@ConditionalOnClass(ConfigCenter.class)
@DependsOn("configCenter")
UpDatas dubboUpdata(ConfigCenter configCenter) {
ShutDownDataReport transport= new ShutDownDataReport();
URL url =configCenter.formUrl(configCenter.registryAddress, configCenter.registryGroup, configCenter.username, configCenter.password,configCenter.timeout);
transport.setUrl(url);
if(StringUtil.isEmpty(configCenter.patch)){
configCenter.patch="/monitorZ";
}
transport.setPath(configCenter.patch);
return transport;
// ShutDownDataReport transport= new ShutDownDataReport();
// URL url =Tool.formUrl(configCenter.registryAddress, configCenter.registryGroup, configCenter.username, configCenter.password,configCenter.timeout);
// transport.setUrl(url);
// if(StringUtil.isEmpty(configCenter.patch)){
// configCenter.patch="/monitorZ";
// }
// transport.setPath(configCenter.patch);
ShutDownDataReportAsyncHttp report=new ShutDownDataReportAsyncHttp();
return report;
}
......@@ -77,8 +86,10 @@ public class MatrixGracefulShutDownAutoConfiguration {
@Bean
@ConditionalOnExpression("!T(org.springframework.util.StringUtils).isEmpty('${dubbo.registry.address:}')")
ConfigCenter configCenter(){
return new ConfigCenter();
ConfigCenter configCenter(Environment env){
ConfigCenter center= new ConfigCenter();
center.init(env);
return center;
}
......@@ -89,6 +100,7 @@ public class MatrixGracefulShutDownAutoConfiguration {
TomcatShutDownHook createServletConnectShoutDownHock() {
return new TomcatShutDownHook();
}
@Bean
@ConditionalOnClass(org.apache.catalina.connector.Connector.class)
@TomcatGracefulShutDownJudgmentInterface()
......@@ -96,15 +108,28 @@ public class MatrixGracefulShutDownAutoConfiguration {
return new TomcatGracefulShutDown(tomcatShutDownHook);
}
@Bean
@ConditionalOnExpression("!T(org.springframework.util.StringUtils).isEmpty('${dubbo.registry.address:}')")
public GracefulShutDown createGraceObject(UpDatas dubboUpdata) {
return new GracefulShutDown(dubboUpdata);
}
@Bean
@ConditionalOnBean(ConfigCenter.class)
@ConditionalOnExpression("!T(org.springframework.util.StringUtils).isEmpty('${dubbo.registry.address:}')")
Registry getRegistry(ConfigCenter configCenter) {
Registry registry = null;
URL registryUrl = null;
if (registryUrl == null) {
registryUrl = Tool.formUrl(configCenter.getRegistryAddress(), configCenter.getRegistryGroup(), configCenter.getUsername(), configCenter.getPassword(), configCenter.getTimeout());
// registryUrl.setPath(patch);
}
RegistryFactory registryFactory = ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
registry = registryFactory.getRegistry(registryUrl);
return registry;
}
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/spring/boot/autoconfigure/TomcatGracefulShutDownJudgmentInterface.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/autoconfigure/TomcatGracefulShutDownJudgmentInterface.java
package com.secoo.mall.dubbo.spring.boot.autoconfigure;
package com.secoo.mall.gracefulshutdown.autoconfigure;
import com.secoo.mall.dubbo.condition.TomcatGracefulShutDownJudgment;
import com.secoo.mall.gracefulshutdown.condition.TomcatGracefulShutDownJudgment;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.*;
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/GracefulShutDown.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/GracefulShutDown.java
package com.secoo.mall.dubbo.service;
package com.secoo.mall.gracefulshutdown.component;
import com.alibaba.fastjson.JSON;
import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
......@@ -7,8 +7,8 @@ import com.secoo.mall.common.core.service.StopService;
import com.secoo.mall.common.core.service.UpDatas;
import com.secoo.mall.common.util.date.DateUtil;
import com.secoo.mall.common.util.log.LoggerUtil;
import com.secoo.mall.dubbo.monitor.utils.Tool;
import com.secoo.mall.dubbo.service.impl.TomcatShutDownHook;
import com.secoo.mall.gracefulshutdown.monitor.utils.Tool;
import com.secoo.mall.gracefulshutdown.component.hook.TomcatShutDownHook;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.config.DubboShutdownHook;
import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
......@@ -42,7 +42,7 @@ public class GracefulShutDown implements CommandLineRunner, ApplicationListener<
//容器初始化后执行
@Override
public void run(String... args) throws Exception {
logger.info("dddddddddddddduuuuuuuuuuuuuuuuubbbbbbbbbbbboooooooooooolllllllllll!!!!");
logger.info("dddddddddddddduuuuuuuuuuuuuuuuubbbbbbbbbbbboooooooooooolllllllllllme!!!!");
if (DubboShutdownHook.getDubboShutdownHook() != null) {
//hock卸载
DubboShutdownHook.getDubboShutdownHook().unregister();
......@@ -56,7 +56,6 @@ public class GracefulShutDown implements CommandLineRunner, ApplicationListener<
public void test() {
logger.info("222222222222 closeevent");
ExecutorDetails result = new ExecutorDetails();
result.setCode(0);
List<ExecutorDetail> details = new ArrayList<ExecutorDetail>();
......@@ -65,7 +64,7 @@ public class GracefulShutDown implements CommandLineRunner, ApplicationListener<
String name = ApplicationModel.getApplication();
result.setIp(ip);
result.setName(name);
logger.info("GracefulShutDown execute:name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
logger.info("gracefulshutdown execute:name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
try {
......@@ -92,20 +91,19 @@ public class GracefulShutDown implements CommandLineRunner, ApplicationListener<
}
} catch (Exception e) {
LoggerUtil.error("matrix.GracefulShutDown.error", e);
LoggerUtil.error("matrix.gracefulshutdown.error", e);
}
try {
dubboUpdata.upData(result);
} catch (Exception e) {
LoggerUtil.error("matrix.GracefulShutDown update .error data:" + JSON.toJSONString(result), e);
LoggerUtil.error("matrix.gracefulshutdown update .error data:" + JSON.toJSONString(result), e);
}
logger.info("GracefulShutDown execute end :name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
logger.info("gracefulshutdown execute end :name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
}
@Override
public void onApplicationEvent(ContextClosedEvent contextClosedEvent) {
logger.info("222222222222 closeevent");
ExecutorDetails result = new ExecutorDetails();
result.setCode(0);
List<ExecutorDetail> details = new ArrayList<ExecutorDetail>();
......@@ -114,7 +112,7 @@ public class GracefulShutDown implements CommandLineRunner, ApplicationListener<
String name = ApplicationModel.getApplication();
result.setIp(ip);
result.setName(name);
logger.info("GracefulShutDown execute:name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
logger.info("gracefulshutdown execute:name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
try {
......@@ -141,21 +139,21 @@ public class GracefulShutDown implements CommandLineRunner, ApplicationListener<
}
} catch (Exception e) {
LoggerUtil.error("matrix.GracefulShutDown.error", e);
LoggerUtil.error("matrix.gracefulshutdown.error", e);
}
try {
dubboUpdata.upData(result);
} catch (Exception e) {
LoggerUtil.error("matrix.GracefulShutDown update .error data:" + JSON.toJSONString(result), e);
LoggerUtil.error("matrix.gracefulshutdown update .error data:" + JSON.toJSONString(result), e);
}
logger.info("GracefulShutDown execute end :name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
logger.info("gracefulshutdown execute end :name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.context = applicationContext;
logger.info("222222222222 setContext");
}
@Override
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/ShutDownDataReport.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/ShutDownDataReport.java
package com.secoo.mall.dubbo.service;
package com.secoo.mall.gracefulshutdown.component;
import com.alibaba.fastjson.JSON;
import com.secoo.mall.common.core.service.UpDatas;
......@@ -11,7 +11,6 @@ import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
public class ShutDownDataReport implements UpDatas<ExecutorDetails> {
......@@ -47,6 +46,8 @@ public class ShutDownDataReport implements UpDatas<ExecutorDetails> {
// String monitor = "/monitorZ/" + obj.getName() + "/" + obj.getIp();
logger.info("ShutDownDataReport sendData: path:"+monitor+" data:"+ JSON.toJSONString(obj));
cliet.create(monitor, JSON.toJSONString(obj), true);
String contest= cliet.getContent(monitor);
logger.info("result-------->"+contest);
} catch (Exception e) {
LoggerUtil.info("Exception e:" ,e);
}
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/TomcatGracefulShutDown.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/TomcatGracefulShutDown.java
package com.secoo.mall.dubbo.service;
package com.secoo.mall.gracefulshutdown.component;
import com.secoo.mall.dubbo.service.impl.TomcatShutDownHook;
import com.secoo.mall.gracefulshutdown.component.hook.TomcatShutDownHook;
import org.apache.catalina.connector.Connector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/impl/TomcatShutDownHook.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/hook/TomcatShutDownHook.java
package com.secoo.mall.dubbo.service.impl;
package com.secoo.mall.gracefulshutdown.component.hook;
import com.secoo.mall.common.util.date.DateUtil;
import com.secoo.mall.common.util.string.StringUtil;
import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
import com.secoo.mall.dubbo.service.AbstractShutDown;
import com.secoo.mall.gracefulshutdown.component.AbstractShutDown;
import org.apache.catalina.connector.Connector;
import java.util.ArrayList;
import java.util.List;
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/condition/TomcatGracefulShutDownJudgment.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/condition/TomcatGracefulShutDownJudgment.java
package com.secoo.mall.dubbo.condition;
package com.secoo.mall.gracefulshutdown.condition;
import com.secoo.mall.dubbo.monitor.config.ConfigCenter;
import com.secoo.mall.gracefulshutdown.monitor.config.ConfigCenter;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.springframework.boot.SpringBootVersion;
......@@ -11,14 +11,14 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
public class TomcatGracefulShutDownJudgment implements Condition {
public static final Logger logger = LoggerFactory.getLogger(ConfigCenter.class);
public static volatile boolean flag = true;
public static boolean flag = true;
@Override
public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) {
String version=SpringBootVersion.getVersion();
logger.info("springboot version:"+version);
if (!flag) {//非servlet 环境 直接返回
if (!flag) {//非tomcat 环境 直接返回
return false;
}
try {
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/monitor/dubbo/service/ProviderService.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/dubbo/service/ProviderService.java
......@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.secoo.mall.dubbo.monitor.dubbo.service;
package com.secoo.mall.gracefulshutdown.monitor.dubbo.service;
import java.util.List;
/**
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/monitor/dubbo/service/RegistryServerSync.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/dubbo/service/RegistryServerSync.java
package com.secoo.mall.dubbo.monitor.dubbo.service;
package com.secoo.mall.gracefulshutdown.monitor.dubbo.service;
import com.alibaba.fastjson.JSON;
import com.secoo.mall.common.util.string.StringUtil;
import com.secoo.mall.dubbo.monitor.dubbo.Constants.Constants;
import com.secoo.mall.dubbo.monitor.utils.CoderUtil;
import com.secoo.mall.dubbo.monitor.utils.Stack;
import com.secoo.mall.dubbo.monitor.utils.Tool;
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.utils.StringUtils;
import org.apache.dubbo.registry.NotifyListener;
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/monitor/dubbo/service/impl/ProviderServiceImpl.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/dubbo/service/impl/ProviderServiceImpl.java
package com.secoo.mall.dubbo.monitor.dubbo.service.impl;
package com.secoo.mall.gracefulshutdown.monitor.dubbo.service.impl;
import com.secoo.mall.common.util.string.StringUtil;
import com.secoo.mall.dubbo.monitor.dubbo.Constants.Constants;
import com.secoo.mall.dubbo.monitor.dubbo.service.ProviderService;
import com.secoo.mall.dubbo.monitor.dubbo.service.RegistryServerSync;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.Constants.Constants;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.ProviderService;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.RegistryServerSync;
import org.apache.dubbo.common.URL;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
......@@ -15,7 +14,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentMap;
@Service
public class ProviderServiceImpl extends AbstractService implements ProviderService {
public ProviderServiceImpl(RegistryServerSync sync) {
super(sync);
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/monitor/utils/SpringContextHolder.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/utils/SpringContextHolder.java
package com.secoo.mall.dubbo.monitor.utils;
package com.secoo.mall.gracefulshutdown.monitor.utils;
import com.secoo.mall.dubbo.condition.TomcatGracefulShutDownJudgment;
import com.secoo.mall.gracefulshutdown.condition.TomcatGracefulShutDownJudgment;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/monitor/utils/Stack.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/utils/Stack.java
package com.secoo.mall.dubbo.monitor.utils;
package com.secoo.mall.gracefulshutdown.monitor.utils;
import java.io.IOException;
import java.io.PrintWriter;
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/monitor/utils/Tool.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/utils/Tool.java
......@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.secoo.mall.dubbo.monitor.utils;
package com.secoo.mall.gracefulshutdown.monitor.utils;
import com.secoo.mall.common.util.string.StringUtil;
import com.secoo.mall.gracefulshutdown.monitor.dubbo.Constants.Constants;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import java.lang.reflect.Field;
......@@ -72,4 +73,24 @@ public class Tool {
return null;
}
public static URL formUrl(String config, String group, String username, String password, String timeout) {
URL url = URL.valueOf(config);
if (StringUtils.isNotEmpty(group)) {
url = url.addParameter(Constants.GROUP_KEY, group);
}
if(StringUtil.isEmpty(timeout)){
url=url.addParameter("timeout",20000);
}else{
url=url.addParameter("timeout", Integer.valueOf(timeout).intValue());
}
if (StringUtils.isNotEmpty(username)) {
url = url.setUsername(username);
}
if (StringUtils.isNotEmpty(password)) {
url = url.setPassword(password);
}
return url;
}
}
matrix-gracefulshutdown/src/main/resources/META-INF/spring.factories
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.secoo.mall.dubbo.spring.boot.autoconfigure.MatrixGracefulShutDownAutoConfiguration,\
com.secoo.mall.dubbo.monitor.config.ConfigCenter
com.secoo.mall.gracefulshutdown.autoconfigure.MatrixGracefulShutDownAutoConfiguration
org.springframework.context.ApplicationContextInitializer=\
com.secoo.mall.dubbo.monitor.utils.SpringContextHolder
\ No newline at end of file
com.secoo.mall.gracefulshutdown.monitor.utils.SpringContextHolder
\ No newline at end of file
pom.xml
......@@ -252,6 +252,11 @@
<artifactId>apollo-client</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>4.1.2</version>
</dependency>
</dependencies>
......
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