修改新增用户的加密方式

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java

@@ -39,7 +39,7 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
      * @param username 用户名
      * @return /
      */
-    @Query(value = "SELECT * FROM sys_user WHERE username = :username",nativeQuery = true)
+    @Query(value = "SELECT * FROM sys_user WHERE username = :username and enabled = 1",nativeQuery = true)
     User findByUsername(@Param("username") String username);
 
     /**

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java

@@ -110,7 +110,8 @@ public class UserController {
     @PreAuthorize("@el.check('user:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody User resources) throws Exception {
         checkLevel(resources);
-        resources.setPassword(RsaUtils.encryptByPublicKey(RsaProperties.publicKey, resources.getOrgPassword()));
+//        resources.setPassword(RsaUtils.encryptByPublicKey(RsaProperties.publicKey, resources.getOrgPassword()));
+        passwordEncoder.encode(resources.getOrgPassword());
         userService.create(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/UserApiController.java

@@ -221,6 +221,9 @@ public class UserApiController {
     public BaseResponse<Object> login(String name,String pass) throws Exception {
 //        String dataStr = passwordEncoder.encode(pass);
         User user = userRepository.findByUsername(name);
+
+        log.info("user", user);
+
         if(!ObjectUtils.isEmpty(user)) {
             Map<String, String> path = this.localStorageService.findByRealName(user.getAvatarName());
             user.setAvatarName(path.get("url"));
@@ -277,7 +280,7 @@ public class UserApiController {
         }
         System.out.println(passwordEncoder.encode(newPass));
         userService.updatePass(user.getUsername(),passwordEncoder.encode(newPass),RsaUtils.encryptByPublicKey(RsaProperties.publicKey,newPass));
-        return new BaseResponse(null);
+        return new BaseResponse("修改成功");
     }
 
 
@@ -309,7 +312,7 @@ public class UserApiController {
                 this.localStorageService.deleteByUrl(oldName);
             }
         }
-        return new BaseResponse(null);
+        return new BaseResponse("修改成功");
     }