Browse Source

更新项目中信息的springboot版本以及urule版本,优化项目配置

jacky6024 8 năm trước cách đây
mục cha
commit
0d2f9c7110

+ 5 - 15
urule-springboot/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bstek.urule</groupId>
 	<artifactId>urule-springboot</artifactId>
-	<version>0.0.1</version>
+	<version>0.0.1-SNAPSHOT</version>
 	<properties>
 		<java.version>1.7</java.version>
 		<tomcat.version>8.5.5</tomcat.version>
@@ -33,24 +33,14 @@
 		<url>http://www.bstek.com</url>
 	</organization>  	
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+	    <groupId>org.springframework.boot</groupId>
+	    <artifactId>spring-boot-starter-parent</artifactId>
+	    <version>1.5.8.RELEASE</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-tomcat</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
@@ -59,7 +49,7 @@
 		<dependency>
 			<groupId>com.bstek.urule</groupId>
 			<artifactId>urule-console</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.derby</groupId>

+ 0 - 11
urule-springboot/src/main/java/com/bstek/urule/springboot/Application.java

@@ -2,18 +2,13 @@ package com.bstek.urule.springboot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
 /**
  * @author Jacky.gao
  * @since 2016年10月12日
  */
-@Configuration
 @ComponentScan
 @EnableAutoConfiguration
 @ImportResource({"classpath:urule-console-context.xml"})
@@ -21,10 +16,4 @@ public class Application {
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class,args);
 	}
-	
-	@Bean
-	public EmbeddedServletContainerFactory servletContainer() {
-	    TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();
-	    return tomcat;
-	}
 }

+ 0 - 1
urule-springboot/src/main/java/com/bstek/urule/springboot/PropertiesConfiguration.java

@@ -3,7 +3,6 @@ package com.bstek.urule.springboot;
 import java.util.Properties;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.stereotype.Component;
 
 import com.bstek.urule.URulePropertyPlaceholderConfigurer;