添加修改密码接口

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -39,6 +39,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/user/index").permitAll()
                 .antMatchers("/user/getUserAndOrg").permitAll()
                 .antMatchers("/user/getUserByOrgName").permitAll()
+                .antMatchers("/user/resetPassword").permitAll()
                 .antMatchers("/**").authenticated();
         //        .antMatchers("/**").permitAll();
     }

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -47,6 +47,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/getUserEnumsData", request)
                     || matchers("/userInfo/getUserInfoPag", request)
                     || matchers("/user/getPermission", request)
+                    || matchers("/user/resetPassword", request)
                     || matchers("/user/index", request)
                     || matchers("/user/getUserByOrgName", request)
                     || matchers("/user/getUserAndOrg", request)

user-service/src/main/java/com/diagbot/vo/ResetPasswordVO.java

@@ -18,6 +18,5 @@ public class ResetPasswordVO {
     private String username;
     @NotBlank(message = "请输入密码!")
     private String password;
-    private String diffPassword; //密码是否与修改前一样标识
 
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -1,7 +1,6 @@
 package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -79,13 +77,23 @@ public class UserController {
 
     @ApiOperation(value = "重置密码[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
-                    "password：密码, 必填<br> " +
-                    "diffPassword：值为Y，表示修改前和修改后密码不相同<br>")
+                    "password：密码, 必填<br> ")
     @PostMapping("/resetPassword")
     @SysLogger("resetPassword")
     @Transactional
     public RespDTO<Boolean> resetPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
-        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), resetPasswordVO.getDiffPassword());
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), "N");
+    }
+
+
+    @ApiOperation(value = "修改密码[by:zhoutg]",
+            notes = "username：用户名,必填<br>" +
+                    "password：密码, 必填<br> ")
+    @PostMapping("/midifyPassword")
+    @SysLogger("midifyPassword")
+    @Transactional
+    public RespDTO<Boolean> midifyPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), "Y");
     }