瀏覽代碼

用户管理

孙永军 1 年之前
父節點
當前提交
0ea88624e7

+ 2 - 0
src/main/java/com/sxtvs/open/api/user/dto/UserDTO.java

@@ -9,6 +9,8 @@ public class UserDTO {
 
 
     private String name;
     private String name;
 
 
+    private String loginPassword;
+
     private Integer roleId;
     private Integer roleId;
 
 
     private Integer page = 1;
     private Integer page = 1;

+ 7 - 1
src/main/java/com/sxtvs/open/api/user/service/impl/UserServiceImpl.java

@@ -173,7 +173,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             throw new BizException(40001, "不存在的用户");
             throw new BizException(40001, "不存在的用户");
         }
         }
 
 
-        user.setRoleId(userDTO.getRoleId());
+        if(userDTO.getRoleId() != null && userDTO.getRoleId() > 0)
+            user.setRoleId(userDTO.getRoleId());
+
+        if(!TextUtils.isEmpty(userDTO.getLoginPassword())){
+            user.setLoginPassword(SecureUtil.sha256(userDTO.getLoginPassword()));
+            user.setEncodePassword(AESUtil.encryptHex(userDTO.getLoginPassword()));
+        }
 
 
         updateById(user);
         updateById(user);
     }
     }

+ 3 - 0
src/main/java/com/sxtvs/open/core/advice/APIResponseAdvice.java

@@ -40,6 +40,7 @@ public class APIResponseAdvice implements ResponseBodyAdvice<Object> {
     @ExceptionHandler(BizException.class)
     @ExceptionHandler(BizException.class)
     public APIResponse handleBizException(HttpServletRequest request, BizException ex, HttpServletResponse response) {
     public APIResponse handleBizException(HttpServletRequest request, BizException ex, HttpServletResponse response) {
         logger.warn("error", ex);
         logger.warn("error", ex);
+        log.warn("error", ex);
         APIResponse apiNoDataResponse = new APIResponse();
         APIResponse apiNoDataResponse = new APIResponse();
         apiNoDataResponse.setCode(ex.getErrorCode());
         apiNoDataResponse.setCode(ex.getErrorCode());
         apiNoDataResponse.setMessage(ex.getErrorMessage());
         apiNoDataResponse.setMessage(ex.getErrorMessage());
@@ -63,6 +64,7 @@ public class APIResponseAdvice implements ResponseBodyAdvice<Object> {
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     public APIResponse serverError(Throwable ex) {
     public APIResponse serverError(Throwable ex) {
         logger.error("error", ex);
         logger.error("error", ex);
+        log.warn("error", ex);
         APIResponse apiResponse = new APIResponse();
         APIResponse apiResponse = new APIResponse();
         apiResponse.setCode(-1);
         apiResponse.setCode(-1);
         apiResponse.setMessage("服务器运行异常");
         apiResponse.setMessage("服务器运行异常");
@@ -73,6 +75,7 @@ public class APIResponseAdvice implements ResponseBodyAdvice<Object> {
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     public APIResponse messageParseException(HttpMessageNotReadableException ex) {
     public APIResponse messageParseException(HttpMessageNotReadableException ex) {
         logger.warn("error", ex);
         logger.warn("error", ex);
+        log.warn("error", ex);
         APIResponse apiResponse = new APIResponse();
         APIResponse apiResponse = new APIResponse();
         apiResponse.setCode(-1);
         apiResponse.setCode(-1);
         apiResponse.setMessage("服务器运行异常");
         apiResponse.setMessage("服务器运行异常");