From 18ea30df916c6ccf4f0a75471b0936303b356a6f Mon Sep 17 00:00:00 2001
From: michaeltx <wtx_michael@163.com>
Date: 星期日, 09 二月 2020 21:43:11 +0800
Subject: [PATCH] 创建巡检路线模块

---
 WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 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..6169b1f 100644
--- a/WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java
+++ b/WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java
@@ -1,20 +1,15 @@
 package com.java110.web;
 
 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 com.java110.front.core.VueComponentTemplate;
 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 +27,32 @@
  * @date 2016骞�8鏈�6鏃�
  * @tag
  */
-@SpringBootApplication(scanBasePackages={"com.java110.service","com.java110.web","com.java110.core","com.java110.cache"})
+@SpringBootApplication(scanBasePackages = {"com.java110.front.aop",
+        "com.java110.service.configuration",
+        "com.java110.front.filter",
+        "com.java110.service.init",
+        "com.java110.web",
+        "com.java110.core",
+        "com.java110.config.properties.code",
+        "com.java110.cache",
+        "com.java110.report",
+        "com.java110.front"
+})
 @EnableDiscoveryClient
 //@EnableConfigurationProperties(EventProperties.class)
-
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
 public class WebServiceApplicationStart {
+
+    private static Logger logger = LoggerFactory.getLogger(WebServiceApplicationStart.class);
+
 
     /**
      * 瀹炰緥鍖朢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,9 +60,13 @@
     }
 
 
-    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);
+    public static void main(String[] args) throws Exception {
+        try {
+            ApplicationContext context = SpringApplication.run(WebServiceApplicationStart.class, args);
+            ServiceStartInit.initSystemConfig(context);
+            VueComponentTemplate.initComponent(VueComponentTemplate.DEFAULT_COMPONENT_PACKAGE_PATH);
+        }catch (Throwable e){
+            logger.error("绯荤粺鍚姩澶辫触",e);
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0