Merge branch 'feature/common-monitoring-20220701' into 'master'

http://confluence.quantgroup.cn/pages/viewpage.action?pageId=79731517

See merge request !80

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.quantgroup</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>0.2.6</version>
+        <version>0.5.0</version>
     </parent>
 
     <artifactId>xyqb-user2</artifactId>
@@ -288,24 +288,27 @@
         <dependency>
             <groupId>cn.quantgroup</groupId>
             <artifactId>commons-spring</artifactId>
+            <version>0.2.6</version>
         </dependency>
         <dependency>
             <groupId>cn.quantgroup</groupId>
             <artifactId>commons-core</artifactId>
+            <version>0.2.6</version>
         </dependency>
         <dependency>
             <groupId>cn.quantgroup</groupId>
             <artifactId>shutdown-spring-boot-starter</artifactId>
+            <version>0.2.6</version>
         </dependency>
-        <dependency>
-            <groupId>cn.quantgroup</groupId>
-            <artifactId>brave-spring-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.quantgroup</groupId>-->
+<!--            <artifactId>brave-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>cn.quantgroup</groupId>
-            <artifactId>enoch-agent-spring-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.quantgroup</groupId>-->
+<!--            <artifactId>enoch-agent-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
         <!--logback使用1.1.4版本-->
         <dependency>
             <groupId>ch.qos.logback</groupId>

src/main/java/cn/quantgroup/xyqb/config/event/EventConfig.java

 package cn.quantgroup.xyqb.config.event;
 
-import cn.quantgroup.tech.brave.service.ITechExecutorServiceBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -9,7 +8,6 @@ import org.springframework.context.event.SimpleApplicationEventMulticaster;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.support.TaskUtils;
 
