Merge branch 'master' of csk/cus-wms-supervise2.0 into master

build.gradle

@@ -1,13 +1,13 @@
 // Gradle plugin
 plugins {
-	id 'org.springframework.boot' version '2.5.2' apply(false)
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply(false)
+	id 'org.springframework.boot' version '2.7.18'
+	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
 	id 'java'
 	id 'war'
 }
 
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
+// apply plugin: 'org.springframework.boot'
+// apply plugin: 'io.spring.dependency-management'
 
 war {
 	archiveBaseName = 'cus-wms-supervise2.0'
@@ -67,7 +67,7 @@ ext {
 	okhttp = '3.4.1'
 	apache_commons_lang3 = '3.6'
 	gson = '2.8.0'
-	snakeyaml = '1.25'
+	snakeyaml = '2.2'
 }
 dependencies {
 

src/main/resources/application.yml

@@ -11,7 +11,7 @@ server:
     ## 生产环境
     address: 172.18.0.193
     ## 开发测试环境
-    #address: 127.0.0.1
+    ## address: 127.0.0.1
     port: 6666
 
 
@@ -35,6 +35,10 @@ spring:
     aop:
         proxy-target-class: true
 
+    # Spring Boot 在2.6+ 默认禁用了(默认为 false )循环依赖
+    main:
+        allow-circular-references: true
+
     # 数据源
     datasource:
         primary: