From 72398634c4a0cbf40930bb9e715ea3f0c69183eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 14 八月 2020 22:26:42 +0800
Subject: [PATCH] 优化查询属性规格

---
 service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java b/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
index 69c783c..f3c21c7 100644
--- a/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
+++ b/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
@@ -1,6 +1,7 @@
 package com.java110.common;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
 import com.java110.service.init.ServiceStartInit;
 import org.slf4j.Logger;
@@ -15,7 +16,7 @@
 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;
 
@@ -36,13 +37,15 @@
         "com.java110.config.properties.code",
         "com.java110.db"},
         exclude = {LiquibaseAutoConfiguration.class,
-                org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
+                org.activiti.spring.boot.SecurityAutoConfiguration.class,
+                org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class}
+        )
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.common.listener"})
 @EnableFeignClients(basePackages = {
-        "com.java110.core.smo.user",
-        "com.java110.core.smo.store"
+        "com.java110.intf.user",
+        "com.java110.intf.store"
 })
 public class CommonServiceApplicationStart {
 
@@ -58,7 +61,7 @@
     @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;
     }
 
@@ -68,9 +71,9 @@
      * @return restTemplate
      */
     @Bean
-    public com.java110.core.client.RestTemplate restTemplateNoLoadBalanced() {
+    public RestTemplate outRestTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
+        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
     }
 

--
Gitblit v1.8.0