Merge branch 'main' of https://svn.youshengyun.com:3000/dingzhaojun/demo01.git into main

compose-dev.yml

@@ -53,12 +53,7 @@ services:
       - CONSUL_ENABLE_UI=true
       - CONSUL_HTTP_PORT_NUMBER=8500
     ports:
-      - '8300:8300'
-      - '8301:8301'
-      - '8301:8301/udp'
       - '8500:8500'
-      - '8600:8600'
-      - '8600:8600/udp'
     volumes:
       - d:/docker-data/consul:/bitnami/consul
    
@@ -90,7 +85,7 @@ services:
     networks:
       - y9-share-net
     ports:
-      - "9092:9092"
+      #- "9092:9092"
       - "9094:9094"
     environment:
       - KAFKA_CFG_NODE_ID=0

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.0-RC2</version>
+		<version>3.2.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>net.risesoft</groupId>
@@ -43,7 +43,7 @@
 		<spring-cloud.version>2023.0.0-RC1</spring-cloud.version>
 	</properties>
 
-	<dependencyManagement>
+	<!--<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
@@ -53,7 +53,7 @@
 				<scope>import</scope>
 			</dependency>
 		</dependencies>
-	</dependencyManagement>
+	</dependencyManagement>-->
 
 	<dependencies>
 		<dependency>
@@ -98,6 +98,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-consul-discovery</artifactId>
+			<version>4.0.3</version>
 		</dependency>
 
 	</dependencies>
@@ -150,6 +151,9 @@
 						<version>3.4.0</version>
 						<configuration>
 							<skip>false</skip>
+							<from>
+								<image>eclipse-temurin:21-jre</image>
+							</from>
 							<to>
 								<image>svn.youshengyun.com:9923/${project.artifactId}-jib</image>
 								<tags>

src/main/resources/application.yml

@@ -30,6 +30,8 @@ spring:
     application:
         name: demo01
     cloud:
+        compatibility-verifier:
+            enabled: false
         consul:
             host: host.docker.internal
             port: 8500
@@ -66,5 +68,9 @@ spring:
         allow-circular-references: false
     docker:
         compose:
-            enabled: false
+            enabled: true
-            #file: docker-dev.yml
+            file: compose-dev.yml
+            readiness:
+                #wait: NEVER
+                wait: ONLY_IF_STARTED
+                #wait: ALWAYS