From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 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
old mode 100644
new mode 100755
index 69c783c..d13c24e
--- 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,22 @@
+/*
+ * Copyright 2017-2020 鍚村鏂� and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
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 +31,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 +52,21 @@
"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",
+ "com.java110.intf.fee",
+ "com.java110.intf.community",
+ "com.java110.intf.job",
+ "com.java110.intf.order",
+ "com.java110.intf.oa",
+ "com.java110.intf.report"
})
public class CommonServiceApplicationStart {
@@ -58,7 +82,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 +92,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