客户经理App增加退出功能

客户经理App增加修改密码功能

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/BankNotarizeController.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.application.admin.service.SmsTemplateService;
+import me.zhengjie.application.bank.BaseController;
 import me.zhengjie.application.bank.service.BankNotarizeService;
 import me.zhengjie.application.bank.service.UserAXQInfoService;
 import me.zhengjie.base.ResponseDTO;
@@ -39,7 +40,7 @@ import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
 @RequestMapping("${fqgz.bank.app.url-prefix}")
 @Slf4j
 @RequiredArgsConstructor
-public class BankNotarizeController {
+public class BankNotarizeController extends BaseController {
 	private final OrderFileRepository orderFileRepository;
 	private final UserAXQInfoService userAXQInfoService;
 	private final BankNotarizeService bankNotarizeService;

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/BankNoteVideoController.java

@@ -3,6 +3,7 @@ package me.zhengjie.application.bank.controller;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
+import me.zhengjie.application.bank.BaseController;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.sms.CreateCloudRecording;
 import me.zhengjie.base.sms.TrtcVo;
@@ -19,7 +20,7 @@ import java.util.Map;
 @RequestMapping("${fqgz.bank.app.url-prefix}/note-video")
 @Slf4j
 @RequiredArgsConstructor
-public class BankNoteVideoController {
+public class BankNoteVideoController extends BaseController {
 
     /**
      * 录制App端视频

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/BankUserController.java

@@ -2,6 +2,7 @@ package me.zhengjie.application.bank.controller;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.application.bank.BaseController;
 import me.zhengjie.application.bank.controller.vo.BankUserPwdVO;
 import me.zhengjie.application.bank.service.BankUserService;
 import me.zhengjie.base.ResponseDTO;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("${fqgz.bank.app.url-prefix}/user")
 @Slf4j
 @RequiredArgsConstructor
-public class BankUserController {
+public class BankUserController extends BaseController {
     private final BankUserService bankUserService;
 
     /**
@@ -27,7 +28,7 @@ public class BankUserController {
      */
     @PostMapping("/update-pwd")
     public ResponseDTO updatePwd(@RequestBody BankUserPwdVO userPwdVO) {
-        bankUserService.updatePwd(userPwdVO);
+        bankUserService.updatePwd(userPwdVO, getCurrentUser().getUsername());
         return ResponseDTO.success();
     }
 }

eladmin-system/src/main/java/me/zhengjie/application/bank/service/BankUserService.java

@@ -4,5 +4,5 @@ import me.zhengjie.application.bank.controller.vo.BankUserPwdVO;
 
 public interface BankUserService {
 
-    void updatePwd(BankUserPwdVO userPwdVO);
+    void updatePwd(BankUserPwdVO userPwdVO, String userName);
 }

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankUserServiceImpl.java

@@ -2,17 +2,11 @@ package me.zhengjie.application.bank.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.application.admin.service.dto.UserDto;
-import me.zhengjie.application.admin.service.mapstruct.UserMapper;
 import me.zhengjie.application.bank.controller.vo.BankUserPwdVO;
 import me.zhengjie.application.bank.service.BankUserService;
-import me.zhengjie.base.AppBaseResponse;
-import me.zhengjie.base.util.ApplicationContextUtil;
-import me.zhengjie.config.RsaProperties;
 import me.zhengjie.dao.mybatis.entity.User;
 import me.zhengjie.dao.mybatis.mapper.UserRepository;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.utils.RsaUtils;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -23,18 +17,17 @@ import java.util.Date;
 @RequiredArgsConstructor
 public class BankUserServiceImpl implements BankUserService {
     private final UserRepository userRepository;
-    private final ApplicationContextUtil contextUtil;
     private final PasswordEncoder passwordEncoder;
 
-
-    public void updatePwd(BankUserPwdVO userPwdVO) {
-        User user = userRepository.findByUsername(contextUtil.getCurrentUsername());
-        if (!passwordEncoder.matches(userPwdVO.getOldPwd(), user.getPassword())) {
+    @Override
+    public void updatePwd(BankUserPwdVO userPwdVO, String userName) {
+        User userEntity = userRepository.findByUsername(userName);
+        if (!passwordEncoder.matches(userPwdVO.getOldPwd(), userEntity.getPassword())) {
             throw new BadRequestException("修改失败，旧密码错误");
         }
-        if (passwordEncoder.matches(userPwdVO.getNewPwd(), user.getPassword())) {
+        if (passwordEncoder.matches(userPwdVO.getNewPwd(), userEntity.getPassword())) {
             throw new BadRequestException("新密码不能与旧密码相同");
         }
-        userRepository.updatePass(user.getUsername(), userPwdVO.getNewPwd(), new Date());
+        userRepository.updatePass(userEntity.getUsername(), userPwdVO.getNewPwd(), new Date());
     }
 }