From 3d85fd7de42ead48fd50a99ee3d5d29bbd403b3c Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: 星期一, 23 十一月 2020 10:48:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java b/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
index e215f6e..7e2652e 100644
--- a/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
+++ b/service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
@@ -1,3 +1,18 @@
+/*
+ * 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.order;
import com.java110.utils.cache.MappingCache;
@@ -39,11 +54,11 @@
@Java110ListenerDiscovery(listenerPublishClass = DataFlowEventPublishing.class,
basePackages = {"com.java110.order.listener"})
@EnableFeignClients(basePackages = {
- "com.java110.core.smo.code",
- "com.java110.core.smo.user",
- "com.java110.core.smo.common",
- "com.java110.core.smo.community",
- "com.java110.core.smo.fee"
+ "com.java110.intf.code",
+ "com.java110.intf.user",
+ "com.java110.intf.common",
+ "com.java110.intf.community",
+ "com.java110.intf.fee"
})
public class OrderServiceApplicationStart {
@@ -68,7 +83,7 @@
* @return restTemplate
*/
@Bean
- public RestTemplate restTemplateNoLoadBalanced() {
+ public RestTemplate outRestTemplate() {
StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
return restTemplate;
--
Gitblit v1.8.0