From 21eb47b061d16056f37eee47928c7fe629b63061 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 12 十一月 2023 20:18:15 +0800
Subject: [PATCH] 实体修改用户密码功能,实现密码MD5加密功能,及其他代码完善

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+), 0 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 e38a597..9368a24 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
@@ -1,11 +1,16 @@
 package com.dy.pipIrrBase.user;
 
 import com.dy.common.aop.SsoAop;
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.common.mybatis.envm.Deleted;
+import com.dy.common.mybatis.envm.Disabled;
+import com.dy.common.util.MD5;
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.common.webUtil.ResultCodeMsg;
 import com.dy.pipIrrGlobal.pojoBa.BaUser;
+import com.mysql.cj.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -107,6 +112,16 @@
         po.id = null ;
         int count;
         try {
+            po.disabled = Disabled.NO ;//榛樿涓嶇鐢�
+            po.deleted = Deleted.NO ;//榛樿涓嶅垹闄�
+            po.orgTag = DataSourceContext.get() ;//鏈烘瀯鏍囩
+            if(!StringUtils.isNullOrEmpty(po.password)){
+                /*
+                濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
+                po.password = new String(Base64.getDecoder().decode(po.password)) ;
+                */
+                po.password = MD5.encrypt(po.password) ;//杩涜鍔犲瘑鐮�
+            }
             count = this.sv.save(po);
         } catch (Exception e) {
             log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
@@ -144,6 +159,8 @@
         }
         int count;
         try {
+            po.deleted = null ;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+            po.orgTag = null ;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
             count = this.sv.update(po);
         } catch (Exception e) {
             log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
@@ -158,6 +175,66 @@
 
 
     /**
+     * 淇敼瀵嗙爜
+     * @param id 鐢ㄦ埛ID
+     * @return 鏄惁鎴愬姛
+     */
+    @Operation(summary = "淇敼瀵嗙爜", description = "鎻愪氦鐢ㄦ埛ID銆佹棫瀵嗙爜銆佹柊瀵嗙爜锛岃繘琛屾敼瀵嗙爜")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = Boolean.class))}
+            )
+    })
+    @GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
+    @SsoAop("-1")//@SsoAop(power = "-1")
+    public BaseResponse<Boolean> changePassword(@Parameter(description = "瀹炰綋id", required = true) Long id,
+                                                @Parameter(description = "鏃у瘑鐮�", required = true) String oldPassword,
+                                                @Parameter(description = "鏂板瘑鐮�", required = true) String newPassword) throws Exception{
+        if(id == null){
+            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+        }
+        if(StringUtils.isNullOrEmpty(oldPassword)){
+            return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉鑳戒负绌�") ;
+        }
+        if(StringUtils.isNullOrEmpty(newPassword)){
+            return BaseResponseUtils.buildFail("鏂板瘑鐮佷笉鑳戒负绌�") ;
+        }
+        /*
+        濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
+        oldPassword = new String(Base64.getDecoder().decode(oldPassword)) ;
+        newPassword = new String(Base64.getDecoder().decode(newPassword)) ;
+        */
+        oldPassword = MD5.encrypt(oldPassword) ;//杩涜鍔犲瘑鐮�
+        newPassword = MD5.encrypt(newPassword) ;//杩涜鍔犲瘑鐮�
+
+        int count ;
+        try {
+            BaUser po = this.sv.selectById(id);
+            if(Objects.isNull(po)){
+                return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触") ;
+            }else{
+                if(!po.password.equalsIgnoreCase(oldPassword)){
+                    return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉姝g‘锛岃姹傚け璐�") ;
+                }else{
+                    count = this.sv.changePassword(id, newPassword) ;
+                }
+            }
+        } catch (Exception e) {
+            log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+        if(count <= 0){
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+        }else{
+            return BaseResponseUtils.buildSuccess(true) ;
+        }
+    }
+
+
+    /**
      * 鍒犻櫎鐢ㄦ埛
      * @param id 鐢ㄦ埛ID
      * @return 鏄惁鎴愬姛

--
Gitblit v1.8.0