From cbc1f9db3d796683d88d6d30df3659984dfbeda3 Mon Sep 17 00:00:00 2001
From: webapp <webapp@home-server.attdns.com>
Date: 星期一, 30 九月 2019 22:56:12 +0800
Subject: [PATCH] 取消java110-common jar包，提升为CommonService服务,将之前的Java110-common内容变更为Java110-utils包
---
WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java b/WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java
index fd3e524..924ebba 100644
--- a/WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java
+++ b/WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java
@@ -2,19 +2,12 @@
import com.java110.service.init.ServiceStartInit;
import com.java110.web.core.VueComponentTemplate;
-import org.apache.catalina.Context;
-import org.apache.catalina.connector.Connector;
-import org.apache.tomcat.util.descriptor.web.SecurityCollection;
-import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
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.autoconfigure.jdbc.DataSourceAutoConfiguration;
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;
@@ -32,18 +25,24 @@
* @date 2016骞�8鏈�6鏃�
* @tag
*/
-@SpringBootApplication(scanBasePackages={"com.java110.service","com.java110.web","com.java110.core","com.java110.cache"})
+@SpringBootApplication(scanBasePackages = {"com.java110.service.aop",
+ "com.java110.service.configuration",
+ "com.java110.service.controller",
+ "com.java110.service.filter",
+ "com.java110.service.init",
+ "com.java110.web", "com.java110.core", "com.java110.cache"})
@EnableDiscoveryClient
//@EnableConfigurationProperties(EventProperties.class)
-
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
public class WebServiceApplicationStart {
/**
* 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
+ *
* @return restTemplate
*/
@Bean
- @LoadBalanced
+ //@LoadBalanced
public RestTemplate restTemplate() {
StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
@@ -51,7 +50,7 @@
}
- public static void main(String[] args) throws Exception{
+ public static void main(String[] args) throws Exception {
ApplicationContext context = SpringApplication.run(WebServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
VueComponentTemplate.initComponent(VueComponentTemplate.DEFAULT_COMPONENT_PACKAGE_PATH);
--
Gitblit v1.8.0