From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +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 | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
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 90fbbba..6a76675 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
@@ -227,7 +227,7 @@
/**
* 淇敼瀵嗙爜
*
- * @param id 鐢ㄦ埛ID
+ * @param vo
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "淇敼瀵嗙爜", description = "鎻愪氦鐢ㄦ埛ID銆佹棫瀵嗙爜銆佹柊瀵嗙爜锛岃繘琛屾敼瀵嗙爜")
@@ -240,16 +240,16 @@
)
})
//@GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
- @GetMapping(path = "changePassword")
+ @PostMapping(path = "changePassword")
@SsoAop()
- public BaseResponse<Boolean> changePassword(String id, String oldPassword, String newPassword) throws Exception {
- if (id == null) {
+ public BaseResponse<Boolean> changePassword(@RequestBody ChangePasswordVo vo) throws Exception {
+ if (vo.id == null) {
return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖");
}
- if (StringUtils.isNullOrEmpty(oldPassword)) {
+ if (StringUtils.isNullOrEmpty(vo.oldPassword)) {
return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉鑳戒负绌�");
}
- if (StringUtils.isNullOrEmpty(newPassword)) {
+ if (StringUtils.isNullOrEmpty(vo.newPassword)) {
return BaseResponseUtils.buildErrorMsg("鏂板瘑鐮佷笉鑳戒负绌�");
}
/*
@@ -257,20 +257,20 @@
oldPassword = new String(Base64.getDecoder().decode(oldPassword)) ;
newPassword = new String(Base64.getDecoder().decode(newPassword)) ;
*/
- oldPassword = MD5.encrypt(oldPassword);//杩涜鍔犲瘑鐮�
- newPassword = MD5.encrypt(newPassword);//杩涜鍔犲瘑鐮�
+ vo.oldPassword = MD5.encrypt(vo.oldPassword);//杩涜鍔犲瘑鐮�
+ vo.newPassword = MD5.encrypt(vo.newPassword);//杩涜鍔犲瘑鐮�
- Long idLg = Long.parseLong(id);
+ Long idLg = Long.parseLong(vo.id);
int count;
try {
BaUser po = this.sv.selectById(idLg);
if (Objects.isNull(po)) {
return BaseResponseUtils.buildErrorMsg("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
} else {
- if (!po.password.equalsIgnoreCase(oldPassword)) {
+ if (!po.password.equalsIgnoreCase(vo.oldPassword)) {
return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
} else {
- count = this.sv.changePassword(idLg, newPassword);
+ count = this.sv.changePassword(idLg, vo.newPassword);
}
}
} catch (Exception e) {
@@ -508,7 +508,7 @@
if(res == null) {
return BaseResponseUtils.buildException(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
}
- System.out.println(" :" + res);
+ //System.out.println(" :" + res);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鐢ㄦ埛淇℃伅寮傚父", e);
--
Gitblit v1.8.0