Merge remote-tracking branch 'origin/main'

# Conflicts:
#	pom.xml
#	src/main/java/cn/hfln/framework/gateway/config/ResourceServerConfig.java
#	src/main/resources/application.yml

pom.xml

@@ -118,7 +118,7 @@
             <artifactId>knife4j-doc-spring-boot-starter</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        
+
 <!--        &lt;!&ndash; WebFlux 文档支持 &ndash;&gt;-->
 <!--        <dependency>-->
 <!--            <groupId>org.springdoc</groupId>-->
@@ -153,6 +153,10 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <classifier>boot</classifier>
+                    <mainClass>cn.hfln.framework.gateway.GatewayApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>

src/main/resources/application-local.yml

@@ -32,7 +32,4 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-security:
-  captcha:
-    enabled: false
-    type: char
+