From ad9efdbdd8c9b9dd012398c5d517ac4e91db3730 Mon Sep 17 00:00:00 2001 From: 75681 <756810279@qq.com> Date: Wed, 13 Aug 2025 11:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E5=AE=B9:=20=20=20-?= =?UTF-8?q?=20UserController.java:25-30=20-=20=E5=B0=86=E9=80=9A=E9=85=8D?= =?UTF-8?q?=E7=AC=A6=E5=AF=BC=E5=85=A5=E6=94=B9=E4=B8=BA=E6=98=BE=E5=BC=8F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=20=20=20-=20UserController.java:85-86=20-=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AE=8C=E5=85=A8=E9=99=90=E5=AE=9A=E5=90=8D?= =?UTF-8?q?=E6=B6=88=E9=99=A4Swagger=E6=B3=A8=E8=A7=A3=E6=AD=A7=E4=B9=89?= =?UTF-8?q?=20=20=20-=20=E7=A1=AE=E4=BF=9DSpring=E7=9A=84@RequestBody?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=BB=91=E5=AE=9AMap=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youfool/devops/org/controller/UserController.java | 11 ++++++++--- src/main/resources/application-dev.yml | 4 ++-- src/main/resources/application-prod.yml | 3 +++ src/main/resources/application.yml | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java b/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java index ef756b2..7e54ced 100644 --- a/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java +++ b/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java @@ -22,7 +22,12 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -47,7 +52,7 @@ public class UserController { private String privateKey; @Operation(summary = "1.业务系统登录接口", - requestBody = @RequestBody(description = "登录数据", + requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "登录数据", content = @Content(examples = @ExampleObject(value = "{\"username\":\"用户名\",\"password\":\"密码\",\"vcode\":\"验证码\",\"userId\":\"用户ID(可选)\"}")))) @PostMapping("/loginBusiness") public RestResult loginBusiness(@RequestBody Map data, HttpServletRequest request) throws Exception { @@ -77,7 +82,7 @@ public class UserController { } @Operation(summary = "2.工程师登录接口", - requestBody = @RequestBody(description = "登录数据", + requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "登录数据", content = @Content(examples = @ExampleObject(value = "{\"username\":\"用户名\",\"password\":\"密码\",\"vcode\":\"验证码\"}")))) @PostMapping("/loginEngineer") public RestResult loginEngineer(@RequestBody Map data, HttpServletRequest request) throws Exception { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 19f9d8c..7f7ba81 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,11 +7,11 @@ logging: spring: datasource: youfool: - url: jdbc:postgresql://172.22.80.157:5432/devops_gd + url: jdbc:postgresql://172.22.80.157:5432/devops_gd?currentSchema=public username: devops_gd password: ChinaWeal@2024 devops: - url: jdbc:postgresql://172.22.80.157:5432/devops_gd + url: jdbc:postgresql://172.22.80.157:5432/devops_gd?currentSchema=public username: devops_gd password: ChinaWeal@2024 main: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index fd78042..aedc624 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -15,6 +15,9 @@ spring: url: jdbc:postgresql://172.22.80.157:5432/devops_gd username: devops_gd password: ChinaWeal@2024 + main: + # Spring Boot 2.7+新增：允许循环依赖（临时修复，后续需重构代码消除循环依赖） + allow-circular-references: true file: devopsDir: D:\project\devops-gd\upload diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bb790cd..72d87cb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ logging: root: info spring: profiles: - active: dev + active: prod application: name: youfoo-devops datasource: