From 2ba17c7839eaaea9644be92e721686abd536c021 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 08:43:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 8 ++++----
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ResetPasswordVo.java | 2 --
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ResetPasswordVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ResetPasswordVo.java
index 8950fc2..14b6837 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ResetPasswordVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ResetPasswordVo.java
@@ -16,6 +16,4 @@
@Schema(description = "鐢ㄦ埛ID")
public String id ;
- @Schema(description = "鏂板瘑鐮�")
- public String password ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index 355834b..3918759 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -297,13 +297,13 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @PostMapping(path = "resetPassword")
+ @PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> resetPassword(String id) throws Exception {
- if (id == null || id == "") {
+ public BaseResponse<Boolean> resetPassword(@RequestBody ResetPasswordVo vo) throws Exception {
+ if (vo.id == null || vo.id == "") {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
- Long idLg = Long.parseLong(id);
+ Long idLg = Long.parseLong(vo.id);
int count;
try {
BaUser po = this.sv.selectById(idLg);
--
Gitblit v1.8.0