-import javax.annotation.Resource;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -18,9 +16,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 @Configuration
 public class EventConfig {
 
-    @Resource
-    private ITechExecutorServiceBuilder techExecutorServiceBuilder;
-
     @Bean
     public ApplicationEventMulticaster applicationEventMulticaster(Executor taskExecutor) {
         SimpleApplicationEventMulticaster simpleApplicationEventMulticaster = new SimpleApplicationEventMulticaster();
@@ -40,7 +35,7 @@ public class EventConfig {
         poolTaskExecutor.setWaitForTasksToCompleteOnShutdown(true);
         poolTaskExecutor.setRejectedExecutionHandler(new RejectedHandler());
         poolTaskExecutor.initialize();
-        return techExecutorServiceBuilder.buildExecutorService(poolTaskExecutor.getThreadPoolExecutor());
+        return poolTaskExecutor;
     }
 
     public static class RejectedHandler implements RejectedExecutionHandler {

src/main/java/cn/quantgroup/xyqb/config/http/HttpConfig.java

 package cn.quantgroup.xyqb.config.http;
 
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
-
-import javax.annotation.Resource;
-import javax.net.ssl.SSLContext;
-
+import cn.quantgroup.tool.monitor.metric.api.TechHttpClient;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.config.Registry;
@@ -29,7 +25,6 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.cookie.BestMatchSpecFactory;
 import org.apache.http.impl.cookie.BrowserCompatSpec;
 import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
-
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -39,11 +34,12 @@ import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.web.filter.CharacterEncodingFilter;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import javax.net.ssl.SSLContext;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
 
-import cn.quantgroup.tech.brave.service.ITechHttpClient;
 
 /**
  * Created by Miraculous on 15/7/12.
@@ -51,8 +47,7 @@ import cn.quantgroup.tech.brave.service.ITechHttpClient;
 @Configuration
 public class HttpConfig {
     //注入brave-spring-boot-starter提供的techHttpClient
-    @Resource
-    private ITechHttpClient techHttpClient;
+
 
     @Bean
     public FilterRegistrationBean filterRegistrationBean() {
@@ -144,7 +139,7 @@ public class HttpConfig {
         ConnectionKeepAliveStrategy keepAliveStrategy = new DefaultConnectionKeepAliveStrategy();
 
         // httpclient
-        return techHttpClient.createHttpClientBuilder()
+        return TechHttpClient.createHttpClientBuilder()
                 .setConnectionManager(connectionManager)
                 .setRetryHandler(retryHandler)
                 .setKeepAliveStrategy(keepAliveStrategy)

src/main/java/cn/quantgroup/xyqb/config/mq/LoanVestMqConfig.java

 package cn.quantgroup.xyqb.config.mq;
 
-import cn.quantgroup.tech.brave.service.ITechRabbitBuilder;
 import org.springframework.amqp.core.*;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
@@ -12,8 +11,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
-import javax.annotation.Resource;
-
 /**
  * //马甲包 xuran
  */
@@ -36,8 +33,6 @@ public class LoanVestMqConfig {
     @Value("${loanvest.rabbitmq.connection.virtual-host}")
     private String virtualHost;
 
-    @Resource
-    private ITechRabbitBuilder techRabbitBuilder;
 
     @Primary
     @Bean(name = "vestFactory")
@@ -84,7 +79,7 @@ public class LoanVestMqConfig {
     @Primary
     @Bean(name = "rabbitTemplate")
     public RabbitTemplate loanVestTemplate(@Qualifier("vestFactory") ConnectionFactory vestFactory) {
-        RabbitTemplate template = techRabbitBuilder.createRabbitTemplate(vestFactory);
+        RabbitTemplate template = new RabbitTemplate(vestFactory);
         template.setExchange(loanVestExchange);
         return template;
     }

src/main/java/cn/quantgroup/xyqb/config/mq/RegisterMqConfig.java

 package cn.quantgroup.xyqb.config.mq;
 
-import cn.quantgroup.tech.brave.service.ITechRabbitBuilder;
-import org.springframework.amqp.core.AmqpAdmin;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.FanoutExchange;
-import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.*;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory.CacheMode;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
@@ -17,7 +12,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,9 +42,6 @@ public class RegisterMqConfig {
     @Value("${register.rabbitmq.connection.virtual-host}")
     private String virtualHost;
 
-    @Resource
-    private ITechRabbitBuilder techRabbitBuilder;
-
 
     @Bean(name = "registerMqFactory")
     public ConnectionFactory registerMqFactory() {
@@ -91,7 +82,7 @@ public class RegisterMqConfig {
 
     @Bean(name = "registerRabbitTemplate")
     public RabbitTemplate registerTemplate(@Qualifier("registerMqFactory") ConnectionFactory registerMqFactory) {
-        RabbitTemplate template = techRabbitBuilder.createRabbitTemplate(registerMqFactory);
+        RabbitTemplate template = new RabbitTemplate(registerMqFactory);
         template.setExchange(registerMqExchange);
         return template;
     }
@@ -117,7 +108,7 @@ public class RegisterMqConfig {
 
     @Bean(name = "registerRabbitTemplate4Gdt")
     public RabbitTemplate registerTemplate4Gdt(@Qualifier("registerMqFactory") ConnectionFactory registerMqFactory) {
-        RabbitTemplate template = techRabbitBuilder.createRabbitTemplate(registerMqFactory);
+        RabbitTemplate template = new RabbitTemplate(registerMqFactory);
         template.setExchange(exchange4Gdt);
         return template;
     }
@@ -138,7 +129,7 @@ public class RegisterMqConfig {
 
     @Bean(name = "wechatRabbitTemplate")
     public RabbitTemplate wechatRabbitTemplate(@Qualifier("commonConnectionFactory") ConnectionFactory commonConnectionFactory) {
-        RabbitTemplate rabbitTemplate = techRabbitBuilder.createRabbitTemplate(commonConnectionFactory);
+        RabbitTemplate rabbitTemplate =  new RabbitTemplate(commonConnectionFactory);
         rabbitTemplate.setMessageConverter(new Jackson2JsonMessageConverter());
         RabbitAdmin rabbitAdmin = new RabbitAdmin(commonConnectionFactory);
         String queueName = "wechat_bind";

src/main/java/cn/quantgroup/xyqb/config/mq/RegisteredNotifyBlackHoleMqConfig.java

 package cn.quantgroup.xyqb.config.mq;
 
-import cn.quantgroup.tech.brave.service.ITechRabbitBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
@@ -10,8 +9,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.Resource;
-
 /**
  * Date: 2020/1/15
  * Time: 下午2:20
@@ -33,9 +30,6 @@ public class RegisteredNotifyBlackHoleMqConfig {
     @Value("${registered.notify.black.hole.rabbitmq.connection.virtual-host}")
     private String virtualHost;
 
-    @Resource
-    private ITechRabbitBuilder techRabbitBuilder;
-
     @Bean(name = "registeredNotifyBlackHoleFactory")
     public ConnectionFactory connectionFactory() {
         CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host, port);
@@ -53,6 +47,7 @@ public class RegisteredNotifyBlackHoleMqConfig {
 
     @Bean(name = "registeredNotifyBlackHoleRabbitTemplate")
     public RabbitTemplate rabbitTemplate(@Qualifier("registeredNotifyBlackHoleFactory") ConnectionFactory connectionFactory) {
-        return techRabbitBuilder.createRabbitTemplate(connectionFactory);
+         RabbitTemplate template = new RabbitTemplate(connectionFactory);
+         return template;
     }
 }

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

 package cn.quantgroup.xyqb.service.http.impl;
 
-import cn.quantgroup.tech.brave.service.ITechHttpClient;
+import cn.quantgroup.tool.monitor.metric.api.TechHttpClient;
 import cn.quantgroup.xyqb.service.http.BodyType;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.util.PasswordUtil;
@@ -42,11 +42,8 @@ import org.apache.http.impl.cookie.BrowserCompatSpec;
 import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import javax.net.ssl.SSLContext;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
@@ -63,8 +60,6 @@ public class HttpServiceImpl implements IHttpService {
 
     private static final int TIME_OUT = 60 * 1000;  // 超时时间
     //注入brave-spring-boot-starter提供的techHttpClient
-    @Resource
-    private ITechHttpClient techHttpClient;
 
     @Override
     public String get(String uri) {
@@ -200,7 +195,7 @@ public class HttpServiceImpl implements IHttpService {
         ConnectionKeepAliveStrategy keepAliveStrategy = new DefaultConnectionKeepAliveStrategy();
 
         // httpclient
-        return techHttpClient.createHttpClientBuilder()
+        return TechHttpClient.createHttpClientBuilder()
                 .setConnectionManager(connectionManager)
                 .setRetryHandler(retryHandler)
                 .setKeepAliveStrategy(keepAliveStrategy)

src/test/java/login/UserLoginTest.java

 package login;
 
-import cn.quantgroup.tech.brave.service.ITechHttpClient;
+import cn.quantgroup.tool.monitor.metric.api.TechHttpClient;
 import cn.quantgroup.xyqb.Bootstrap;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.controller.external.UserController;
@@ -48,9 +48,6 @@ public class UserLoginTest {
     @Resource
     private InnerController innerController;
     //注入brave-spring-boot-starter提供的techHttpClient
-    @Resource
-    private ITechHttpClient techHttpClient;
-
     @Test
     public void testQuery(){
         Address byUserId = iAddressService.findByUserId(1L);
@@ -97,7 +94,7 @@ public class UserLoginTest {
         String token = authBean.getToken();
         System.out.println("user token:" + token);
         //用获取到的token请求xyqb的receive_token
-        CloseableHttpClient httpClient = techHttpClient.createHttpClientBuilder().build();
+        CloseableHttpClient httpClient = TechHttpClient.createHttpClientBuilder().build();
         HttpPost post = new HttpPost("http://localhost:9004/ex/login/receive_token");
 
         List<NameValuePair> pairList = new ArrayList<>();