From fa2e2e15ae4a4df6515215b10abe94bf7b4b005d Mon Sep 17 00:00:00 2001
From: Jesse-Ma <24167796@qq.com>
Date: Thu, 7 Mar 2024 17:27:00 +1300
Subject: [PATCH] dev env

---
 pom.xml                          | 31 +++++++++++++++++++++++++------
 src/main/resources/bootstrap.yml |  9 ++++++---
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 45f573d..b0e3988 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.6</version>
+		<version>3.2.3</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.flagnote</groupId>
@@ -19,7 +19,7 @@
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 		<maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-		<spring-cloud.version>2022.0.2</spring-cloud.version>
+		<spring-cloud.version>2023.0.0</spring-cloud.version>
 		<docker.repostory>registry.openif.com:5000</docker.repostory>
 		<docker.registry.name>flagnote</docker.registry.name>
 	</properties>
@@ -48,16 +48,21 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
 		</dependency>
-
+<!--		<dependency>-->
+<!--			<groupId>org.projectlombok</groupId>-->
+<!--			<artifactId>lombok</artifactId>-->
+<!--			<optional>true</optional>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<optional>true</optional>
+			<version>1.18.30</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-all</artifactId>
-			<version>5.8.18</version>
+			<version>5.8.25</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -88,7 +93,21 @@
 
 	<build>
 		<plugins>
-			
+
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index 7479ad4..4362364 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -4,7 +4,10 @@ spring:
   cloud:
     config:
       name: flagnote-gateway
-      profile: prd
-      uri: http://flagnote-config-01:8080/flagnote-config
+#      profile: prd
+#      uri: http://flagnote-config-01:20000/flagnote-config,http://flagnote-config-02:20000/flagnote-config
+      profile: dev
+      uri: http://localhost:20000/flagnote-config
   config:
-    import: optional:configserver:http://flagnote-config-01:8080/
+#    import: optional:configserver:http://flagnote-config-01:20000/,optional:configserver:http://flagnote-config-02:20000/
+    import: optional:configserver:http://localhost:20000/
\ No newline at end of file