diff --git a/ServiceSite/facade/pom.xml b/ServiceSite/facade/pom.xml index 475a41c7c3e54fa59f6151175f3545051bee9843..c630b1ff9fec079a4566292b643a84aec3a7e2f9 100644 --- a/ServiceSite/facade/pom.xml +++ b/ServiceSite/facade/pom.xml @@ -13,6 +13,26 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <dependencyManagement> + <dependencies> + <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-dependencies --> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-dependencies</artifactId> + <version>Hoxton.SR4</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>2.2.9.RELEASE</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>com.seasky</groupId> @@ -20,16 +40,12 @@ <version>1.4.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>5.2.10.RELEASE</version> - <scope>compile</scope> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> </dependency> <dependency> <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-openfeign-core</artifactId> - <version>2.2.3.RELEASE</version> - <scope>compile</scope> + <artifactId>spring-cloud-starter-openfeign</artifactId> </dependency> </dependencies> diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml index f8daca578e1c6bdff544a079cd5b227a774b6989..c2589c353c92e11cc6ab9fef303fcc0f4f4e96c2 100644 --- a/ServiceSite/pom.xml +++ b/ServiceSite/pom.xml @@ -11,9 +11,9 @@ <java.version>1.8</java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <spring-boot.version>2.2.9.RELEASE</spring-boot.version> - <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version> - <spring-cloud.version>Hoxton.SR6</spring-cloud.version> + <spring-boot.version>2.2.1.RELEASE</spring-boot.version> + <spring-cloud-alibaba.version>2.2.0.RELEASE</spring-cloud-alibaba.version> + <spring-cloud.version>Hoxton.SR4</spring-cloud.version> <docker.directory>docker</docker.directory> <docker-maven-plugin.version>0.4.10</docker-maven-plugin.version> @@ -27,23 +27,23 @@ </dependency>--> <!---swagger--> <!--闇€瑕佸紩鍏ヨjar鎵嶈兘浣縝ootstrap閰嶇疆鏂囦欢鐢熸晥--> - <!-- <dependency> + <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-context</artifactId> - </dependency>--> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </dependency> - <!--<dependency> + <dependency> <groupId>com.alibaba.cloud</groupId> <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId> </dependency> <dependency> <groupId>com.alibaba.cloud</groupId> <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId> - </dependency>--> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -190,7 +190,13 @@ <dependencyManagement> <dependencies> - + <dependency> + <groupId>com.alibaba.cloud</groupId> + <artifactId>spring-cloud-alibaba-dependencies</artifactId> + <version>${spring-cloud-alibaba.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> diff --git a/ServiceSite/src/main/java/com/seasky/Application.java b/ServiceSite/src/main/java/com/seasky/Application.java index 7376509414d754769dc70d4c9091c15fadb35d93..a3456b843e8d2f192f2ac25b14749a7c9bdd9cda 100644 --- a/ServiceSite/src/main/java/com/seasky/Application.java +++ b/ServiceSite/src/main/java/com/seasky/Application.java @@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.scheduling.annotation.EnableAsync; /*** * @author bandi @@ -16,6 +17,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; "com.seasky.some-api" ,"com.seasky.other-api" }) +@EnableAsync public class Application { public static void main(String[] args) {