From 1efddccb3935b734ce3983e5e0b52180e5538393 Mon Sep 17 00:00:00 2001
From: Jesse-Ma <24167796@qq.com>
Date: Tue, 27 Dec 2022 15:03:14 +0800
Subject: [PATCH] springboot3

---
 pom.xml                            |  6 +++---
 src/main/resources/application.yml | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index a187785..354f978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.6</version>
+		<version>3.0.1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.flagnote</groupId>
@@ -13,8 +13,8 @@
 	<name>flagnote-gateway</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>11</java.version>
-		<spring-cloud.version>2021.0.5</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.0</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e9b3f87..0b6e33f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,6 +2,15 @@ server:
   address: 127.0.0.1
   port: 10000
 spring:
+  data:
+    redis:
+      host: service.flagnote.com
+      port: 36379
+      timeout: 10000
+      poolMaxTotal: 10
+      poolMaxIdle: 10
+      poolMaxWait: 3
+      password: 1qazx1qazx
   codec:
     max-in-memory-size: 100MB
   servlet:
@@ -10,14 +19,6 @@ spring:
       max-file-size: 100MB
       # 最大支持请求大小
       max-request-size: 100MB
-  redis:
-    host: service.flagnote.com
-    port: 36379
-    timeout: 1000
-    poolMaxTotal: 10
-    poolMaxIdle: 10
-    poolMaxWait: 3
-    password: 1qazx1qazx
   application:
     name: gateway
   cloud:
@@ -146,5 +147,5 @@ management:
 logging:
   level:
     org.springframework.cloud.gateway: trace
-#    org.springframework.cloud.loadbalancer: trace
-#    org.springframework.web.reactive: trace
\ No newline at end of file
+    org.springframework.cloud.loadbalancer: trace
+    org.springframework.web.reactive: trace
\ No newline at end of file