From 2ece6f6cd23d7b717881dd54a9fc74877096ecee Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期一, 07 五月 2018 23:13:59 +0800
Subject: [PATCH] 控制服务实现登录功能 和菜单展示，以及中心服务bug修复
---
ConsoleService/src/main/java/com/java110/console/ConsoleServiceApplicationStart.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ConsoleService/src/main/java/com/java110/console/ConsoleServiceApplicationStart.java b/ConsoleService/src/main/java/com/java110/console/ConsoleServiceApplicationStart.java
index fd18037..3251094 100644
--- a/ConsoleService/src/main/java/com/java110/console/ConsoleServiceApplicationStart.java
+++ b/ConsoleService/src/main/java/com/java110/console/ConsoleServiceApplicationStart.java
@@ -1,5 +1,6 @@
package com.java110.console;
+import com.java110.service.init.ServiceStartInit;
import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
@@ -8,11 +9,15 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
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;
/**
@@ -36,7 +41,9 @@
@Bean
@LoadBalanced
public RestTemplate restTemplate() {
- return new RestTemplate();
+ StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+ RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+ return restTemplate;
}
@Bean
@@ -61,7 +68,7 @@
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
connector.setScheme("http");
//Connector鐩戝惉鐨刪ttp鐨勭鍙ｅ彿
- connector.setPort(7001);
+ connector.setPort(6001);
connector.setSecure(false);
//鐩戝惉鍒癶ttp鐨勭鍙ｅ彿鍚庤浆鍚戝埌鐨刪ttps鐨勭鍙ｅ彿
connector.setRedirectPort(8443);
@@ -70,6 +77,6 @@
public static void main(String[] args) throws Exception{
ApplicationContext context = SpringApplication.run(ConsoleServiceApplicationStart.class, args);
-
+ ServiceStartInit.initSystemConfig(context);
}
}
\ No newline at end of file
--
Gitblit v1.8.0