diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxAuth2ExceptionSerializer.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxAuth2ExceptionSerializer.java new file mode 100644 index 000000000..c76f611ec --- /dev/null +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxAuth2ExceptionSerializer.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + +package com.pig4cloud.pigx.common.security.component; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import com.pig4cloud.pigx.common.security.exception.PigxAuth2Exception; + +import java.io.IOException; + +/** + * @author lengleng + * @date 2018/11/16 + *

+ * OAuth2 异常格式化 + */ +public class PigxAuth2ExceptionSerializer extends StdSerializer { + public PigxAuth2ExceptionSerializer() { + super(PigxAuth2Exception.class); + } + + @Override + public void serialize(PigxAuth2Exception value, JsonGenerator gen, SerializerProvider provider) throws IOException { + gen.writeStartObject(); + gen.writeObjectField("code", 1); + gen.writeStringField("message", value.getMessage()); + gen.writeStringField("data", value.getOAuth2ErrorCode()); + gen.writeEndObject(); + } +} diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java index 6b8236d0b..f9541bb65 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java @@ -17,12 +17,15 @@ package com.pig4cloud.pigx.common.security.exception; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.pig4cloud.pigx.common.security.component.PigxAuth2ExceptionSerializer; import org.springframework.http.HttpStatus; /** * @author lengleng * @date 2018/7/8 */ +@JsonSerialize(using = PigxAuth2ExceptionSerializer.class) public class ForbiddenException extends PigxAuth2Exception { public ForbiddenException(String msg, Throwable t) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/InvalidException.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/InvalidException.java index 487dc0b74..80aaa00a5 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/InvalidException.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/InvalidException.java @@ -17,10 +17,14 @@ package com.pig4cloud.pigx.common.security.exception; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.pig4cloud.pigx.common.security.component.PigxAuth2ExceptionSerializer; + /** * @author lengleng * @date 2018/7/8 */ +@JsonSerialize(using = PigxAuth2ExceptionSerializer.class) public class InvalidException extends PigxAuth2Exception { public InvalidException(String msg, Throwable t) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowed.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowed.java index e1274c2ec..6bf190275 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowed.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowed.java @@ -17,12 +17,15 @@ package com.pig4cloud.pigx.common.security.exception; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.pig4cloud.pigx.common.security.component.PigxAuth2ExceptionSerializer; import org.springframework.http.HttpStatus; /** * @author lengleng * @date 2018/7/8 */ +@JsonSerialize(using = PigxAuth2ExceptionSerializer.class) public class MethodNotAllowed extends PigxAuth2Exception { public MethodNotAllowed(String msg, Throwable t) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java index d5987914d..94bb91fa9 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java @@ -17,6 +17,8 @@ package com.pig4cloud.pigx.common.security.exception; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.pig4cloud.pigx.common.security.component.PigxAuth2ExceptionSerializer; import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; /** @@ -24,6 +26,7 @@ import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; * @date 2018/7/8 * 自定义OAuth2Exception */ +@JsonSerialize(using = PigxAuth2ExceptionSerializer.class) public class PigxAuth2Exception extends OAuth2Exception { public PigxAuth2Exception(String msg) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ServerErrorException.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ServerErrorException.java index 53e723b28..ba3d91a43 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ServerErrorException.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ServerErrorException.java @@ -17,12 +17,15 @@ package com.pig4cloud.pigx.common.security.exception; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.pig4cloud.pigx.common.security.component.PigxAuth2ExceptionSerializer; import org.springframework.http.HttpStatus; /** * @author lengleng * @date 2018/7/8 */ +@JsonSerialize(using = PigxAuth2ExceptionSerializer.class) public class ServerErrorException extends PigxAuth2Exception { public ServerErrorException(String msg, Throwable t) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/UnauthorizedException.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/UnauthorizedException.java index 0d01007c6..35e0191de 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/UnauthorizedException.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/UnauthorizedException.java @@ -17,12 +17,15 @@ package com.pig4cloud.pigx.common.security.exception; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.pig4cloud.pigx.common.security.component.PigxAuth2ExceptionSerializer; import org.springframework.http.HttpStatus; /** * @author lengleng * @date 2018/7/8 */ +@JsonSerialize(using = PigxAuth2ExceptionSerializer.class) public class UnauthorizedException extends PigxAuth2Exception { public UnauthorizedException(String msg, Throwable t) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java index 255ea7d2f..e6f713817 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java @@ -102,6 +102,6 @@ public class PigxUserDetailsServiceImpl implements PigxUserDetailsService { // 构造security用户 return new PigxUser(user.getUserId(), user.getDeptId(), user.getTenantId(), user.getUsername(), SecurityConstants.BCRYPT + user.getPassword(), enabled, - true, true, true, authorities); + true, true, !CommonConstant.STATUS_LOCK.equals(user.getLockFlag()), authorities); } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index 61d60f171..695d92817 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -73,6 +73,11 @@ public class SysUser implements Serializable { @TableLogic private String delFlag; + /** + * 锁定标记 + */ + private String lockFlag; + /** * 简介 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java index ece6eb2eb..777dda2b9 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java @@ -73,6 +73,11 @@ public class UserVO implements Serializable { * 0-正常，1-删除 */ private String delFlag; + + /** + * 锁定标记 + */ + private String lockFlag; /** * 简介 */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java index 59698459c..df02de23e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java @@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.pig4cloud.pigx.admin.api.dto.DeptTree; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.service.SysDeptService; -import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.util.R; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; @@ -69,7 +68,6 @@ public class DeptController { @GetMapping(value = "/tree") public List getTree() { SysDept condition = new SysDept(); - condition.setDelFlag(CommonConstant.STATUS_NORMAL); return sysDeptService.selectListTree(new EntityWrapper<>(condition)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index fe482e83d..0c57f6d5e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.admin.api.entity.SysDict; import com.pig4cloud.pigx.admin.service.SysDictService; -import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; @@ -86,7 +85,6 @@ public class DictController { @Cacheable(value = "dict_details", key = "#type") public List findDictByType(@PathVariable String type) { SysDict condition = new SysDict(); - condition.setDelFlag(CommonConstant.STATUS_NORMAL); condition.setType(type); return sysDictService.selectList(new EntityWrapper<>(condition)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java index bc0a2e593..bdc8a074e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java @@ -71,7 +71,7 @@ public class LogController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_log_del')") public R delete(@PathVariable Long id) { - return new R<>(sysLogService.updateByLogId(id)); + return new R<>(sysLogService.deleteById(id)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index 1e7d4ace1..03a179055 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; @RestController @AllArgsConstructor @RequestMapping("/menu") -@Api(value = "menu",description = "菜单管理模块") +@Api(value = "menu", description = "菜单管理模块") public class MenuController { private final SysMenuService sysMenuService; @@ -77,9 +77,7 @@ public class MenuController { */ @GetMapping(value = "/tree") public List getTree() { - SysMenu condition = new SysMenu(); - condition.setDelFlag(CommonConstant.STATUS_NORMAL); - return TreeUtil.bulidTree(sysMenuService.selectList(new EntityWrapper<>(condition)), -1); + return TreeUtil.bulidTree(sysMenuService.selectList(new EntityWrapper<>()), -1); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index a2bad0b71..e6fd6f379 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.service.SysRoleMenuService; import com.pig4cloud.pigx.admin.service.SysRoleService; -import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import io.swagger.annotations.Api; @@ -85,9 +84,7 @@ public class RoleController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_role_del')") public R roleDel(@PathVariable Integer id) { - SysRole sysRole = sysRoleService.selectById(id); - sysRole.setDelFlag(CommonConstant.STATUS_DEL); - return new R<>(sysRoleService.updateById(sysRole)); + return new R<>(sysRoleService.deleteById(id)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java index 6bbd74251..edd40547c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java @@ -35,14 +35,6 @@ import java.util.List; */ public interface SysLogService extends IService { - /** - * 通过ID删除日志（逻辑删除） - * - * @param id 日志ID - * @return true/false - */ - Boolean updateByLogId(Long id); - /** * 批量插入前端错误日志 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 61a5c65eb..42362229b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -28,12 +28,10 @@ import com.pig4cloud.pigx.admin.api.vo.TreeUtil; import com.pig4cloud.pigx.admin.mapper.SysDeptMapper; import com.pig4cloud.pigx.admin.service.SysDeptRelationService; import com.pig4cloud.pigx.admin.service.SysDeptService; -import com.pig4cloud.pigx.common.core.constant.CommonConstant; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -74,11 +72,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override public Boolean deleteDeptById(Integer id) { - SysDept sysDept = new SysDept(); - sysDept.setDeptId(id); - sysDept.setUpdateTime(LocalDateTime.now()); - sysDept.setDelFlag(CommonConstant.STATUS_DEL); - this.deleteById(sysDept); + this.deleteById(id); sysDeptRelationService.deleteAllDeptRealtion(id); return Boolean.TRUE; } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java index b57cb96d2..cc40275a7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java @@ -42,16 +42,6 @@ import java.util.stream.Collectors; @Service public class SysLogServiceImpl extends ServiceImpl implements SysLogService { - @Override - public Boolean updateByLogId(Long id) { - - SysLog sysLog = new SysLog(); - sysLog.setId(id); - sysLog.setDelFlag(CommonConstant.STATUS_DEL); - sysLog.setUpdateTime(LocalDateTime.now()); - return updateById(sysLog); - } - /** * 批量插入前端错误日志 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index f0db45e29..422e02bfb 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -25,7 +25,6 @@ import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.api.vo.MenuVO; import com.pig4cloud.pigx.admin.mapper.SysMenuMapper; import com.pig4cloud.pigx.admin.service.SysMenuService; -import com.pig4cloud.pigx.common.core.constant.CommonConstant; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -53,17 +52,12 @@ public class SysMenuServiceImpl extends ServiceImpl impl @CacheEvict(value = "menu_details", allEntries = true) public Boolean deleteMenu(Integer id) { // 删除当前节点 - SysMenu condition1 = new SysMenu(); - condition1.setMenuId(id); - condition1.setDelFlag(CommonConstant.STATUS_DEL); - this.updateById(condition1); + this.deleteById(id); // 删除父节点为当前节点的节点 SysMenu conditon2 = new SysMenu(); conditon2.setParentId(id); - SysMenu sysMenu = new SysMenu(); - sysMenu.setDelFlag(CommonConstant.STATUS_DEL); - return this.update(sysMenu, new EntityWrapper<>(conditon2)); + return this.delete(new EntityWrapper<>(conditon2)); } @Override diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 96e06a856..6f9badb01 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -35,6 +35,7 @@ + @@ -49,6 +50,7 @@ + @@ -77,6 +79,7 @@ `user`.create_time AS ucreate_time, `user`.update_time AS uupdate_time, `user`.del_flag AS udel_flag, + `user`.lock_flag AS lock_flag, `user`.dept_id AS deptId, `user`.tenant_id AS tenantId, r.role_id, @@ -109,6 +112,7 @@ `user`.create_time AS ucreate_time, `user`.update_time AS uupdate_time, `user`.del_flag AS udel_flag, + `user`.lock_flag AS lock_flag, `user`.tenant_id AS tenantId, r.role_id, r.role_name, @@ -140,6 +144,7 @@ `user`.create_time AS ucreate_time, `user`.update_time AS uupdate_time, `user`.del_flag AS udel_flag, + `user`.lock_flag AS lock_flag, `user`.tenant_id AS tenantId, r.role_id, r.role_name,