合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/config/SecurityConfig.java

@@ -56,6 +56,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
         httpSecurity
                 .cors().and()
                 .authorizeRequests()
+                .antMatchers("/pas/user/encryPas").permitAll()
                 .antMatchers(HttpMethod.GET,"/pas/department").permitAll()
                 .antMatchers("/pas/user/findUserList/**").permitAll()
                 // .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()

notes-pas/src/main/java/com/zjty/tynotes/pas/controller/UserController.java

@@ -115,6 +115,10 @@ public class UserController {
         return ok(iUserService.findUserList(id,authoryName));
     }
 
-
+    @ApiOperation(value = "密码加密", response = User.class)
+    @GetMapping("/encryPas")
+    public ResponseEntity encryPas() {
+        return ok(iUserService.encryPas());
+    }
 
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/IUserService.java

@@ -111,4 +111,5 @@ public interface IUserService {
      */
     List<String> findUsers(String userId);
 
+    Object encryPas();
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java

@@ -378,6 +378,18 @@ public class UserServiceImpl implements IUserService {
         return userIds;
     }
 
+    @Override
+    public Object encryPas() {
+        List<User> users = pasUserDao.findAll();
+        if(users!=null){
+            for (User user : users) {
+                String encode = bCryptPasswordEncoder.encode(user.getPassword());
+                user.setPassword(encode);
+            }
+        }
+        return pasUserDao.saveAll(users);
+    }
+
     /**
      * 查询可查看的部门id集合
      * @param id