From 83ef8b0e6fc20d4528bf54468f7fe4c1fdef86b1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:56 +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 | 25 +++++++++++++------------
1 files changed, 13 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 2ac39f3..dba3c5e 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
@@ -43,7 +43,7 @@
@Value("${user.defaultTrueRandomFalsePassword:true}")
private Boolean defaultTrueRandomFalsePassword;
- @Value("${user.defaultPassword:ABC123}")
+ @Value("${user.defaultPassword:abc_123}")
private String defaultPassword;
@Autowired
@@ -94,11 +94,11 @@
public BaseResponse<QueryResultVo<List<VoUserInfo>>> some(QueryVo vo) {
try {
QueryResultVo<List<VoUserInfo>> res = this.sv.selectSome(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildFail(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
- }else {
+// if(res.itemTotal == 0) {
+// return BaseResponseUtils.buildSuccess(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+// }else {
return BaseResponseUtils.buildSuccess(res);
- }
+// }
} catch (Exception e) {
@@ -207,7 +207,8 @@
po.supperAdmin = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.orgTag = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
- po.password = MD5.encrypt(po.password);//杩涜鍔犲瘑
+// 淇敼鐢ㄦ埛淇℃伅涓嶈繘琛屽瘑鐮佷慨鏀�
+// po.password = MD5.encrypt(po.password);//杩涜鍔犲瘑
count = this.sv.update(po);
this.sv.setRoles(po.id, po.roleIds);
} catch (Exception e) {
@@ -284,7 +285,7 @@
/**
* 閲嶇疆瀵嗙爜
- * @param vo form琛ㄥ崟瀵硅薄
+ * @param
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "閲嶇疆瀵嗙爜", description = "鎻愪氦鏁版嵁锛坒orm琛ㄥ崟json鏁版嵁锛夛紝杩涜瀵嗙爜閲嶇疆")
@@ -298,19 +299,19 @@
})
@PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> resetPassword(@RequestBody ResetPasswordVo vo) throws Exception {
- if (vo.id == null) {
+ public BaseResponse<Boolean> resetPassword(@RequestBody ResetPasswordVo vo) throws Exception {
+ if (vo.id == null || vo.id == "") {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
- String password = MD5.encrypt(vo.password);//杩涜鍔犲瘑鐮�
Long idLg = Long.parseLong(vo.id);
int count;
try {
BaUser po = this.sv.selectById(idLg);
if (Objects.isNull(po)) {
return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
- } else {
- count = this.sv.changePassword(idLg, password);
+ }else {
+ String defaultPassword1 = MD5.encrypt(defaultPassword);//杩涜鍔犲瘑鐮�
+ count = this.sv.changePassword(idLg, defaultPassword1);
}
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
--
Gitblit v1.8.0