wuxw лет назад: 7
Родитель
Сommit
fb748ef409

+ 4 - 3
Api/src/main/java/com/java110/api/ApiApplicationStart.java

@@ -1,6 +1,7 @@
 package com.java110.api;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
 import com.java110.event.service.api.ServiceDataFlowEventPublishing;
 import com.java110.service.init.ServiceStartInit;
 import io.swagger.annotations.ApiOperation;
@@ -14,7 +15,7 @@ import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
+
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -53,7 +54,7 @@ public class ApiApplicationStart {
     @LoadBalanced
     public RestTemplate restTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 
@@ -64,7 +65,7 @@ public class ApiApplicationStart {
     @Bean
     public RestTemplate restTemplateNoLoadBalanced() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 

+ 2 - 1
Api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java

@@ -11,6 +11,7 @@ import com.java110.common.kafka.KafkaFactory;
 import com.java110.common.log.LoggerEngine;
 import com.java110.common.util.DateUtil;
 import com.java110.common.util.StringUtil;
+import com.java110.core.client.RestTemplate;
 import com.java110.core.context.ApiDataFlow;
 import com.java110.core.context.DataFlow;
 import com.java110.core.factory.AuthenticationFactory;
@@ -28,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
+
 
 import java.util.Date;
 import java.util.List;

+ 4 - 3
CenterService/src/main/java/com/java110/center/CenterServiceApplicationStart.java

@@ -3,6 +3,7 @@ package com.java110.center;
 import com.java110.center.smo.ICenterServiceCacheSMO;
 import com.java110.common.factory.ApplicationContextFactory;
 import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
 import com.java110.event.center.DataFlowEventPublishing;
 import com.java110.event.center.init.EventConfigInit;
 import com.java110.service.init.ServiceStartInit;
@@ -14,7 +15,7 @@ import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
+
 
 import java.nio.charset.Charset;
 
@@ -43,7 +44,7 @@ public class CenterServiceApplicationStart {
     @LoadBalanced
     public RestTemplate restTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 
@@ -54,7 +55,7 @@ public class CenterServiceApplicationStart {
     @Bean
     public RestTemplate restTemplateNoLoadBalanced() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 

+ 9 - 0
CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceCacheSMOImpl.java

@@ -16,6 +16,8 @@ import com.java110.entity.mapping.Mapping;
 import com.java110.entity.service.DataQuery;
 import com.java110.entity.service.ServiceSql;
 import com.java110.service.dao.IQueryServiceDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +33,8 @@ import java.util.Map;
 @Service("centerServiceCacheSMOImpl")
 public class CenterServiceCacheSMOImpl implements ICenterServiceCacheSMO {
 
+    private final static Logger logger = LoggerFactory.getLogger(CenterServiceCacheSMOImpl.class);
+
     @Autowired
     ICenterServiceDAO centerServiceDAOImpl;
 
@@ -117,6 +121,9 @@ public class CenterServiceCacheSMOImpl implements ICenterServiceCacheSMO {
     }
 
     private void doFlushServiceSql() {
+
+        logger.debug("开始刷新 ServiceSql数据到redis数据库中");
+
         List<ServiceSql> serviceSqls = queryServiceDAOImpl.qureyServiceSqlAll();
 
         if(serviceSqls == null || serviceSqls.size() == 0){
@@ -161,6 +168,7 @@ public class CenterServiceCacheSMOImpl implements ICenterServiceCacheSMO {
     }
 
     private void doFlushMapping() {
+        logger.debug("开始刷新 Mapping数据到redis数据库中");
         List<Mapping> mappings = centerServiceDAOImpl.getMappingInfoAll();
         //删除原始数据
         MappingCache.removeData(MappingCache._SUFFIX_MAPPING);
@@ -216,6 +224,7 @@ public class CenterServiceCacheSMOImpl implements ICenterServiceCacheSMO {
     }
 
     private void doFlushAppRoute() {
+        logger.debug("开始刷新 AppRoute数据到redis数据库中");
         List<Map> appInfos = centerServiceDAOImpl.getAppRouteAndServiceInfoAll();
         Map<String,List<AppRoute>> appRoustsMap = new HashMap<String,List<AppRoute>>();
         List<AppRoute> appRoutes = null;

+ 2 - 1
CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java

@@ -12,6 +12,7 @@ import com.java110.common.factory.ApplicationContextFactory;
 import com.java110.common.kafka.KafkaFactory;
 import com.java110.common.log.LoggerEngine;
 import com.java110.common.util.*;
+import com.java110.core.client.RestTemplate;
 import com.java110.core.context.DataFlow;
 import com.java110.core.factory.AuthenticationFactory;
 import com.java110.core.factory.DataFlowFactory;
@@ -30,7 +31,7 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
+
 
 import java.util.*;
 

+ 9 - 2
java110-config/src/main/resources/logback.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
+<configuration scan="true" scanPeriod="60 seconds">
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
 
     <!-- 控制台输出 -->
@@ -61,6 +61,8 @@
     </appender>
 
     <logger name="org.springframework.web" level="DEBUG"/>
+    <logger name="com.java110.api" level="DEBUG"/>
+    <logger name="com.java110.center" level="DEBUG"/>
     <logger name="com.java110" level="DEBUG"/>
 
     <!--myibatis log configure-->
@@ -68,10 +70,15 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <!--
+    <logger name="com.java110" level="DEBUG">
+        <appender-ref ref="STDOUT_FILE" />
+    </logger>-->
 
-    <!-- 日志输出级别 -->
+    <!-- 日志输出级别
     <root level="DEBUG">
         <appender-ref ref="STDOUT_FILE" />
         <appender-ref ref="DEBUG_FILE" />
     </root>
+    -->
 </configuration>

+ 45 - 0
java110-core/src/main/java/com/java110/core/client/RestTemplate.java

@@ -0,0 +1,45 @@
+package com.java110.core.client;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RequestCallback;
+import org.springframework.web.client.ResponseExtractor;
+import org.springframework.web.client.RestClientException;
+
+/**
+ * @author wux
+ * @create 2019-02-02 下午8:28
+ * @desc 对RestTemplate类封装
+ **/
+public class RestTemplate extends org.springframework.web.client.RestTemplate {
+
+    private final static Logger logger = LoggerFactory.getLogger(RestTemplate.class);
+
+    // exchange
+
+    /**
+     * 重写spring RestTemplate类 加入日志等信息
+     * @param url
+     * @param method
+     * @param requestEntity
+     * @param responseType
+     * @param uriVariables
+     * @param <T>
+     * @return
+     * @throws RestClientException
+     */
+    @Override
+    public <T> ResponseEntity<T> exchange(String url, HttpMethod method,
+                                          HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) throws RestClientException {
+
+        logger.debug("请求信息:url:{},method:{},request:{},uriVariables:{}",url,method,requestEntity,uriVariables);
+        ResponseEntity<T> responseEntity = super.exchange(url, method, requestEntity, responseType, uriVariables);
+        logger.debug("返回信息:responseEntity:{}",responseEntity);
+
+        return responseEntity;
+    }
+
+}