diff --git a/demo-gateway-solon/pom.xml b/demo-gateway-solon/pom.xml
index 3127853cc87a94fd0479e4f3320255ed2e898b65..16a2a6720f6221d76fcf43270a73b68fedc6b0ee 100644
--- a/demo-gateway-solon/pom.xml
+++ b/demo-gateway-solon/pom.xml
@@ -11,11 +11,14 @@
- org.noear
demo-gateway-solon
dev
jar
+
+ 17
+
+
org.noear
@@ -42,7 +45,7 @@
solon-maven-plugin
- com.demo.gateway.DemoGatewayApp
+ com.demo.gateway.SolonCloudGatewayApp
diff --git a/demo-gateway-solon/src/main/java/com/demo/gateway/DemoGatewayApp.java b/demo-gateway-solon/src/main/java/com/demo/gateway/SolonCloudGatewayApp.java
similarity index 55%
rename from demo-gateway-solon/src/main/java/com/demo/gateway/DemoGatewayApp.java
rename to demo-gateway-solon/src/main/java/com/demo/gateway/SolonCloudGatewayApp.java
index b7513674b6460eb4872dfd080fe19098c2752415..79a18f2d5e35ab8838f2b8750803fde59845d4c6 100644
--- a/demo-gateway-solon/src/main/java/com/demo/gateway/DemoGatewayApp.java
+++ b/demo-gateway-solon/src/main/java/com/demo/gateway/SolonCloudGatewayApp.java
@@ -3,8 +3,8 @@ package com.demo.gateway;
import org.noear.solon.Solon;
-public class DemoGatewayApp {
+public class SolonCloudGatewayApp {
public static void main(String[] args) {
- Solon.start(DemoGatewayApp.class, args);
+ Solon.start(SolonCloudGatewayApp.class, args);
}
}
diff --git a/demo-gateway-spring/pom.xml b/demo-gateway-spring/pom.xml
index ab1d9a7fc9faae422c9cf1c88d91b46130742639..a39cdb456b57f84b0306223b0ad42c58fe92fe4c 100644
--- a/demo-gateway-spring/pom.xml
+++ b/demo-gateway-spring/pom.xml
@@ -5,17 +5,20 @@
4.0.0
- org.springframework.cloud
- spring-cloud-dependencies
- Greenwich.SR4
-
+ org.noear
+ demo_solon_and_spring-gateway
+ dev
- org.noear
demo-gateway-spring
dev
jar
+
+ 3.3.3
+ 2023.0.2
+
+
org.springframework.cloud
@@ -31,11 +34,29 @@
org.projectlombok
lombok
- 1.18.30
provided
+
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ ${spring-cloud.version}
+ pom
+ import
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${spring-boot.version}
+ pom
+ import
+
+
+
+
${project.artifactId}
@@ -43,7 +64,7 @@
org.springframework.boot
spring-boot-maven-plugin
- ${spring-cloud-bus.version}
+ ${spring-boot.version}
diff --git a/demo-gateway-spring/src/main/java/com/demo/gateway/DemoGatewayApplication.java b/demo-gateway-spring/src/main/java/com/demo/gateway/SpringCloudGatewayApplication.java
similarity index 65%
rename from demo-gateway-spring/src/main/java/com/demo/gateway/DemoGatewayApplication.java
rename to demo-gateway-spring/src/main/java/com/demo/gateway/SpringCloudGatewayApplication.java
index 2cb781001c48ee31101874652b9f66f17cedf527..ad17efeb37d3bed326a885e515731e2e86d40156 100644
--- a/demo-gateway-spring/src/main/java/com/demo/gateway/DemoGatewayApplication.java
+++ b/demo-gateway-spring/src/main/java/com/demo/gateway/SpringCloudGatewayApplication.java
@@ -4,9 +4,9 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-public class DemoGatewayApplication {
+public class SpringCloudGatewayApplication {
public static void main(String[] args) {
- SpringApplication.run(DemoGatewayApplication.class, args);
+ SpringApplication.run(SpringCloudGatewayApplication.class, args);
}
}
diff --git a/demo-service-solon/pom.xml b/demo-service-solon/pom.xml
index 3fd66e3c3bb6e5e4b31197c75ddab1097cf39232..dc1a845a4149275250c1f4d5f63dce266feef5b0 100644
--- a/demo-service-solon/pom.xml
+++ b/demo-service-solon/pom.xml
@@ -16,6 +16,9 @@
dev
jar
+
+ 17
+
diff --git a/pom.xml b/pom.xml
index 54ded07cfcd5bb7cf10da5fe1abe17070bdc91fd..918412b9bfa2e5209ed1fa509e94cf7a4da90f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,4 +15,23 @@
demo-service-solon
+
+ 3.13.0
+ 17
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler.version}
+
+ ${java.version}
+ ${java.version}
+ UTF-8
+
+
+
+
\ No newline at end of file