1、接口请求拦截处理;

2、司机修改密码接口调整；

sckw-common/sckw-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,7 +1,7 @@
 com.sckw.core.aspect.DaoAspect
 com.sckw.core.exception.GlobalSystemExceptionHandler
 com.sckw.core.web.config.CustomConfig
-com.sckw.core.filter.LoginFilter
+com.sckw.core.filter.RequestCheckFilter
 com.sckw.core.config.MybatisPlusConfig
 com.sckw.core.config.JacksonConfig
 com.sckw.core.filter.ExceptionFilterConfig

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/UpdatePasswordDto.java

@@ -20,14 +20,14 @@ public class UpdatePasswordDto {
     /**
      * 旧密码
      */
-    @NotBlank(message = "旧密码不能为空!")
+    @NotBlank(message = "密码不能为空!")
     private String password;
 
     /**
      * 新密码
      */
-    @NotBlank(message = "新密码不能为空!")
-    private String newPassword;
+    @NotBlank(message = "验证码不能为空!")
+    private String captcha;
 
     private Long driverId;
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -662,25 +662,29 @@ public class KwfDriverService {
      */
     public HttpResult updatePassword(UpdatePasswordDto params) {
         /**获取信息**/
-        Long driverId = null;//LoginUserHolder.getUserId(); //暂时----------------zk
+        Long driverId = LoginUserHolder.getUserId();
         driverId = driverId == null ? params.getDriverId() : driverId;
         KwfDriver driver = driverDao.selectById(driverId);
         if (driver == null) {
             return HttpResult.error("信息不存在！");
         }
 
-        /**原密码校验**/
-        if (!PasswordUtils.validatePassword(params.getPassword(), driver.getPassword())) {
-            return HttpResult.error("原密码不正确！");
+        /**校验**/
+        String key = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, DictEnum.SMS_UPDATE_PASSWORD.getValue(), params.getAccount());
+        RedissonUtils.putString(key, params.getCaptcha(), RedisConstant.SMS_VERIFY_CODE_VALID_TIME);
+        String smsCaptcha = RedissonUtils.getString(key);
+        if (StringUtils.isBlank(smsCaptcha)){
+            return HttpResult.error(HttpStatus.UN_LOGIN_CODE, "验证码不能为空！");
         }
-
-        /**新旧密码不能一只**/
-        if (PasswordUtils.validatePassword(params.getNewPassword(), driver.getPassword())) {
-            return HttpResult.error("原密码与新密码不能一致！");
+        if (StringUtils.isBlank(smsCaptcha)){
+            return HttpResult.error(HttpStatus.UN_LOGIN_CODE, "验证码已过期,请重新获取！");
+        }
+        if (!params.getCaptcha().equals(smsCaptcha)){
+            return HttpResult.error(HttpStatus.UN_LOGIN_CODE, "验证码不正确，请确认再输入！");
         }
 
         /**更新数据**/
-        driver.setPassword(PasswordUtils.entryptPassword(params.getNewPassword()));
+        driver.setPassword(PasswordUtils.entryptPassword(params.getPassword()));
         driver.setSalt(PasswordUtils.getSaltSubPwd(driver.getPassword()));
         int count = driverDao.updateById(driver);
         return count > 0 ? HttpResult.ok("密码修改成功！") : HttpResult.error("密码修改失败！");