diff --git a/crm-auth/src/main/java/com/crm/auth/controller/SystemController.java b/crm-auth/src/main/java/com/crm/auth/controller/SystemController.java index 5535bcc..85731bb 100644 --- a/crm-auth/src/main/java/com/crm/auth/controller/SystemController.java +++ b/crm-auth/src/main/java/com/crm/auth/controller/SystemController.java @@ -9,6 +9,7 @@ import com.crm.auth.domain.entity.SysMenu; import com.crm.auth.domain.param.UserPageParam; import com.crm.auth.service.IAuthUserService; import com.crm.auth.service.ISysDeptService; +import com.crm.auth.service.IUserQueryService; import com.crm.auth.security.PermissionResolver; import com.crm.base.domain.result.PageResult; import com.crm.base.domain.result.Result; @@ -28,6 +29,7 @@ public class SystemController { private final ISysDeptService sysDeptService; private final IAuthUserService authUserService; + private final IUserQueryService userQueryService; private final PermissionResolver permissionResolver; // ========== 菜单 ========== @@ -109,12 +111,12 @@ public class SystemController { @PostMapping("/users/page") @PreAuthorize("hasRole('ADMIN')") public Result> userPage(@RequestBody UserPageParam param) { - return Result.success(authUserService.pageUserList(param)); + return Result.success(userQueryService.pageUserList(param)); } @GetMapping("/users/stats") @PreAuthorize("hasRole('ADMIN')") public Result userStats(@RequestParam(required = false) Long deptId) { - return Result.success(authUserService.stats(deptId)); + return Result.success(userQueryService.stats(deptId)); } } diff --git a/crm-auth/src/main/java/com/crm/auth/service/IAuthUserService.java b/crm-auth/src/main/java/com/crm/auth/service/IAuthUserService.java index cd23d02..b4a86b1 100644 --- a/crm-auth/src/main/java/com/crm/auth/service/IAuthUserService.java +++ b/crm-auth/src/main/java/com/crm/auth/service/IAuthUserService.java @@ -1,10 +1,6 @@ package com.crm.auth.service; -import com.crm.auth.domain.dto.UserListDTO; -import com.crm.auth.domain.dto.UserStatsVO; import com.crm.auth.domain.entity.AuthUser; -import com.crm.auth.domain.param.UserPageParam; -import com.crm.base.domain.result.PageResult; import com.crm.base.service.IBaseService; import java.util.List; @@ -27,16 +23,6 @@ public interface IAuthUserService extends IBaseService { */ void assignDepts(Long userId, Long primaryDeptId, List partTimeDeptIds); - /** - * 用户管理-用户列表分页(部门子树 × 在职状态 × 关键词 × 最后登录时间),反范式部门名/角色名。 - */ - PageResult pageUserList(UserPageParam param); - - /** - * 用户管理-指标卡统计(部门总数/在职/离职/待分配),跟随部门子树,与列表过滤解耦。 - */ - UserStatsVO stats(Long deptId); - /** * 分配用户的角色(全量替换,事务保护) * diff --git a/crm-auth/src/main/java/com/crm/auth/service/IUserQueryService.java b/crm-auth/src/main/java/com/crm/auth/service/IUserQueryService.java new file mode 100644 index 0000000..95904bb --- /dev/null +++ b/crm-auth/src/main/java/com/crm/auth/service/IUserQueryService.java @@ -0,0 +1,24 @@ +package com.crm.auth.service; + +import com.crm.auth.domain.dto.UserListDTO; +import com.crm.auth.domain.dto.UserStatsVO; +import com.crm.auth.domain.param.UserPageParam; +import com.crm.base.domain.result.PageResult; + +/** + * 用户管理-查询侧(CQRS-lite):用户列表分页 + 指标卡统计。 + *

从 {@link IAuthUserService} 拆出,写操作(分配部门/角色)留在原接口, + * 读模型拼装在此独立演化,避免 Divergent Change。

+ */ +public interface IUserQueryService { + + /** + * 用户管理-用户列表分页(部门子树 × 在职状态 × 关键词 × 最后登录时间),反范式部门名/角色名。 + */ + PageResult pageUserList(UserPageParam param); + + /** + * 用户管理-指标卡统计(部门总数/在职/离职/待分配),跟随部门子树,与列表过滤解耦。 + */ + UserStatsVO stats(Long deptId); +} diff --git a/crm-auth/src/main/java/com/crm/auth/service/impl/AuthUserServiceImpl.java b/crm-auth/src/main/java/com/crm/auth/service/impl/AuthUserServiceImpl.java index f6b0834..c2dc905 100644 --- a/crm-auth/src/main/java/com/crm/auth/service/impl/AuthUserServiceImpl.java +++ b/crm-auth/src/main/java/com/crm/auth/service/impl/AuthUserServiceImpl.java @@ -1,44 +1,26 @@ package com.crm.auth.service.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.crm.auth.constant.AuthConstants; -import com.crm.auth.domain.dto.UserListDTO; -import com.crm.auth.domain.dto.UserStatsVO; import com.crm.auth.domain.entity.AuthUser; import com.crm.auth.domain.entity.SysDept; -import com.crm.auth.domain.entity.SysRole; import com.crm.auth.domain.entity.SysUserDept; import com.crm.auth.domain.entity.SysUserRole; -import com.crm.auth.domain.param.UserPageParam; import com.crm.auth.mapper.AuthUserMapper; import com.crm.auth.mapper.SysDeptMapper; -import com.crm.auth.mapper.SysRoleMapper; import com.crm.auth.mapper.SysUserDeptMapper; import com.crm.auth.mapper.SysUserRoleMapper; import com.crm.auth.service.IAuthUserService; -import com.crm.auth.service.ISysDeptService; import com.crm.base.domain.exception.BusinessErrorException; import com.crm.base.domain.exception.ResourceNotExistException; -import com.crm.base.domain.result.PageResult; import com.crm.base.service.impl.BaseServiceImpl; -import com.crm.base.utils.PageConverter; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -49,8 +31,6 @@ public class AuthUserServiceImpl extends BaseServiceImpl pageUserList(UserPageParam param) { - Page mpPage = PageConverter.toMpPage(param); - - // 部门子树 → 部门集合∩子树的候选用户 id(deptId 为空则不限部门) - List scopedUserIds = resolveScopedUserIds(param.getDeptId()); - if (scopedUserIds != null && scopedUserIds.isEmpty()) { - return emptyUserDTOPage(mpPage); - } - - String status = param.getEmploymentStatus(); - boolean unassigned = STATUS_UNASSIGNED.equalsIgnoreCase(status); - boolean active = unassigned || STATUS_ACTIVE.equalsIgnoreCase(status); - boolean resigned = STATUS_RESIGNED.equalsIgnoreCase(status); - - // 预先求值,避免 MP 条件参数即时求值 null 字段导致 NPE - LocalDateTime loginFromStart = param.getLoginFrom() != null - ? param.getLoginFrom().atStartOfDay() : null; - LocalDateTime loginToEnd = param.getLoginTo() != null - ? param.getLoginTo().atTime(LocalTime.MAX) : null; - - Page result = lambdaQuery() - .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) - .eq(active, AuthUser::getEmploymentStatus, STATUS_ACTIVE) - .eq(resigned, AuthUser::getEmploymentStatus, STATUS_RESIGNED) - .and(StrUtil.isNotBlank(param.getKeyword()), - w -> w.like(AuthUser::getUsername, param.getKeyword()) - .or().like(AuthUser::getAccount, param.getKeyword()) - .or().like(AuthUser::getMobile, param.getKeyword())) - .ge(loginFromStart != null, AuthUser::getLastLoginTime, loginFromStart) - .le(loginToEnd != null, AuthUser::getLastLoginTime, loginToEnd) - // 待分配 = 在职且无任何角色(NOT IN sys_user_role) - .notInSql(unassigned, AuthUser::getId, "SELECT user_id FROM sys_user_role") - .page(mpPage); - - List records = result.getRecords(); - if (records.isEmpty()) { - return emptyUserDTOPage(result); - } - - // 反范式部门名/角色名:批量查、组装,避免 N+1 - List pageUserIds = records.stream().map(AuthUser::getId).toList(); - Map> partTimeByUser = sysUserDeptMapper.selectList( - new LambdaQueryWrapper() - .in(SysUserDept::getUserId, pageUserIds)) - .stream().collect(Collectors.groupingBy(SysUserDept::getUserId, - Collectors.mapping(SysUserDept::getDeptId, Collectors.toList()))); - Map> roleIdsByUser = sysUserRoleMapper.selectList( - new LambdaQueryWrapper() - .in(SysUserRole::getUserId, pageUserIds)) - .stream().collect(Collectors.groupingBy(SysUserRole::getUserId, - Collectors.mapping(SysUserRole::getRoleId, Collectors.toList()))); - - Set deptIds = new HashSet<>(); - for (AuthUser u : records) { - if (u.getDeptId() != null) deptIds.add(u.getDeptId()); - } - partTimeByUser.values().forEach(deptIds::addAll); - Map deptNameMap = deptIds.isEmpty() - ? Collections.emptyMap() - : sysDeptMapper.selectBatchIds(deptIds).stream() - .collect(Collectors.toMap(SysDept::getId, SysDept::getDeptName)); - - Set roleIds = new HashSet<>(); - roleIdsByUser.values().forEach(roleIds::addAll); - Map roleNameMap = roleIds.isEmpty() - ? Collections.emptyMap() - : sysRoleMapper.selectBatchIds(roleIds).stream() - .collect(Collectors.toMap(SysRole::getId, SysRole::getRoleName)); - - return new PageResult(result).convert(u -> - assembleUserListDTO(u, partTimeByUser, roleIdsByUser, deptNameMap, roleNameMap)); - } - - @Override - public UserStatsVO stats(Long deptId) { - // 部门子树(含自身);null 退化为全公司 - int deptCount; - if (deptId == null) { - deptCount = Math.toIntExact(sysDeptService.count()); - } else { - deptCount = sysDeptService.getChildDeptIds(deptId).size(); - } - - List scopedUserIds = resolveScopedUserIds(deptId); - if (scopedUserIds != null && scopedUserIds.isEmpty()) { - return new UserStatsVO(deptCount, 0L, 0L, 0L); - } - - long activeCount = lambdaQuery() - .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) - .eq(AuthUser::getEmploymentStatus, STATUS_ACTIVE) - .count(); - long resignedCount = lambdaQuery() - .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) - .eq(AuthUser::getEmploymentStatus, STATUS_RESIGNED) - .count(); - long unassignedCount = lambdaQuery() - .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) - .eq(AuthUser::getEmploymentStatus, STATUS_ACTIVE) - .notInSql(AuthUser::getId, "SELECT user_id FROM sys_user_role") - .count(); - return new UserStatsVO(deptCount, activeCount, resignedCount, unassignedCount); - } - - /** - * 解析部门子树内"部门集合∩子树"的用户 id(主部门 dept_id ∪ 兼职 sys_user_dept.dept_id 命中子树者)。 - * deptId 为 null 时返回 null(表示不限部门);命中空集返回 emptyList。 - */ - private List resolveScopedUserIds(Long deptId) { - if (deptId == null) { - return null; - } - List subtree = sysDeptService.getChildDeptIds(deptId); - Set ids = new HashSet<>(); - // 主部门命中子树 - lambdaQuery().select(AuthUser::getId).in(AuthUser::getDeptId, subtree) - .list().forEach(u -> ids.add(u.getId())); - // 兼职命中子树 - sysUserDeptMapper.selectList(new LambdaQueryWrapper() - .select(SysUserDept::getUserId).in(SysUserDept::getDeptId, subtree)) - .forEach(ud -> ids.add(ud.getUserId())); - return new ArrayList<>(ids); - } - - /** - * 构造空的 UserListDTO 分页结果(部门子树命中空集 / 查询结果为空时短路返回)。 - * 分页信息从底层 Page 继承,content 置空列表。 - */ - private PageResult emptyUserDTOPage(IPage page) { - PageResult r = new PageResult<>(); - r.setContent(Collections.emptyList()); - r.setTotal(page.getTotal()); - r.setSize(page.getSize()); - r.setCurrent(page.getCurrent()); - r.setPages(page.getPages()); - r.setEmpty(page.getTotal() == 0); - return r; - } - - private UserListDTO assembleUserListDTO(AuthUser u, - Map> partTimeByUser, - Map> roleIdsByUser, - Map deptNameMap, - Map roleNameMap) { - UserListDTO dto = new UserListDTO(); - BeanUtil.copyProperties(u, dto); - dto.setPrimaryDeptId(u.getDeptId()); - dto.setPrimaryDeptName(u.getDeptId() != null ? deptNameMap.get(u.getDeptId()) : null); - - List ptIds = partTimeByUser.getOrDefault(u.getId(), Collections.emptyList()); - dto.setPartTimeDepts(ptIds.stream() - .map(id -> new UserListDTO.DeptRef(id, deptNameMap.get(id))) - .toList()); - List rIds = roleIdsByUser.getOrDefault(u.getId(), Collections.emptyList()); - dto.setRoles(rIds.stream() - .map(id -> new UserListDTO.RoleRef(id, roleNameMap.get(id))) - .toList()); - return dto; - } - @Override @Transactional(rollbackFor = Exception.class) public void assignRoles(Long userId, List roleIds) { diff --git a/crm-auth/src/main/java/com/crm/auth/service/impl/UserQueryServiceImpl.java b/crm-auth/src/main/java/com/crm/auth/service/impl/UserQueryServiceImpl.java new file mode 100644 index 0000000..f048950 --- /dev/null +++ b/crm-auth/src/main/java/com/crm/auth/service/impl/UserQueryServiceImpl.java @@ -0,0 +1,216 @@ +package com.crm.auth.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.crm.auth.domain.dto.UserListDTO; +import com.crm.auth.domain.dto.UserStatsVO; +import com.crm.auth.domain.entity.AuthUser; +import com.crm.auth.domain.entity.SysDept; +import com.crm.auth.domain.entity.SysRole; +import com.crm.auth.domain.entity.SysUserDept; +import com.crm.auth.domain.entity.SysUserRole; +import com.crm.auth.domain.param.UserPageParam; +import com.crm.auth.mapper.AuthUserMapper; +import com.crm.auth.mapper.SysDeptMapper; +import com.crm.auth.mapper.SysRoleMapper; +import com.crm.auth.mapper.SysUserDeptMapper; +import com.crm.auth.mapper.SysUserRoleMapper; +import com.crm.auth.service.ISysDeptService; +import com.crm.auth.service.IUserQueryService; +import com.crm.base.domain.result.PageResult; +import com.crm.base.utils.PageConverter; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 用户管理-查询侧实现(CQRS-lite):从 {@link AuthUserServiceImpl} 拆出的读模型拼装逻辑。 + *

不继承 BaseServiceImpl,直接注入 AuthUserMapper 做分页/计数/列表查询。 + * 写操作(assignDepts/assignRoles)仍在 {@link AuthUserServiceImpl}。

+ */ +@Service +@RequiredArgsConstructor +public class UserQueryServiceImpl implements IUserQueryService { + + private final AuthUserMapper authUserMapper; + private final SysUserDeptMapper sysUserDeptMapper; + private final SysDeptMapper sysDeptMapper; + private final SysUserRoleMapper sysUserRoleMapper; + private final SysRoleMapper sysRoleMapper; + private final ISysDeptService sysDeptService; + + private static final String STATUS_ACTIVE = "active"; + private static final String STATUS_RESIGNED = "resigned"; + private static final String STATUS_UNASSIGNED = "unassigned"; + + @Override + public PageResult pageUserList(UserPageParam param) { + Page mpPage = PageConverter.toMpPage(param); + + // 部门子树 → 部门集合∩子树的候选用户 id(deptId 为空则不限部门) + List scopedUserIds = resolveScopedUserIds(param.getDeptId()); + if (scopedUserIds != null && scopedUserIds.isEmpty()) { + return emptyUserDTOPage(mpPage); + } + + String status = param.getEmploymentStatus(); + boolean unassigned = STATUS_UNASSIGNED.equalsIgnoreCase(status); + boolean active = unassigned || STATUS_ACTIVE.equalsIgnoreCase(status); + boolean resigned = STATUS_RESIGNED.equalsIgnoreCase(status); + + // 预先求值,避免 MP 条件参数即时求值 null 字段导致 NPE + LocalDateTime loginFromStart = param.getLoginFrom() != null + ? param.getLoginFrom().atStartOfDay() : null; + LocalDateTime loginToEnd = param.getLoginTo() != null + ? param.getLoginTo().atTime(LocalTime.MAX) : null; + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) + .eq(active, AuthUser::getEmploymentStatus, STATUS_ACTIVE) + .eq(resigned, AuthUser::getEmploymentStatus, STATUS_RESIGNED) + .and(StrUtil.isNotBlank(param.getKeyword()), + w -> w.like(AuthUser::getUsername, param.getKeyword()) + .or().like(AuthUser::getAccount, param.getKeyword()) + .or().like(AuthUser::getMobile, param.getKeyword())) + .ge(loginFromStart != null, AuthUser::getLastLoginTime, loginFromStart) + .le(loginToEnd != null, AuthUser::getLastLoginTime, loginToEnd) + // 待分配 = 在职且无任何角色(NOT IN sys_user_role) + .notInSql(unassigned, AuthUser::getId, "SELECT user_id FROM sys_user_role"); + Page result = authUserMapper.selectPage(mpPage, wrapper); + + List records = result.getRecords(); + if (records.isEmpty()) { + return emptyUserDTOPage(result); + } + + // 反范式部门名/角色名:批量查、组装,避免 N+1 + List pageUserIds = records.stream().map(AuthUser::getId).toList(); + Map> partTimeByUser = sysUserDeptMapper.selectList( + new LambdaQueryWrapper() + .in(SysUserDept::getUserId, pageUserIds)) + .stream().collect(Collectors.groupingBy(SysUserDept::getUserId, + Collectors.mapping(SysUserDept::getDeptId, Collectors.toList()))); + Map> roleIdsByUser = sysUserRoleMapper.selectList( + new LambdaQueryWrapper() + .in(SysUserRole::getUserId, pageUserIds)) + .stream().collect(Collectors.groupingBy(SysUserRole::getUserId, + Collectors.mapping(SysUserRole::getRoleId, Collectors.toList()))); + + Set deptIds = new HashSet<>(); + for (AuthUser u : records) { + if (u.getDeptId() != null) deptIds.add(u.getDeptId()); + } + partTimeByUser.values().forEach(deptIds::addAll); + Map deptNameMap = deptIds.isEmpty() + ? Collections.emptyMap() + : sysDeptMapper.selectBatchIds(deptIds).stream() + .collect(Collectors.toMap(SysDept::getId, SysDept::getDeptName)); + + Set roleIds = new HashSet<>(); + roleIdsByUser.values().forEach(roleIds::addAll); + Map roleNameMap = roleIds.isEmpty() + ? Collections.emptyMap() + : sysRoleMapper.selectBatchIds(roleIds).stream() + .collect(Collectors.toMap(SysRole::getId, SysRole::getRoleName)); + + return new PageResult(result).convert(u -> + assembleUserListDTO(u, partTimeByUser, roleIdsByUser, deptNameMap, roleNameMap)); + } + + @Override + public UserStatsVO stats(Long deptId) { + // 部门子树(含自身);null 退化为全公司 + int deptCount; + if (deptId == null) { + deptCount = Math.toIntExact(sysDeptService.count()); + } else { + deptCount = sysDeptService.getChildDeptIds(deptId).size(); + } + + List scopedUserIds = resolveScopedUserIds(deptId); + if (scopedUserIds != null && scopedUserIds.isEmpty()) { + return new UserStatsVO(deptCount, 0L, 0L, 0L); + } + + long activeCount = authUserMapper.selectCount(new LambdaQueryWrapper() + .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) + .eq(AuthUser::getEmploymentStatus, STATUS_ACTIVE)); + long resignedCount = authUserMapper.selectCount(new LambdaQueryWrapper() + .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) + .eq(AuthUser::getEmploymentStatus, STATUS_RESIGNED)); + long unassignedCount = authUserMapper.selectCount(new LambdaQueryWrapper() + .in(scopedUserIds != null, AuthUser::getId, scopedUserIds) + .eq(AuthUser::getEmploymentStatus, STATUS_ACTIVE) + .notInSql(AuthUser::getId, "SELECT user_id FROM sys_user_role")); + return new UserStatsVO(deptCount, activeCount, resignedCount, unassignedCount); + } + + /** + * 解析部门子树内"部门集合∩子树"的用户 id(主部门 dept_id ∪ 兼职 sys_user_dept.dept_id 命中子树者)。 + * deptId 为 null 时返回 null(表示不限部门);命中空集返回 emptyList。 + */ + private List resolveScopedUserIds(Long deptId) { + if (deptId == null) { + return null; + } + List subtree = sysDeptService.getChildDeptIds(deptId); + Set ids = new HashSet<>(); + // 主部门命中子树 + authUserMapper.selectList(new LambdaQueryWrapper() + .select(AuthUser::getId).in(AuthUser::getDeptId, subtree)) + .forEach(u -> ids.add(u.getId())); + // 兼职命中子树 + sysUserDeptMapper.selectList(new LambdaQueryWrapper() + .select(SysUserDept::getUserId).in(SysUserDept::getDeptId, subtree)) + .forEach(ud -> ids.add(ud.getUserId())); + return new ArrayList<>(ids); + } + + /** + * 构造空的 UserListDTO 分页结果(部门子树命中空集 / 查询结果为空时短路返回)。 + * 分页信息从底层 Page 继承,content 置空列表。 + */ + private PageResult emptyUserDTOPage(IPage page) { + PageResult r = new PageResult<>(); + r.setContent(Collections.emptyList()); + r.setTotal(page.getTotal()); + r.setSize(page.getSize()); + r.setCurrent(page.getCurrent()); + r.setPages(page.getPages()); + r.setEmpty(page.getTotal() == 0); + return r; + } + + private UserListDTO assembleUserListDTO(AuthUser u, + Map> partTimeByUser, + Map> roleIdsByUser, + Map deptNameMap, + Map roleNameMap) { + UserListDTO dto = new UserListDTO(); + BeanUtil.copyProperties(u, dto); + dto.setPrimaryDeptId(u.getDeptId()); + dto.setPrimaryDeptName(u.getDeptId() != null ? deptNameMap.get(u.getDeptId()) : null); + + List ptIds = partTimeByUser.getOrDefault(u.getId(), Collections.emptyList()); + dto.setPartTimeDepts(ptIds.stream() + .map(id -> new UserListDTO.DeptRef(id, deptNameMap.get(id))) + .toList()); + List rIds = roleIdsByUser.getOrDefault(u.getId(), Collections.emptyList()); + dto.setRoles(rIds.stream() + .map(id -> new UserListDTO.RoleRef(id, roleNameMap.get(id))) + .toList()); + return dto; + } +} diff --git a/crm-auth/src/test/java/com/crm/auth/service/impl/AuthUserServiceImplTest.java b/crm-auth/src/test/java/com/crm/auth/service/impl/AuthUserServiceImplTest.java index d77fa03..7f57c42 100644 --- a/crm-auth/src/test/java/com/crm/auth/service/impl/AuthUserServiceImplTest.java +++ b/crm-auth/src/test/java/com/crm/auth/service/impl/AuthUserServiceImplTest.java @@ -9,6 +9,10 @@ import com.crm.auth.mapper.SysDeptMapper; import com.crm.auth.mapper.SysUserDeptMapper; import com.crm.base.domain.exception.BusinessErrorException; import com.crm.base.domain.exception.ResourceNotExistException; +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import org.apache.ibatis.builder.MapperBuilderAssistant; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -54,6 +58,18 @@ class AuthUserServiceImplTest { @InjectMocks private AuthUserServiceImpl service; + /** + * 纯 Mockito 单元测试无 SqlSessionFactory,LambdaUpdateWrapper/LambdaQueryWrapper + * 在 set/eq 时触发 tryInitCache → 需要手动初始化 TableInfoHelper 的 lambda cache。 + */ + @BeforeAll + static void initLambdaCache() { + MapperBuilderAssistant assistant = + new MapperBuilderAssistant(new MybatisConfiguration(), ""); + TableInfoHelper.initTableInfo(assistant, AuthUser.class); + TableInfoHelper.initTableInfo(assistant, SysUserDept.class); + } + @BeforeEach void setUp() { // ServiceImpl 的 getById/update 走父类 baseMapper 字段,无 Spring 容器时手动指回 mock diff --git a/crm-auth/src/test/java/com/crm/auth/service/impl/UserListIntegrationTest.java b/crm-auth/src/test/java/com/crm/auth/service/impl/UserListIntegrationTest.java index be66a5e..63a0c4d 100644 --- a/crm-auth/src/test/java/com/crm/auth/service/impl/UserListIntegrationTest.java +++ b/crm-auth/src/test/java/com/crm/auth/service/impl/UserListIntegrationTest.java @@ -63,7 +63,7 @@ class UserListIntegrationTest { private static SqlSessionFactory sqlSessionFactory; private SqlSession session; - private AuthUserServiceImpl authUserService; + private UserQueryServiceImpl userQueryService; private SysDeptServiceImpl sysDeptService; @BeforeAll @@ -113,13 +113,13 @@ class UserListIntegrationTest { session.getMapper(SysUserDeptMapper.class)); ReflectionTestUtils.setField(sysDeptService, "baseMapper", sysDeptMapper); - authUserService = new AuthUserServiceImpl( + userQueryService = new UserQueryServiceImpl( + session.getMapper(AuthUserMapper.class), session.getMapper(SysUserDeptMapper.class), sysDeptMapper, session.getMapper(SysUserRoleMapper.class), session.getMapper(SysRoleMapper.class), sysDeptService); - ReflectionTestUtils.setField(authUserService, "baseMapper", session.getMapper(AuthUserMapper.class)); } @AfterEach @@ -134,7 +134,7 @@ class UserListIntegrationTest { @Test @DisplayName("全公司统计:5部门 / 5在职 / 1离职 / 2待分配") void stats_wholeCompany() { - UserStatsVO vo = authUserService.stats(null); + UserStatsVO vo = userQueryService.stats(null); assertThat(vo.getDeptCount()).isEqualTo(5); assertThat(vo.getActiveCount()).isEqualTo(5); assertThat(vo.getResignedCount()).isEqualTo(1); @@ -144,7 +144,7 @@ class UserListIntegrationTest { @Test @DisplayName("销售部子树统计:4部门 / 3在职 / 0离职 / 1待分配") void stats_salesSubtree() { - UserStatsVO vo = authUserService.stats(10L); + UserStatsVO vo = userQueryService.stats(10L); assertThat(vo.getDeptCount()).isEqualTo(4); assertThat(vo.getActiveCount()).isEqualTo(3); assertThat(vo.getResignedCount()).isEqualTo(0); @@ -154,7 +154,7 @@ class UserListIntegrationTest { @Test @DisplayName("市场部子树统计:含兼职命中(用户1兼挂市场部)") void stats_marketSubtree_includesPartTime() { - UserStatsVO vo = authUserService.stats(20L); + UserStatsVO vo = userQueryService.stats(20L); assertThat(vo.getDeptCount()).isEqualTo(1); // 主部门=20 的用户: 4(离职), 5(在职) // 兼职=20 的用户: 1(在职) → scopedUserIds = {4, 5, 1} @@ -170,7 +170,7 @@ class UserListIntegrationTest { void page_noFilter_returnsAll() { UserPageParam param = new UserPageParam(); param.setSize(10); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(6); assertThat(result.getContent()).hasSize(6); } @@ -181,7 +181,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setEmploymentStatus("active"); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(5); assertThat(result.getContent()).extracting(UserListDTO::getId) .doesNotContain(4L); @@ -193,7 +193,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setEmploymentStatus("resigned"); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(1); assertThat(result.getContent().get(0).getId()).isEqualTo(4L); } @@ -204,7 +204,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setEmploymentStatus("unassigned"); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(2); assertThat(result.getContent()).extracting(UserListDTO::getId) .containsExactlyInAnyOrder(3L, 5L); @@ -216,7 +216,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setDeptId(10L); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(3); assertThat(result.getContent()).extracting(UserListDTO::getId) .containsExactlyInAnyOrder(1L, 2L, 3L); @@ -228,7 +228,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setKeyword("张"); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(1); assertThat(result.getContent().get(0).getId()).isEqualTo(1L); } @@ -239,7 +239,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setKeyword("lisi"); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(1); assertThat(result.getContent().get(0).getId()).isEqualTo(2L); } @@ -250,7 +250,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setLoginFrom(LocalDate.of(2024, 2, 1)); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getTotal()).isEqualTo(2); assertThat(result.getContent()).extracting(UserListDTO::getId) .containsExactlyInAnyOrder(2L, 4L); @@ -264,7 +264,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setCurrent(1); param.setSize(2); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getContent()).hasSize(2); assertThat(result.getTotal()).isEqualTo(6); assertThat(result.getPages()).isEqualTo(3); @@ -279,7 +279,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setKeyword("zhangsan"); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getContent()).hasSize(1); UserListDTO dto = result.getContent().get(0); @@ -307,7 +307,7 @@ class UserListIntegrationTest { UserPageParam param = new UserPageParam(); param.setSize(10); param.setKeyword("wangwu"); - PageResult result = authUserService.pageUserList(param); + PageResult result = userQueryService.pageUserList(param); assertThat(result.getContent()).hasSize(1); UserListDTO dto = result.getContent().get(0); diff --git a/crm-auth/target/classes/com/crm/auth/AuthApplication.class b/crm-auth/target/classes/com/crm/auth/AuthApplication.class index 6b7af35..4d28a54 100644 Binary files a/crm-auth/target/classes/com/crm/auth/AuthApplication.class and b/crm-auth/target/classes/com/crm/auth/AuthApplication.class differ diff --git a/crm-auth/target/classes/com/crm/auth/config/AuthProperties$DingTalk.class b/crm-auth/target/classes/com/crm/auth/config/AuthProperties$DingTalk.class index 3648be1..0e3ff9d 100644 Binary files a/crm-auth/target/classes/com/crm/auth/config/AuthProperties$DingTalk.class and b/crm-auth/target/classes/com/crm/auth/config/AuthProperties$DingTalk.class differ diff --git a/crm-auth/target/classes/com/crm/auth/config/AuthProperties$Jwt.class b/crm-auth/target/classes/com/crm/auth/config/AuthProperties$Jwt.class index 9c29af3..d9be18f 100644 Binary files a/crm-auth/target/classes/com/crm/auth/config/AuthProperties$Jwt.class and b/crm-auth/target/classes/com/crm/auth/config/AuthProperties$Jwt.class differ diff --git a/crm-auth/target/classes/com/crm/auth/config/AuthProperties.class b/crm-auth/target/classes/com/crm/auth/config/AuthProperties.class index de26264..1721b95 100644 Binary files a/crm-auth/target/classes/com/crm/auth/config/AuthProperties.class and b/crm-auth/target/classes/com/crm/auth/config/AuthProperties.class differ diff --git a/crm-auth/target/classes/com/crm/auth/config/DataInitializer.class b/crm-auth/target/classes/com/crm/auth/config/DataInitializer.class index ff64c05..92c18cd 100644 Binary files a/crm-auth/target/classes/com/crm/auth/config/DataInitializer.class and b/crm-auth/target/classes/com/crm/auth/config/DataInitializer.class differ diff --git a/crm-auth/target/classes/com/crm/auth/config/PermissionConfig.class b/crm-auth/target/classes/com/crm/auth/config/PermissionConfig.class index ff80bec..a4e34ec 100644 Binary files a/crm-auth/target/classes/com/crm/auth/config/PermissionConfig.class and b/crm-auth/target/classes/com/crm/auth/config/PermissionConfig.class differ diff --git a/crm-auth/target/classes/com/crm/auth/config/SecurityConfig.class b/crm-auth/target/classes/com/crm/auth/config/SecurityConfig.class index 92c9ffd..11a2552 100644 Binary files a/crm-auth/target/classes/com/crm/auth/config/SecurityConfig.class and b/crm-auth/target/classes/com/crm/auth/config/SecurityConfig.class differ diff --git a/crm-auth/target/classes/com/crm/auth/controller/AuthController.class b/crm-auth/target/classes/com/crm/auth/controller/AuthController.class index 7a9f593..b83cf7c 100644 Binary files a/crm-auth/target/classes/com/crm/auth/controller/AuthController.class and b/crm-auth/target/classes/com/crm/auth/controller/AuthController.class differ diff --git a/crm-auth/target/classes/com/crm/auth/controller/SystemController.class b/crm-auth/target/classes/com/crm/auth/controller/SystemController.class index 7f857c1..2d3f25c 100644 Binary files a/crm-auth/target/classes/com/crm/auth/controller/SystemController.class and b/crm-auth/target/classes/com/crm/auth/controller/SystemController.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/dto/LoginResultDTO.class b/crm-auth/target/classes/com/crm/auth/domain/dto/LoginResultDTO.class index 2cd7346..5ff9553 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/dto/LoginResultDTO.class and b/crm-auth/target/classes/com/crm/auth/domain/dto/LoginResultDTO.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/dto/UserInfoDTO.class b/crm-auth/target/classes/com/crm/auth/domain/dto/UserInfoDTO.class index 8735af5..31e953e 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/dto/UserInfoDTO.class and b/crm-auth/target/classes/com/crm/auth/domain/dto/UserInfoDTO.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$DeptRef.class b/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$DeptRef.class index cc96b18..b09720e 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$DeptRef.class and b/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$DeptRef.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$RoleRef.class b/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$RoleRef.class index d51d768..c56abad 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$RoleRef.class and b/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO$RoleRef.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO.class b/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO.class index b7469c8..1e29409 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO.class and b/crm-auth/target/classes/com/crm/auth/domain/dto/UserListDTO.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/dto/UserStatsVO.class b/crm-auth/target/classes/com/crm/auth/domain/dto/UserStatsVO.class index 2ec04bb..4f73c3c 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/dto/UserStatsVO.class and b/crm-auth/target/classes/com/crm/auth/domain/dto/UserStatsVO.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/AuthIdentity.class b/crm-auth/target/classes/com/crm/auth/domain/entity/AuthIdentity.class index b53c140..c166579 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/AuthIdentity.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/AuthIdentity.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/AuthUser.class b/crm-auth/target/classes/com/crm/auth/domain/entity/AuthUser.class index 42bb3f4..95b80f5 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/AuthUser.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/AuthUser.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/SysDept.class b/crm-auth/target/classes/com/crm/auth/domain/entity/SysDept.class index 64a8fd5..92e7f8e 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/SysDept.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/SysDept.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/SysMenu.class b/crm-auth/target/classes/com/crm/auth/domain/entity/SysMenu.class index 90aa061..abddb0b 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/SysMenu.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/SysMenu.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/SysRole.class b/crm-auth/target/classes/com/crm/auth/domain/entity/SysRole.class index 2d36973..76659db 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/SysRole.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/SysRole.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/SysRoleMenu.class b/crm-auth/target/classes/com/crm/auth/domain/entity/SysRoleMenu.class index 49670b7..11da0f5 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/SysRoleMenu.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/SysRoleMenu.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserDept.class b/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserDept.class index 84d3cf0..10d2373 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserDept.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserDept.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserRole.class b/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserRole.class index 592d7a7..f58fbc8 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserRole.class and b/crm-auth/target/classes/com/crm/auth/domain/entity/SysUserRole.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/enums/DataScopeEnum.class b/crm-auth/target/classes/com/crm/auth/domain/enums/DataScopeEnum.class index 3531a28..8a28157 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/enums/DataScopeEnum.class and b/crm-auth/target/classes/com/crm/auth/domain/enums/DataScopeEnum.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/enums/IdentityTypeEnum.class b/crm-auth/target/classes/com/crm/auth/domain/enums/IdentityTypeEnum.class index e1612e0..fff1995 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/enums/IdentityTypeEnum.class and b/crm-auth/target/classes/com/crm/auth/domain/enums/IdentityTypeEnum.class differ diff --git a/crm-auth/target/classes/com/crm/auth/domain/param/UserPageParam.class b/crm-auth/target/classes/com/crm/auth/domain/param/UserPageParam.class index a4d5350..e4758b3 100644 Binary files a/crm-auth/target/classes/com/crm/auth/domain/param/UserPageParam.class and b/crm-auth/target/classes/com/crm/auth/domain/param/UserPageParam.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/AuthIdentityMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/AuthIdentityMapper.class index 2e3b31d..deb97fc 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/AuthIdentityMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/AuthIdentityMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/AuthUserMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/AuthUserMapper.class index 91d55a7..4055bdc 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/AuthUserMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/AuthUserMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/SysDeptMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/SysDeptMapper.class index fb9af4e..3a4dc11 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/SysDeptMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/SysDeptMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/SysMenuMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/SysMenuMapper.class index a443707..722a03b 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/SysMenuMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/SysMenuMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMapper.class index 7ecc9a9..83b6f00 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMenuMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMenuMapper.class index 7233687..961a123 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMenuMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/SysRoleMenuMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/SysUserDeptMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/SysUserDeptMapper.class index 6987873..ab138b9 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/SysUserDeptMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/SysUserDeptMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/mapper/SysUserRoleMapper.class b/crm-auth/target/classes/com/crm/auth/mapper/SysUserRoleMapper.class index 5acd854..d25ae29 100644 Binary files a/crm-auth/target/classes/com/crm/auth/mapper/SysUserRoleMapper.class and b/crm-auth/target/classes/com/crm/auth/mapper/SysUserRoleMapper.class differ diff --git a/crm-auth/target/classes/com/crm/auth/security/AuthLoginUser.class b/crm-auth/target/classes/com/crm/auth/security/AuthLoginUser.class index 9478261..a7c705b 100644 Binary files a/crm-auth/target/classes/com/crm/auth/security/AuthLoginUser.class and b/crm-auth/target/classes/com/crm/auth/security/AuthLoginUser.class differ diff --git a/crm-auth/target/classes/com/crm/auth/security/DataScopeInterceptor.class b/crm-auth/target/classes/com/crm/auth/security/DataScopeInterceptor.class index 3bc2489..394d17d 100644 Binary files a/crm-auth/target/classes/com/crm/auth/security/DataScopeInterceptor.class and b/crm-auth/target/classes/com/crm/auth/security/DataScopeInterceptor.class differ diff --git a/crm-auth/target/classes/com/crm/auth/security/DataScopeTables.class b/crm-auth/target/classes/com/crm/auth/security/DataScopeTables.class index e1c7edd..b965f6b 100644 Binary files a/crm-auth/target/classes/com/crm/auth/security/DataScopeTables.class and b/crm-auth/target/classes/com/crm/auth/security/DataScopeTables.class differ diff --git a/crm-auth/target/classes/com/crm/auth/security/JwtAuthenticationFilter.class b/crm-auth/target/classes/com/crm/auth/security/JwtAuthenticationFilter.class index ee0c643..6613b05 100644 Binary files a/crm-auth/target/classes/com/crm/auth/security/JwtAuthenticationFilter.class and b/crm-auth/target/classes/com/crm/auth/security/JwtAuthenticationFilter.class differ diff --git a/crm-auth/target/classes/com/crm/auth/security/SecurityExceptionHandlers.class b/crm-auth/target/classes/com/crm/auth/security/SecurityExceptionHandlers.class index 2731f0e..9a1920a 100644 Binary files a/crm-auth/target/classes/com/crm/auth/security/SecurityExceptionHandlers.class and b/crm-auth/target/classes/com/crm/auth/security/SecurityExceptionHandlers.class differ diff --git a/crm-auth/target/classes/com/crm/auth/security/TokenService.class b/crm-auth/target/classes/com/crm/auth/security/TokenService.class index 97bccde..c7cd22c 100644 Binary files a/crm-auth/target/classes/com/crm/auth/security/TokenService.class and b/crm-auth/target/classes/com/crm/auth/security/TokenService.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/DeptTreeCache.class b/crm-auth/target/classes/com/crm/auth/service/DeptTreeCache.class index f8e2c4a..76878f7 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/DeptTreeCache.class and b/crm-auth/target/classes/com/crm/auth/service/DeptTreeCache.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/IAuthIdentityService.class b/crm-auth/target/classes/com/crm/auth/service/IAuthIdentityService.class index 7cea8b7..d7f26b6 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/IAuthIdentityService.class and b/crm-auth/target/classes/com/crm/auth/service/IAuthIdentityService.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/IAuthService.class b/crm-auth/target/classes/com/crm/auth/service/IAuthService.class index 4bc7003..046338d 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/IAuthService.class and b/crm-auth/target/classes/com/crm/auth/service/IAuthService.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/IAuthUserService.class b/crm-auth/target/classes/com/crm/auth/service/IAuthUserService.class index b7e12f5..e21f4bc 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/IAuthUserService.class and b/crm-auth/target/classes/com/crm/auth/service/IAuthUserService.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/ISysDeptService.class b/crm-auth/target/classes/com/crm/auth/service/ISysDeptService.class index 5d14d37..f51b418 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/ISysDeptService.class and b/crm-auth/target/classes/com/crm/auth/service/ISysDeptService.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/ISysMenuService.class b/crm-auth/target/classes/com/crm/auth/service/ISysMenuService.class index a0f7fda..241185a 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/ISysMenuService.class and b/crm-auth/target/classes/com/crm/auth/service/ISysMenuService.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/ISysRoleService.class b/crm-auth/target/classes/com/crm/auth/service/ISysRoleService.class index 9bbfb2a..1011ac2 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/ISysRoleService.class and b/crm-auth/target/classes/com/crm/auth/service/ISysRoleService.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/client/DingTalkAuthClient.class b/crm-auth/target/classes/com/crm/auth/service/client/DingTalkAuthClient.class index 30de31f..acb7721 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/client/DingTalkAuthClient.class and b/crm-auth/target/classes/com/crm/auth/service/client/DingTalkAuthClient.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClient.class b/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClient.class index 8b2a836..f276c58 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClient.class and b/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClient.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClientFactory.class b/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClientFactory.class index 4d475d4..fee32af 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClientFactory.class and b/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyAuthClientFactory.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyUserInfo.class b/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyUserInfo.class index 6ee96bd..a7cd19f 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyUserInfo.class and b/crm-auth/target/classes/com/crm/auth/service/client/ThirdPartyUserInfo.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/impl/AuthIdentityServiceImpl.class b/crm-auth/target/classes/com/crm/auth/service/impl/AuthIdentityServiceImpl.class index a599952..87b7b17 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/impl/AuthIdentityServiceImpl.class and b/crm-auth/target/classes/com/crm/auth/service/impl/AuthIdentityServiceImpl.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/impl/AuthServiceImpl.class b/crm-auth/target/classes/com/crm/auth/service/impl/AuthServiceImpl.class index d0fda6e..f1820fb 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/impl/AuthServiceImpl.class and b/crm-auth/target/classes/com/crm/auth/service/impl/AuthServiceImpl.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/impl/AuthUserServiceImpl.class b/crm-auth/target/classes/com/crm/auth/service/impl/AuthUserServiceImpl.class index cffff90..d8a13d9 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/impl/AuthUserServiceImpl.class and b/crm-auth/target/classes/com/crm/auth/service/impl/AuthUserServiceImpl.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/impl/SysDeptServiceImpl.class b/crm-auth/target/classes/com/crm/auth/service/impl/SysDeptServiceImpl.class index 1f7c8ea..1c375bb 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/impl/SysDeptServiceImpl.class and b/crm-auth/target/classes/com/crm/auth/service/impl/SysDeptServiceImpl.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/impl/SysMenuServiceImpl.class b/crm-auth/target/classes/com/crm/auth/service/impl/SysMenuServiceImpl.class index ddda935..a2d557c 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/impl/SysMenuServiceImpl.class and b/crm-auth/target/classes/com/crm/auth/service/impl/SysMenuServiceImpl.class differ diff --git a/crm-auth/target/classes/com/crm/auth/service/impl/SysRoleServiceImpl.class b/crm-auth/target/classes/com/crm/auth/service/impl/SysRoleServiceImpl.class index 70d0dd9..9bf480b 100644 Binary files a/crm-auth/target/classes/com/crm/auth/service/impl/SysRoleServiceImpl.class and b/crm-auth/target/classes/com/crm/auth/service/impl/SysRoleServiceImpl.class differ diff --git a/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 928f8df..3d0eb81 100644 --- a/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,75 +1,19 @@ -com\crm\auth\security\AuthLoginUser.class -com\crm\auth\service\client\ThirdPartyUserInfo.class -com\crm\auth\security\TokenService.class -com\crm\auth\service\impl\AuthUserServiceImpl.class -com\crm\auth\domain\entity\SysRoleMenu.class -com\crm\auth\domain\entity\AuthIdentity.class +com\crm\auth\service\impl\UserQueryServiceImpl.class com\crm\auth\service\impl\ResourceServiceImpl$1.class -com\crm\auth\domain\dto\UserStatsVO.class -com\crm\auth\service\client\ThirdPartyAuthClient.class -com\crm\auth\domain\entity\SysUserRole.class -com\crm\auth\service\ISysMenuService.class com\crm\auth\service\impl\ResourceServiceImpl.class -com\crm\auth\service\client\ThirdPartyAuthClientFactory.class -com\crm\auth\mapper\SysRoleMenuMapper.class -com\crm\auth\domain\entity\SysMenu.class -com\crm\auth\service\DeptTreeCache.class -com\crm\auth\service\ISysRoleService.class com\crm\auth\domain\dto\ResourceNode.class -com\crm\auth\service\ISysDeptService.class com\crm\auth\security\ApiPermissionCache.class com\crm\auth\service\IResourceService.class com\crm\auth\security\ApiPermissionInterceptor.class com\crm\auth\security\PermissionResolver.class -com\crm\auth\domain\dto\UserInfoDTO.class com\crm\auth\constant\AuthConstants.class -com\crm\auth\service\impl\AuthIdentityServiceImpl.class com\crm\auth\config\WebMvcConfig.class -com\crm\auth\mapper\AuthIdentityMapper.class -com\crm\auth\domain\enums\IdentityTypeEnum.class -com\crm\auth\service\client\DingTalkAuthClient.class -com\crm\auth\service\impl\AuthServiceImpl.class -com\crm\auth\controller\AuthController.class -com\crm\auth\domain\param\UserPageParam.class -com\crm\auth\controller\SystemController.class com\crm\auth\controller\RoleController.class com\crm\auth\security\DataScopeInterceptor$1.class -com\crm\auth\config\DataInitializer.class -com\crm\auth\security\DataScopeTables.class com\crm\auth\domain\enums\MenuType.class -com\crm\auth\service\IAuthUserService.class com\crm\auth\security\PermissionGrant.class -com\crm\auth\config\AuthProperties$Jwt.class -com\crm\auth\service\impl\SysMenuServiceImpl.class -com\crm\auth\mapper\AuthUserMapper.class -com\crm\auth\config\AuthProperties$DingTalk.class -com\crm\auth\service\IAuthIdentityService.class -com\crm\auth\domain\dto\LoginResultDTO.class -com\crm\auth\domain\entity\SysUserDept.class -com\crm\auth\security\JwtAuthenticationFilter.class -com\crm\auth\domain\entity\SysDept.class -com\crm\auth\service\impl\SysDeptServiceImpl.class com\crm\auth\domain\dto\RoleDetailVO.class -com\crm\auth\service\IAuthService.class com\crm\auth\controller\ResourceController.class -com\crm\auth\domain\dto\UserListDTO$RoleRef.class -com\crm\auth\domain\enums\DataScopeEnum.class -com\crm\auth\mapper\SysRoleMapper.class -com\crm\auth\config\AuthProperties.class -com\crm\auth\security\DataScopeInterceptor.class -com\crm\auth\domain\entity\AuthUser.class com\crm\auth\security\ApiPermissionRule.class -com\crm\auth\config\SecurityConfig.class -com\crm\auth\mapper\SysMenuMapper.class com\crm\auth\security\PermissionResolverImpl.class -com\crm\auth\mapper\SysUserDeptMapper.class -com\crm\auth\security\SecurityExceptionHandlers.class -com\crm\auth\AuthApplication.class com\crm\auth\domain\enums\MenuType$1.class -com\crm\auth\mapper\SysUserRoleMapper.class -com\crm\auth\domain\entity\SysRole.class -com\crm\auth\mapper\SysDeptMapper.class -com\crm\auth\config\PermissionConfig.class -com\crm\auth\domain\dto\UserListDTO$DeptRef.class -com\crm\auth\domain\dto\UserListDTO.class -com\crm\auth\service\impl\SysRoleServiceImpl.class diff --git a/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index c468664..632318b 100644 --- a/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -59,11 +59,14 @@ D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IAuthUserSe D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthIdentityServiceImpl.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthServiceImpl.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthUserServiceImpl.java +D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\PermissionSeederImpl.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\ResourceServiceImpl.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysDeptServiceImpl.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysMenuServiceImpl.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysRoleServiceImpl.java +D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\UserQueryServiceImpl.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IResourceService.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysDeptService.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysMenuService.java D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysRoleService.java +D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IUserQueryService.java diff --git a/crm-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/crm-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index f3c81e7..422db7a 100644 --- a/crm-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/crm-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -6,6 +6,7 @@ D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\client\Ding D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\client\ThirdPartyAuthClientFactoryTest.java D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\AuthServiceImplTest.java D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\AuthUserServiceImplTest.java +D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\PermissionSeederImplTest.java D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\ResourceServiceImplTest.java D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\SysDeptServiceImplTest.java D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\SysMenuServiceImplTest.java diff --git a/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.AuthUserServiceImplTest.xml b/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.AuthUserServiceImplTest.xml index fa2d53b..37add94 100644 --- a/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.AuthUserServiceImplTest.xml +++ b/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.AuthUserServiceImplTest.xml @@ -1,5 +1,5 @@ - + @@ -15,8 +15,9 @@ - + + @@ -30,7 +31,7 @@ - + @@ -39,6 +40,7 @@ + @@ -49,7 +51,7 @@ - + @@ -57,11 +59,14 @@ - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.UserListIntegrationTest.xml b/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.UserListIntegrationTest.xml index 8d10404..992546e 100644 --- a/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.UserListIntegrationTest.xml +++ b/crm-auth/target/surefire-reports/TEST-com.crm.auth.service.impl.UserListIntegrationTest.xml @@ -1,5 +1,5 @@ - + @@ -15,8 +15,9 @@ - + + @@ -30,7 +31,7 @@ - + @@ -39,6 +40,7 @@ + @@ -49,7 +51,7 @@ - + @@ -57,18 +59,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/crm-auth/target/surefire-reports/com.crm.auth.service.impl.AuthUserServiceImplTest.txt b/crm-auth/target/surefire-reports/com.crm.auth.service.impl.AuthUserServiceImplTest.txt index 2f0fd40..607e1b0 100644 --- a/crm-auth/target/surefire-reports/com.crm.auth.service.impl.AuthUserServiceImplTest.txt +++ b/crm-auth/target/surefire-reports/com.crm.auth.service.impl.AuthUserServiceImplTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.crm.auth.service.impl.AuthUserServiceImplTest ------------------------------------------------------------------------------- -Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.168 s -- in com.crm.auth.service.impl.AuthUserServiceImplTest +Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.181 s -- in com.crm.auth.service.impl.AuthUserServiceImplTest diff --git a/crm-auth/target/surefire-reports/com.crm.auth.service.impl.UserListIntegrationTest.txt b/crm-auth/target/surefire-reports/com.crm.auth.service.impl.UserListIntegrationTest.txt index d747d2a..a7dfb05 100644 --- a/crm-auth/target/surefire-reports/com.crm.auth.service.impl.UserListIntegrationTest.txt +++ b/crm-auth/target/surefire-reports/com.crm.auth.service.impl.UserListIntegrationTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.crm.auth.service.impl.UserListIntegrationTest ------------------------------------------------------------------------------- -Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.338 s -- in com.crm.auth.service.impl.UserListIntegrationTest +Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.132 s -- in com.crm.auth.service.impl.UserListIntegrationTest diff --git a/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest$DeptQueryCounter.class b/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest$DeptQueryCounter.class index e59ae5b..83f78ef 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest$DeptQueryCounter.class and b/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest$DeptQueryCounter.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest.class b/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest.class index 3ddb9af..ee4b268 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest.class and b/crm-auth/target/test-classes/com/crm/auth/security/scope/DataScopeIntegrationTest.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedData.class b/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedData.class index df37cc1..6bb133f 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedData.class and b/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedData.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedDataMapper.class b/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedDataMapper.class index 79f5a69..6d0b7ab 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedDataMapper.class and b/crm-auth/target/test-classes/com/crm/auth/security/scope/TestOwnedDataMapper.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest$StubbedClient.class b/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest$StubbedClient.class index dbd8b4a..edcb1b7 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest$StubbedClient.class and b/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest$StubbedClient.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest.class b/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest.class index c7bc11d..a3376af 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest.class and b/crm-auth/target/test-classes/com/crm/auth/service/client/DingTalkAuthClientTest.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest$StubClient.class b/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest$StubClient.class index fa17783..88c6982 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest$StubClient.class and b/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest$StubClient.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest.class b/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest.class index 9794178..919844c 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest.class and b/crm-auth/target/test-classes/com/crm/auth/service/client/ThirdPartyAuthClientFactoryTest.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthServiceImplTest.class b/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthServiceImplTest.class index 4da5440..acd7acd 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthServiceImplTest.class and b/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthServiceImplTest.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthUserServiceImplTest.class b/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthUserServiceImplTest.class index 1bcce88..fb08e87 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthUserServiceImplTest.class and b/crm-auth/target/test-classes/com/crm/auth/service/impl/AuthUserServiceImplTest.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/impl/SysDeptServiceImplTest.class b/crm-auth/target/test-classes/com/crm/auth/service/impl/SysDeptServiceImplTest.class index fbed4d6..b4c01bc 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/impl/SysDeptServiceImplTest.class and b/crm-auth/target/test-classes/com/crm/auth/service/impl/SysDeptServiceImplTest.class differ diff --git a/crm-auth/target/test-classes/com/crm/auth/service/impl/UserListIntegrationTest.class b/crm-auth/target/test-classes/com/crm/auth/service/impl/UserListIntegrationTest.class index 2f60025..7c2eb24 100644 Binary files a/crm-auth/target/test-classes/com/crm/auth/service/impl/UserListIntegrationTest.class and b/crm-auth/target/test-classes/com/crm/auth/service/impl/UserListIntegrationTest.class differ diff --git a/crm-base/target/classes/com/crm/base/advice/GlobalExceptionHandlerAdvice.class b/crm-base/target/classes/com/crm/base/advice/GlobalExceptionHandlerAdvice.class index b8ea707..ef17ef8 100644 Binary files a/crm-base/target/classes/com/crm/base/advice/GlobalExceptionHandlerAdvice.class and b/crm-base/target/classes/com/crm/base/advice/GlobalExceptionHandlerAdvice.class differ diff --git a/crm-base/target/classes/com/crm/base/config/CorsConfig.class b/crm-base/target/classes/com/crm/base/config/CorsConfig.class index e95dc50..d3cf089 100644 Binary files a/crm-base/target/classes/com/crm/base/config/CorsConfig.class and b/crm-base/target/classes/com/crm/base/config/CorsConfig.class differ diff --git a/crm-base/target/classes/com/crm/base/config/CrmSqlInjector.class b/crm-base/target/classes/com/crm/base/config/CrmSqlInjector.class index edeb8a9..ea8fa51 100644 Binary files a/crm-base/target/classes/com/crm/base/config/CrmSqlInjector.class and b/crm-base/target/classes/com/crm/base/config/CrmSqlInjector.class differ diff --git a/crm-base/target/classes/com/crm/base/config/CustomIdGenerator.class b/crm-base/target/classes/com/crm/base/config/CustomIdGenerator.class index 289a9a4..bf78391 100644 Binary files a/crm-base/target/classes/com/crm/base/config/CustomIdGenerator.class and b/crm-base/target/classes/com/crm/base/config/CustomIdGenerator.class differ diff --git a/crm-base/target/classes/com/crm/base/config/InsertBatchOnDuplicateKeyUpdate.class b/crm-base/target/classes/com/crm/base/config/InsertBatchOnDuplicateKeyUpdate.class index 739f24a..e037d12 100644 Binary files a/crm-base/target/classes/com/crm/base/config/InsertBatchOnDuplicateKeyUpdate.class and b/crm-base/target/classes/com/crm/base/config/InsertBatchOnDuplicateKeyUpdate.class differ diff --git a/crm-base/target/classes/com/crm/base/config/JacksonConfig.class b/crm-base/target/classes/com/crm/base/config/JacksonConfig.class index f048199..68e8169 100644 Binary files a/crm-base/target/classes/com/crm/base/config/JacksonConfig.class and b/crm-base/target/classes/com/crm/base/config/JacksonConfig.class differ diff --git a/crm-base/target/classes/com/crm/base/config/Knife4jConfig.class b/crm-base/target/classes/com/crm/base/config/Knife4jConfig.class index 08ed060..ec9eb6f 100644 Binary files a/crm-base/target/classes/com/crm/base/config/Knife4jConfig.class and b/crm-base/target/classes/com/crm/base/config/Knife4jConfig.class differ diff --git a/crm-base/target/classes/com/crm/base/config/MetaObjectFillHandler.class b/crm-base/target/classes/com/crm/base/config/MetaObjectFillHandler.class index 4a1de4b..975beae 100644 Binary files a/crm-base/target/classes/com/crm/base/config/MetaObjectFillHandler.class and b/crm-base/target/classes/com/crm/base/config/MetaObjectFillHandler.class differ diff --git a/crm-base/target/classes/com/crm/base/config/MybatisPlusConfig.class b/crm-base/target/classes/com/crm/base/config/MybatisPlusConfig.class index 6b456e1..7c825c1 100644 Binary files a/crm-base/target/classes/com/crm/base/config/MybatisPlusConfig.class and b/crm-base/target/classes/com/crm/base/config/MybatisPlusConfig.class differ diff --git a/crm-base/target/classes/com/crm/base/config/RedisConfig.class b/crm-base/target/classes/com/crm/base/config/RedisConfig.class index 59c157c..154c7b8 100644 Binary files a/crm-base/target/classes/com/crm/base/config/RedisConfig.class and b/crm-base/target/classes/com/crm/base/config/RedisConfig.class differ diff --git a/crm-base/target/classes/com/crm/base/config/ScheduledTaskProperties.class b/crm-base/target/classes/com/crm/base/config/ScheduledTaskProperties.class index 9862b6b..5a87533 100644 Binary files a/crm-base/target/classes/com/crm/base/config/ScheduledTaskProperties.class and b/crm-base/target/classes/com/crm/base/config/ScheduledTaskProperties.class differ diff --git a/crm-base/target/classes/com/crm/base/config/SnowflakeIdWorker.class b/crm-base/target/classes/com/crm/base/config/SnowflakeIdWorker.class index 5c44e1f..148f3ce 100644 Binary files a/crm-base/target/classes/com/crm/base/config/SnowflakeIdWorker.class and b/crm-base/target/classes/com/crm/base/config/SnowflakeIdWorker.class differ diff --git a/crm-base/target/classes/com/crm/base/config/SnowflakeProperties.class b/crm-base/target/classes/com/crm/base/config/SnowflakeProperties.class index 988af8a..68e04de 100644 Binary files a/crm-base/target/classes/com/crm/base/config/SnowflakeProperties.class and b/crm-base/target/classes/com/crm/base/config/SnowflakeProperties.class differ diff --git a/crm-base/target/classes/com/crm/base/constant/CommonConstants.class b/crm-base/target/classes/com/crm/base/constant/CommonConstants.class index 453c37e..3bbddcf 100644 Binary files a/crm-base/target/classes/com/crm/base/constant/CommonConstants.class and b/crm-base/target/classes/com/crm/base/constant/CommonConstants.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/dto/BaseDTO.class b/crm-base/target/classes/com/crm/base/domain/dto/BaseDTO.class index dc5ad9c..e23f88f 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/dto/BaseDTO.class and b/crm-base/target/classes/com/crm/base/domain/dto/BaseDTO.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/entity/BaseEntity.class b/crm-base/target/classes/com/crm/base/domain/entity/BaseEntity.class index 7d8f181..b28f6a1 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/entity/BaseEntity.class and b/crm-base/target/classes/com/crm/base/domain/entity/BaseEntity.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/entity/OwnedEntity.class b/crm-base/target/classes/com/crm/base/domain/entity/OwnedEntity.class index 1d5bea1..233da3a 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/entity/OwnedEntity.class and b/crm-base/target/classes/com/crm/base/domain/entity/OwnedEntity.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/enums/HasValueEnum.class b/crm-base/target/classes/com/crm/base/domain/enums/HasValueEnum.class index 665d301..ad43d98 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/enums/HasValueEnum.class and b/crm-base/target/classes/com/crm/base/domain/enums/HasValueEnum.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/enums/StatusEnum.class b/crm-base/target/classes/com/crm/base/domain/enums/StatusEnum.class index 82d9f4b..2753ac8 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/enums/StatusEnum.class and b/crm-base/target/classes/com/crm/base/domain/enums/StatusEnum.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/exception/BusinessErrorException.class b/crm-base/target/classes/com/crm/base/domain/exception/BusinessErrorException.class index 0dcc7b3..0bc8525 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/exception/BusinessErrorException.class and b/crm-base/target/classes/com/crm/base/domain/exception/BusinessErrorException.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/exception/MissingParameterException.class b/crm-base/target/classes/com/crm/base/domain/exception/MissingParameterException.class index 111c94e..7811b32 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/exception/MissingParameterException.class and b/crm-base/target/classes/com/crm/base/domain/exception/MissingParameterException.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/exception/PermissionErrorException.class b/crm-base/target/classes/com/crm/base/domain/exception/PermissionErrorException.class index 82cfff3..3175634 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/exception/PermissionErrorException.class and b/crm-base/target/classes/com/crm/base/domain/exception/PermissionErrorException.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/exception/ResourceNotExistException.class b/crm-base/target/classes/com/crm/base/domain/exception/ResourceNotExistException.class index 9cd97bc..6b146a9 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/exception/ResourceNotExistException.class and b/crm-base/target/classes/com/crm/base/domain/exception/ResourceNotExistException.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/param/BaseParam.class b/crm-base/target/classes/com/crm/base/domain/param/BaseParam.class index 3922d12..10e18dd 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/param/BaseParam.class and b/crm-base/target/classes/com/crm/base/domain/param/BaseParam.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/result/PageResult.class b/crm-base/target/classes/com/crm/base/domain/result/PageResult.class index 15495c3..f6adffb 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/result/PageResult.class and b/crm-base/target/classes/com/crm/base/domain/result/PageResult.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/result/Result.class b/crm-base/target/classes/com/crm/base/domain/result/Result.class index ef3219f..df115d2 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/result/Result.class and b/crm-base/target/classes/com/crm/base/domain/result/Result.class differ diff --git a/crm-base/target/classes/com/crm/base/domain/result/ResultCodeEnum.class b/crm-base/target/classes/com/crm/base/domain/result/ResultCodeEnum.class index cbe66e4..bce1865 100644 Binary files a/crm-base/target/classes/com/crm/base/domain/result/ResultCodeEnum.class and b/crm-base/target/classes/com/crm/base/domain/result/ResultCodeEnum.class differ diff --git a/crm-base/target/classes/com/crm/base/filter/TraceIdFilter.class b/crm-base/target/classes/com/crm/base/filter/TraceIdFilter.class index fa83119..eabed07 100644 Binary files a/crm-base/target/classes/com/crm/base/filter/TraceIdFilter.class and b/crm-base/target/classes/com/crm/base/filter/TraceIdFilter.class differ diff --git a/crm-base/target/classes/com/crm/base/mapper/CrmBaseMapper.class b/crm-base/target/classes/com/crm/base/mapper/CrmBaseMapper.class index 5375606..0167be4 100644 Binary files a/crm-base/target/classes/com/crm/base/mapper/CrmBaseMapper.class and b/crm-base/target/classes/com/crm/base/mapper/CrmBaseMapper.class differ diff --git a/crm-base/target/classes/com/crm/base/security/DataOwnership.class b/crm-base/target/classes/com/crm/base/security/DataOwnership.class index 080bcc3..7d36b5f 100644 Binary files a/crm-base/target/classes/com/crm/base/security/DataOwnership.class and b/crm-base/target/classes/com/crm/base/security/DataOwnership.class differ diff --git a/crm-base/target/classes/com/crm/base/security/DataScopeHelper.class b/crm-base/target/classes/com/crm/base/security/DataScopeHelper.class index 405b365..cd6213a 100644 Binary files a/crm-base/target/classes/com/crm/base/security/DataScopeHelper.class and b/crm-base/target/classes/com/crm/base/security/DataScopeHelper.class differ diff --git a/crm-base/target/classes/com/crm/base/security/DataScopeLevel.class b/crm-base/target/classes/com/crm/base/security/DataScopeLevel.class index d70e243..8d6e5ed 100644 Binary files a/crm-base/target/classes/com/crm/base/security/DataScopeLevel.class and b/crm-base/target/classes/com/crm/base/security/DataScopeLevel.class differ diff --git a/crm-base/target/classes/com/crm/base/security/DataVisibility.class b/crm-base/target/classes/com/crm/base/security/DataVisibility.class index 76814ca..d5e6837 100644 Binary files a/crm-base/target/classes/com/crm/base/security/DataVisibility.class and b/crm-base/target/classes/com/crm/base/security/DataVisibility.class differ diff --git a/crm-base/target/classes/com/crm/base/security/DataVisibilityContext.class b/crm-base/target/classes/com/crm/base/security/DataVisibilityContext.class index 4c6de6c..dd8cbb1 100644 Binary files a/crm-base/target/classes/com/crm/base/security/DataVisibilityContext.class and b/crm-base/target/classes/com/crm/base/security/DataVisibilityContext.class differ diff --git a/crm-base/target/classes/com/crm/base/security/SecurityUtils.class b/crm-base/target/classes/com/crm/base/security/SecurityUtils.class index a9d69fa..c018325 100644 Binary files a/crm-base/target/classes/com/crm/base/security/SecurityUtils.class and b/crm-base/target/classes/com/crm/base/security/SecurityUtils.class differ diff --git a/crm-base/target/classes/com/crm/base/security/VisibilityScope$Kind.class b/crm-base/target/classes/com/crm/base/security/VisibilityScope$Kind.class index b78657a..180ef17 100644 Binary files a/crm-base/target/classes/com/crm/base/security/VisibilityScope$Kind.class and b/crm-base/target/classes/com/crm/base/security/VisibilityScope$Kind.class differ diff --git a/crm-base/target/classes/com/crm/base/security/VisibilityScope.class b/crm-base/target/classes/com/crm/base/security/VisibilityScope.class index 8aeb3ea..836d9a1 100644 Binary files a/crm-base/target/classes/com/crm/base/security/VisibilityScope.class and b/crm-base/target/classes/com/crm/base/security/VisibilityScope.class differ diff --git a/crm-base/target/classes/com/crm/base/service/IBaseService.class b/crm-base/target/classes/com/crm/base/service/IBaseService.class index a1f949b..5db36ef 100644 Binary files a/crm-base/target/classes/com/crm/base/service/IBaseService.class and b/crm-base/target/classes/com/crm/base/service/IBaseService.class differ diff --git a/crm-base/target/classes/com/crm/base/service/impl/BaseServiceImpl.class b/crm-base/target/classes/com/crm/base/service/impl/BaseServiceImpl.class index b85a62b..ed9b095 100644 Binary files a/crm-base/target/classes/com/crm/base/service/impl/BaseServiceImpl.class and b/crm-base/target/classes/com/crm/base/service/impl/BaseServiceImpl.class differ diff --git a/crm-base/target/classes/com/crm/base/utils/AssertUtils.class b/crm-base/target/classes/com/crm/base/utils/AssertUtils.class index 549a925..be43b66 100644 Binary files a/crm-base/target/classes/com/crm/base/utils/AssertUtils.class and b/crm-base/target/classes/com/crm/base/utils/AssertUtils.class differ diff --git a/crm-base/target/classes/com/crm/base/utils/BeanCopyUtils.class b/crm-base/target/classes/com/crm/base/utils/BeanCopyUtils.class index dff5a1d..8f38e7f 100644 Binary files a/crm-base/target/classes/com/crm/base/utils/BeanCopyUtils.class and b/crm-base/target/classes/com/crm/base/utils/BeanCopyUtils.class differ diff --git a/crm-base/target/classes/com/crm/base/utils/EnumUtils.class b/crm-base/target/classes/com/crm/base/utils/EnumUtils.class index 1ec3d5a..cc57269 100644 Binary files a/crm-base/target/classes/com/crm/base/utils/EnumUtils.class and b/crm-base/target/classes/com/crm/base/utils/EnumUtils.class differ diff --git a/crm-base/target/classes/com/crm/base/utils/ExcelUtil.class b/crm-base/target/classes/com/crm/base/utils/ExcelUtil.class index 7175f69..7f4db4d 100644 Binary files a/crm-base/target/classes/com/crm/base/utils/ExcelUtil.class and b/crm-base/target/classes/com/crm/base/utils/ExcelUtil.class differ diff --git a/crm-base/target/classes/com/crm/base/utils/PageConverter.class b/crm-base/target/classes/com/crm/base/utils/PageConverter.class index 7494cac..069bd07 100644 Binary files a/crm-base/target/classes/com/crm/base/utils/PageConverter.class and b/crm-base/target/classes/com/crm/base/utils/PageConverter.class differ diff --git a/crm-base/target/classes/com/crm/base/utils/ServletUtils.class b/crm-base/target/classes/com/crm/base/utils/ServletUtils.class index b171ba3..a1aca1d 100644 Binary files a/crm-base/target/classes/com/crm/base/utils/ServletUtils.class and b/crm-base/target/classes/com/crm/base/utils/ServletUtils.class differ diff --git a/crm-base/target/classes/com/crm/base/utils/TreeUtils.class b/crm-base/target/classes/com/crm/base/utils/TreeUtils.class index 995fb98..8ff4e4a 100644 Binary files a/crm-base/target/classes/com/crm/base/utils/TreeUtils.class and b/crm-base/target/classes/com/crm/base/utils/TreeUtils.class differ diff --git a/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index e494e6f..2980f3e 100644 --- a/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -4,6 +4,7 @@ com\crm\base\config\ScheduledTaskProperties.class com\crm\base\utils\ExcelUtil.class com\crm\base\security\VisibilityScope$Kind.class com\crm\base\utils\EnumUtils.class +com\crm\base\domain\dto\PermissionModuleDescriptor.class com\crm\base\service\impl\BaseServiceImpl.class com\crm\base\security\VisibilityScope.class com\crm\base\domain\dto\BaseDTO.class diff --git a/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 98ae16c..5c9ad43 100644 --- a/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -14,6 +14,8 @@ D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\SnowflakeIdW D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\SnowflakeProperties.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\constant\CommonConstants.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\BaseDTO.java +D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\ButtonSeed.java +D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\PermissionModuleDescriptor.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\entity\BaseEntity.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\entity\OwnedEntity.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\enums\HasValueEnum.java @@ -38,6 +40,7 @@ D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\SecurityUt D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\VisibilityScope.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\IBaseService.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\impl\BaseServiceImpl.java +D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\PermissionSeeder.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\AssertUtils.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\BeanCopyUtils.java D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\EnumUtils.java diff --git a/crm-file/target/classes/com/crm/file/api/FileApi.class b/crm-file/target/classes/com/crm/file/api/FileApi.class index af0ef12..681c222 100644 Binary files a/crm-file/target/classes/com/crm/file/api/FileApi.class and b/crm-file/target/classes/com/crm/file/api/FileApi.class differ diff --git a/crm-file/target/classes/com/crm/file/config/FileProperties$Minio.class b/crm-file/target/classes/com/crm/file/config/FileProperties$Minio.class index 1fb6783..7f9cda2 100644 Binary files a/crm-file/target/classes/com/crm/file/config/FileProperties$Minio.class and b/crm-file/target/classes/com/crm/file/config/FileProperties$Minio.class differ diff --git a/crm-file/target/classes/com/crm/file/config/FileProperties$Preview.class b/crm-file/target/classes/com/crm/file/config/FileProperties$Preview.class index 605aca3..a009ad0 100644 Binary files a/crm-file/target/classes/com/crm/file/config/FileProperties$Preview.class and b/crm-file/target/classes/com/crm/file/config/FileProperties$Preview.class differ diff --git a/crm-file/target/classes/com/crm/file/config/FileProperties.class b/crm-file/target/classes/com/crm/file/config/FileProperties.class index 210b26c..3b406c4 100644 Binary files a/crm-file/target/classes/com/crm/file/config/FileProperties.class and b/crm-file/target/classes/com/crm/file/config/FileProperties.class differ diff --git a/crm-file/target/classes/com/crm/file/config/MinioConfig.class b/crm-file/target/classes/com/crm/file/config/MinioConfig.class index 0f94787..bbf1055 100644 Binary files a/crm-file/target/classes/com/crm/file/config/MinioConfig.class and b/crm-file/target/classes/com/crm/file/config/MinioConfig.class differ diff --git a/crm-file/target/classes/com/crm/file/config/SchedulingConfig.class b/crm-file/target/classes/com/crm/file/config/SchedulingConfig.class index 430db67..1d4174d 100644 Binary files a/crm-file/target/classes/com/crm/file/config/SchedulingConfig.class and b/crm-file/target/classes/com/crm/file/config/SchedulingConfig.class differ diff --git a/crm-file/target/classes/com/crm/file/controller/FileController.class b/crm-file/target/classes/com/crm/file/controller/FileController.class index 79cedc7..6104701 100644 Binary files a/crm-file/target/classes/com/crm/file/controller/FileController.class and b/crm-file/target/classes/com/crm/file/controller/FileController.class differ diff --git a/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO$FileDownloadDTOBuilder.class b/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO$FileDownloadDTOBuilder.class index 1255263..be98865 100644 Binary files a/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO$FileDownloadDTOBuilder.class and b/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO$FileDownloadDTOBuilder.class differ diff --git a/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO.class b/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO.class index c524214..f512ef5 100644 Binary files a/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO.class and b/crm-file/target/classes/com/crm/file/domain/dto/FileDownloadDTO.class differ diff --git a/crm-file/target/classes/com/crm/file/domain/dto/FileInfoDTO.class b/crm-file/target/classes/com/crm/file/domain/dto/FileInfoDTO.class index 7bfb59d..e197860 100644 Binary files a/crm-file/target/classes/com/crm/file/domain/dto/FileInfoDTO.class and b/crm-file/target/classes/com/crm/file/domain/dto/FileInfoDTO.class differ diff --git a/crm-file/target/classes/com/crm/file/domain/dto/MultipartInitDTO.class b/crm-file/target/classes/com/crm/file/domain/dto/MultipartInitDTO.class index cf15213..b9e832a 100644 Binary files a/crm-file/target/classes/com/crm/file/domain/dto/MultipartInitDTO.class and b/crm-file/target/classes/com/crm/file/domain/dto/MultipartInitDTO.class differ diff --git a/crm-file/target/classes/com/crm/file/domain/dto/UploadSession.class b/crm-file/target/classes/com/crm/file/domain/dto/UploadSession.class index e9f96f1..877bdb0 100644 Binary files a/crm-file/target/classes/com/crm/file/domain/dto/UploadSession.class and b/crm-file/target/classes/com/crm/file/domain/dto/UploadSession.class differ diff --git a/crm-file/target/classes/com/crm/file/domain/entity/FileInfo.class b/crm-file/target/classes/com/crm/file/domain/entity/FileInfo.class index 945c1fc..41f6423 100644 Binary files a/crm-file/target/classes/com/crm/file/domain/entity/FileInfo.class and b/crm-file/target/classes/com/crm/file/domain/entity/FileInfo.class differ diff --git a/crm-file/target/classes/com/crm/file/mapper/FileInfoMapper.class b/crm-file/target/classes/com/crm/file/mapper/FileInfoMapper.class index be588dd..8bfa5ab 100644 Binary files a/crm-file/target/classes/com/crm/file/mapper/FileInfoMapper.class and b/crm-file/target/classes/com/crm/file/mapper/FileInfoMapper.class differ diff --git a/crm-file/target/classes/com/crm/file/service/IFileInfoService.class b/crm-file/target/classes/com/crm/file/service/IFileInfoService.class index 914d45a..f5e9ef7 100644 Binary files a/crm-file/target/classes/com/crm/file/service/IFileInfoService.class and b/crm-file/target/classes/com/crm/file/service/IFileInfoService.class differ diff --git a/crm-file/target/classes/com/crm/file/service/KkFileViewClient.class b/crm-file/target/classes/com/crm/file/service/KkFileViewClient.class index 4052286..848d32e 100644 Binary files a/crm-file/target/classes/com/crm/file/service/KkFileViewClient.class and b/crm-file/target/classes/com/crm/file/service/KkFileViewClient.class differ diff --git a/crm-file/target/classes/com/crm/file/service/impl/FileApiImpl.class b/crm-file/target/classes/com/crm/file/service/impl/FileApiImpl.class index bbf2012..4031673 100644 Binary files a/crm-file/target/classes/com/crm/file/service/impl/FileApiImpl.class and b/crm-file/target/classes/com/crm/file/service/impl/FileApiImpl.class differ diff --git a/crm-file/target/classes/com/crm/file/service/impl/FileInfoServiceImpl.class b/crm-file/target/classes/com/crm/file/service/impl/FileInfoServiceImpl.class index ad16392..b7d8416 100644 Binary files a/crm-file/target/classes/com/crm/file/service/impl/FileInfoServiceImpl.class and b/crm-file/target/classes/com/crm/file/service/impl/FileInfoServiceImpl.class differ diff --git a/crm-file/target/classes/com/crm/file/task/OrphanChunkCleanupTask.class b/crm-file/target/classes/com/crm/file/task/OrphanChunkCleanupTask.class index a888212..e233383 100644 Binary files a/crm-file/target/classes/com/crm/file/task/OrphanChunkCleanupTask.class and b/crm-file/target/classes/com/crm/file/task/OrphanChunkCleanupTask.class differ