diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SaOAuth2ServerController.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SaOAuth2ServerController.java index 04339ee..1ce59d9 100644 --- a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SaOAuth2ServerController.java +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SaOAuth2ServerController.java @@ -1,5 +1,4 @@ package com.tashow.cloud.controller; - import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.oauth2.config.SaOAuth2ServerConfig; import cn.dev33.satoken.oauth2.consts.GrantType; diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SsoServerController.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SsoServerController.java index 12453e5..f4d7bb3 100644 --- a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SsoServerController.java +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/controller/SsoServerController.java @@ -1,5 +1,4 @@ package com.tashow.cloud.controller; -import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.sso.config.SaSsoServerConfig; import cn.dev33.satoken.sso.processor.SaSsoServerProcessor; import cn.dev33.satoken.stp.StpUtil; diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemRoleMapper.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemRoleMapper.java new file mode 100644 index 0000000..b43ddf0 --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemRoleMapper.java @@ -0,0 +1,13 @@ +package com.tashow.cloud.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.tashow.cloud.model.SystemRole; +import org.apache.ibatis.annotations.Mapper; + +/** + * 系统角色Mapper接口 + */ +@Mapper +public interface SystemRoleMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemUserMapper.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemUserMapper.java index deff44f..51b2159 100644 --- a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemUserMapper.java +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemUserMapper.java @@ -3,9 +3,6 @@ package com.tashow.cloud.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.tashow.cloud.model.SystemUser; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import java.util.List; /** * 系统用户Mapper接口 @@ -13,34 +10,4 @@ import java.util.List; @Mapper public interface SystemUserMapper extends BaseMapper { - /** - * 获取用户角色ID列表 - * - * @param userId 用户ID - * @return 角色ID列表 - */ - @Select("SELECT role_id FROM system_user_role WHERE user_id = #{userId} AND deleted = 0") - List selectUserRoleIds(@Param("userId") Long userId); - - /** - * 获取用户角色名称列表 - * - * @param userId 用户ID - * @return 角色名称列表 - */ - @Select("SELECT r.name FROM system_role r " + - "JOIN system_user_role ur ON r.id = ur.role_id " + - "WHERE ur.user_id = #{userId} AND r.deleted = 0 AND ur.deleted = 0 AND r.status = 0") - List selectUserRoleNames(@Param("userId") Long userId); - - /** - * 获取用户角色编码列表 - * - * @param userId 用户ID - * @return 角色编码列表 - */ - @Select("SELECT r.code FROM system_role r " + - "JOIN system_user_role ur ON r.id = ur.role_id " + - "WHERE ur.user_id = #{userId} AND r.deleted = 0 AND ur.deleted = 0 AND r.status = 0") - List selectUserRoleCodes(@Param("userId") Long userId); } \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemUserRoleMapper.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemUserRoleMapper.java new file mode 100644 index 0000000..606bb5e --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/mapper/SystemUserRoleMapper.java @@ -0,0 +1,13 @@ +package com.tashow.cloud.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.tashow.cloud.model.SystemUserRole; +import org.apache.ibatis.annotations.Mapper; + +/** + * 系统用户角色关联Mapper接口 + */ +@Mapper +public interface SystemUserRoleMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/model/SystemRole.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/model/SystemRole.java new file mode 100644 index 0000000..7031edf --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/model/SystemRole.java @@ -0,0 +1,92 @@ +package com.tashow.cloud.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import java.time.LocalDateTime; + +/** + * 系统角色实体类 + */ +@Data +@TableName("system_role") +public class SystemRole { + /** + * 角色ID + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 角色名称 + */ + private String name; + + /** + * 角色权限字符串 + */ + private String code; + + /** + * 显示顺序 + */ + private Integer sort; + + /** + * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） + */ + private Integer dataScope; + + /** + * 数据范围(指定部门数组) + */ + private String dataScopeDeptIds; + + /** + * 角色状态（0正常 1停用） + */ + private Integer status; + + /** + * 角色类型 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 创建者 + */ + private String creator; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新者 + */ + private String updater; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + private Boolean deleted; + + /** + * 租户编号 + */ + private Long tenantId; +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/model/SystemUserRole.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/model/SystemUserRole.java new file mode 100644 index 0000000..db71fdb --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/model/SystemUserRole.java @@ -0,0 +1,63 @@ +package com.tashow.cloud.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 用户角色关联实体类 + */ +@Data +@TableName("system_user_role") +public class SystemUserRole { + /** + * 自增编号 + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 创建者 + */ + private String creator; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新者 + */ + private String updater; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + private Boolean deleted; + + /** + * 租户编号 + */ + private Long tenantId; +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemRoleService.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemRoleService.java new file mode 100644 index 0000000..dd4e520 --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemRoleService.java @@ -0,0 +1,11 @@ +package com.tashow.cloud.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.tashow.cloud.model.SystemRole; + +/** + * 系统角色服务接口 + */ +public interface SystemRoleService extends IService { + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemUserRoleService.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemUserRoleService.java new file mode 100644 index 0000000..cf3c6bd --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemUserRoleService.java @@ -0,0 +1,11 @@ +package com.tashow.cloud.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.tashow.cloud.model.SystemUserRole; + +/** + * 系统用户角色关联服务接口 + */ +public interface SystemUserRoleService extends IService { + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemUserService.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemUserService.java index e48778b..41dee3f 100644 --- a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemUserService.java +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/SystemUserService.java @@ -1,6 +1,7 @@ package com.tashow.cloud.service; import com.tashow.cloud.model.SystemUser; +import java.util.List; /** * 系统用户服务接口 @@ -55,4 +56,28 @@ public interface SystemUserService { * @return 加密后的密码 */ String encodePassword(String rawPassword); + + /** + * 获取用户角色ID列表 + * + * @param userId 用户ID + * @return 角色ID列表 + */ + List getUserRoleIds(Long userId); + + /** + * 获取用户角色名称列表 + * + * @param userId 用户ID + * @return 角色名称列表 + */ + List getUserRoleNames(Long userId); + + /** + * 获取用户角色编码列表 + * + * @param userId 用户ID + * @return 角色编码列表 + */ + List getUserRoleCodes(Long userId); } \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemRoleServiceImpl.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemRoleServiceImpl.java new file mode 100644 index 0000000..142a6c9 --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemRoleServiceImpl.java @@ -0,0 +1,15 @@ +package com.tashow.cloud.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.tashow.cloud.mapper.SystemRoleMapper; +import com.tashow.cloud.model.SystemRole; +import com.tashow.cloud.service.SystemRoleService; +import org.springframework.stereotype.Service; + +/** + * 系统角色服务实现类 + */ +@Service +public class SystemRoleServiceImpl extends ServiceImpl implements SystemRoleService { + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemUserRoleServiceImpl.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemUserRoleServiceImpl.java new file mode 100644 index 0000000..49d1ad7 --- /dev/null +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemUserRoleServiceImpl.java @@ -0,0 +1,15 @@ +package com.tashow.cloud.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.tashow.cloud.mapper.SystemUserRoleMapper; +import com.tashow.cloud.model.SystemUserRole; +import com.tashow.cloud.service.SystemUserRoleService; +import org.springframework.stereotype.Service; + +/** + * 系统用户角色关联服务实现类 + */ +@Service +public class SystemUserRoleServiceImpl extends ServiceImpl implements SystemUserRoleService { + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemUserServiceImpl.java b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemUserServiceImpl.java index 8305f75..53a2fb7 100644 --- a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemUserServiceImpl.java +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/java/com/tashow/cloud/service/impl/SystemUserServiceImpl.java @@ -3,12 +3,19 @@ package com.tashow.cloud.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tashow.cloud.mapper.SystemUserMapper; +import com.tashow.cloud.model.SystemRole; import com.tashow.cloud.model.SystemUser; +import com.tashow.cloud.model.SystemUserRole; +import com.tashow.cloud.service.SystemRoleService; +import com.tashow.cloud.service.SystemUserRoleService; import com.tashow.cloud.service.SystemUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 系统用户服务实现类 @@ -17,6 +24,12 @@ import java.util.List; public class SystemUserServiceImpl extends ServiceImpl implements SystemUserService { private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + + @Autowired + private SystemRoleService systemRoleService; + + @Autowired + private SystemUserRoleService systemUserRoleService; @Override public SystemUser getUserByUsername(String username) { @@ -33,7 +46,9 @@ public class SystemUserServiceImpl extends ServiceImpl() + .eq(SystemUser::getId, userId) + .eq(SystemUser::getDeleted, false)); } @Override @@ -78,8 +93,15 @@ public class SystemUserServiceImpl extends ServiceImpl getUserRoleIds(Long userId) { - return baseMapper.selectUserRoleIds(userId); + List userRoles = systemUserRoleService.list(new LambdaQueryWrapper() + .eq(SystemUserRole::getUserId, userId) + .eq(SystemUserRole::getDeleted, false)); + + return userRoles.stream() + .map(SystemUserRole::getRoleId) + .collect(Collectors.toList()); } /** @@ -88,8 +110,23 @@ public class SystemUserServiceImpl extends ServiceImpl getUserRoleNames(Long userId) { - return baseMapper.selectUserRoleNames(userId); + // 先获取用户角色ID列表 + List roleIds = getUserRoleIds(userId); + if (roleIds.isEmpty()) { + return new ArrayList<>(); + } + + // 再查询角色名称 + List roles = systemRoleService.list(new LambdaQueryWrapper() + .in(SystemRole::getId, roleIds) + .eq(SystemRole::getStatus, 0) + .eq(SystemRole::getDeleted, false)); + + return roles.stream() + .map(SystemRole::getName) + .collect(Collectors.toList()); } /** @@ -98,7 +135,22 @@ public class SystemUserServiceImpl extends ServiceImpl getUserRoleCodes(Long userId) { - return baseMapper.selectUserRoleCodes(userId); + // 先获取用户角色ID列表 + List roleIds = getUserRoleIds(userId); + if (roleIds.isEmpty()) { + return new ArrayList<>(); + } + + // 再查询角色编码 + List roles = systemRoleService.list(new LambdaQueryWrapper() + .in(SystemRole::getId, roleIds) + .eq(SystemRole::getStatus, 0) + .eq(SystemRole::getDeleted, false)); + + return roles.stream() + .map(SystemRole::getCode) + .collect(Collectors.toList()); } } \ No newline at end of file diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/application.yaml b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/application.yaml index 77a4ec5..1c054f6 100644 --- a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/application.yaml +++ b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/application.yaml @@ -1,5 +1,5 @@ server: - port: 48082 + port: 48083 spring: application: name: sso-server diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg1.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg1.png index c481457..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg1.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg1.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg2.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg2.png index bf8fb38..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg2.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg2.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg3.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg3.png index f871d3d..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg3.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg3.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg4.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg4.png index 2e3d871..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg4.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg4.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg5.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg5.png index fe383b7..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg5.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg5.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg6.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg6.png index 5024ceb..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg6.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg6.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg7.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg7.png index efe76f8..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg7.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg7.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg8.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg8.png index 2727aa3..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg8.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg8.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg9.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg9.png index 4463aa2..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg9.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/original/bg9.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/1.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/1.png index ef11324..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/1.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/1.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png index 297e44c..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png index d9b1da8..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png index 07e7313..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png index 82c3dd9..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png index 0b9a866..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png index 86b0d1c..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png index e90a6e2..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png index a82cbc7..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png index d3f3cfd..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png index eb2855b..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png index 3cb5ce1..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png index 384d354..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/2.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/2.png index baf3f06..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/2.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/2.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/3.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/3.png index ccaf617..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/3.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/jigsaw/slidingBlock/3.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg1.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg1.png index 14e7345..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg1.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg1.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg10.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg10.png index 1ea1d6d..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg10.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg10.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg2.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg2.png index 0edb329..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg2.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg2.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg3.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg3.png index 9167996..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg3.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg3.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg4.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg4.png index e8e8e6c..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg4.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg4.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg5.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg5.png index 66a3181..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg5.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg5.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg6.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg6.png index 9b0f5d8..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg6.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg6.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg7.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg7.png index db41c74..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg7.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg7.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg8.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg8.png index 3496813..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg8.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg8.png differ diff --git a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg9.png b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg9.png index 4e7b477..e69de29 100644 Binary files a/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg9.png and b/tashow-module/tashow-module-sso/tashow-module-sso-biz/src/main/resources/images/pic-click/bg9.png differ diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/controller/RoleController.java b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/controller/RoleController.java index 4e24d9b..7c1ca7a 100644 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/controller/RoleController.java +++ b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/controller/RoleController.java @@ -6,6 +6,7 @@ import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.util.SaResult; import com.tashow.cloud.model.SystemRole; import com.tashow.cloud.service.SystemRoleService; +import jakarta.annotation.security.PermitAll; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -159,10 +160,10 @@ public class RoleController { } /** - * 获取启用状态的角色列表（可用于下拉选择） + * 获取启用状态的角色列表 */ @GetMapping("/options") - @SaIgnore + @PermitAll public SaResult getRoleOptions() { try { List roles = roleService.getRolesByStatus(0); // 0表示正常状态 diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SaTokenConfigure.java b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SaTokenConfigure.java index 269176f..87695d8 100644 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SaTokenConfigure.java +++ b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SaTokenConfigure.java @@ -1,8 +1,6 @@ package com.tashow.cloud.tashowmoduleuserbiz.security.config; - import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; -import cn.dev33.satoken.sso.SaSsoProcessor; import cn.dev33.satoken.stp.StpUtil; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -11,34 +9,15 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * Sa-Token 配置类 */ -@Configuration +//@Configuration public class SaTokenConfigure implements WebMvcConfigurer { - /** +/* *//** * 注册Sa-Token拦截器，打开注解式鉴权功能 - */ + *//* @Override public void addInterceptors(InterceptorRegistry registry) { - // 注册路由拦截器，自定义认证规则 - registry.addInterceptor(new SaInterceptor(handler -> { - // 登录认证 -- 排除登录接口外，其他接口需要登录才能访问 - SaRouter.match("/**") - .notMatch("/user/doLogin") - .notMatch("/sso/*") - .notMatch("/oauth2/*") - .check(r -> StpUtil.checkLogin()); - })).addPathPatterns("/**"); - } - - /** - * SSO-Client端：处理所有SSO相关请求 - * 配置此函数后，可在客户端端通过以下方式完成单点登录功能： - * http://{host}:{port}/sso/login —— Client端登录地址，接受参数：back=登录后的跳转地址 - * http://{host}:{port}/sso/logout —— Client端单点注销地址（isSlo=true时打开），接受参数：back=注销后的跳转地址 - * http://{host}:{port}/sso/logoutCall —— Client端单点注销回调地址（isSlo=true时打开），此接口为框架回调，开发者无需关心 - */ - public void ssoClientDister() { - // 处理SSO相关请求 - SaSsoProcessor.instance.clientDister(); - } -} \ No newline at end of file + // 注册 Sa-Token 拦截器，打开注解式鉴权功能 + registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**"); + }*/ +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SecurityConfiguration.java b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SecurityConfiguration.java index 099c65e..1e779fc 100644 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SecurityConfiguration.java +++ b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/tashowmoduleuserbiz/security/config/SecurityConfiguration.java @@ -25,7 +25,7 @@ public class SecurityConfiguration { .requestMatchers("/webjars/**").permitAll() .requestMatchers("/swagger-ui").permitAll() .requestMatchers("/swagger-ui/**").permitAll() - ; + .requestMatchers("/test").permitAll() ; // Druid 监控 registry.requestMatchers("/druid/**").permitAll(); // Spring Boot Actuator 的安全配置 diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/convert/RoleConvert.java b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/convert/RoleConvert.java deleted file mode 100644 index 9eda50a..0000000 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/convert/RoleConvert.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.tashow.cloud.user.convert; - -import com.tashow.cloud.user.model.Role; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 角色对象转换器 - */ -@Mapper -public interface RoleConvert { - - RoleConvert INSTANCE = Mappers.getMapper(RoleConvert.class); - - /** - * 将角色列表转换为角色ID列表 - * - * @param roles 角色列表 - * @return 角色ID列表 - */ - default List convertToRoleIds(List roles) { - if (roles == null || roles.isEmpty()) { - return Collections.emptyList(); - } - return roles.stream() - .map(Role::getId) - .collect(Collectors.toList()); - } - - /** - * 将角色列表转换为角色名称列表 - * - * @param roles 角色列表 - * @return 角色名称列表 - */ - default List convertToRoleNames(List roles) { - if (roles == null || roles.isEmpty()) { - return Collections.emptyList(); - } - return roles.stream() - .map(Role::getName) - .collect(Collectors.toList()); - } - - /** - * 将角色列表转换为角色编码列表 - * - * @param roles 角色列表 - * @return 角色编码列表 - */ - default List convertToRoleCodes(List roles) { - if (roles == null || roles.isEmpty()) { - return Collections.emptyList(); - } - return roles.stream() - .map(Role::getCode) - .collect(Collectors.toList()); - } -} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/convert/UserConvert.java b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/convert/UserConvert.java deleted file mode 100644 index 4d85357..0000000 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/convert/UserConvert.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.tashow.cloud.user.convert; - -import com.tashow.cloud.user.dto.UserCreateReqDTO; -import com.tashow.cloud.user.dto.UserRegisterReqDTO; -import com.tashow.cloud.user.dto.UserRespDTO; -import com.tashow.cloud.user.dto.UserUpdateReqDTO; -import com.tashow.cloud.user.model.User; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.factory.Mappers; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 用户对象转换器 - */ -@Mapper -public interface UserConvert { - - UserConvert INSTANCE = Mappers.getMapper(UserConvert.class); - - /** - * 用户创建请求DTO转实体 - */ - @Mapping(target = "roles", ignore = true) - @Mapping(target = "createTime", ignore = true) - @Mapping(target = "updateTime", ignore = true) - @Mapping(target = "loginDate", ignore = true) - @Mapping(target = "deleted", ignore = true) - @Mapping(target = "loginIp", ignore = true) - @Mapping(target = "postIds", expression = "java(postIdsToString(bean.getPostIds()))") - User convert(UserCreateReqDTO bean); - - /** - * 用户更新请求DTO转实体 - */ - @Mapping(target = "roles", ignore = true) - @Mapping(target = "username", ignore = true) - @Mapping(target = "password", ignore = true) - @Mapping(target = "createTime", ignore = true) - @Mapping(target = "updateTime", ignore = true) - @Mapping(target = "loginDate", ignore = true) - @Mapping(target = "deleted", ignore = true) - @Mapping(target = "loginIp", ignore = true) - @Mapping(target = "postIds", expression = "java(postIdsToString(bean.getPostIds()))") - User convert(UserUpdateReqDTO bean); - - /** - * 用户注册请求DTO转实体 - */ - @Mapping(target = "roles", ignore = true) - @Mapping(target = "id", ignore = true) - @Mapping(target = "createTime", ignore = true) - @Mapping(target = "updateTime", ignore = true) - @Mapping(target = "loginDate", ignore = true) - @Mapping(target = "deleted", ignore = true) - @Mapping(target = "deptId", ignore = true) - @Mapping(target = "postIds", ignore = true) - @Mapping(target = "sex", ignore = true) - @Mapping(target = "creator", ignore = true) - @Mapping(target = "updater", ignore = true) - @Mapping(target = "tenantId", ignore = true) - @Mapping(target = "remark", ignore = true) - @Mapping(target = "status", constant = "0") - User convert(UserRegisterReqDTO bean); - - /** - * 用户实体转响应DTO - */ - @Mapping(target = "sexName", expression = "java(getSexName(bean.getSex()))") - @Mapping(target = "statusName", expression = "java(getStatusName(bean.getStatus()))") - @Mapping(target = "roleIds", ignore = true) - @Mapping(target = "roleNames", ignore = true) - @Mapping(target = "roleCodes", ignore = true) - @Mapping(target = "postIds", expression = "java(stringToPostIds(bean.getPostIds()))") - @Mapping(target = "postNames", ignore = true) - @Mapping(target = "deptName", ignore = true) - UserRespDTO convert(User bean); - - /** - * 用户实体列表转响应DTO列表 - */ - List convertList(List list); - - /** - * 岗位ID列表转字符串 - */ - default String postIdsToString(List postIds) { - if (postIds == null || postIds.isEmpty()) { - return null; - } - return postIds.stream() - .map(String::valueOf) - .collect(Collectors.joining(",")); - } - - /** - * 字符串转岗位ID列表 - */ - default List stringToPostIds(String postIds) { - if (postIds == null || postIds.isEmpty()) { - return java.util.Collections.emptyList(); - } - return java.util.Arrays.stream(postIds.split(",")) - .map(Long::valueOf) - .collect(Collectors.toList()); - } - - /** - * 获取性别名称 - */ - default String getSexName(Integer sex) { - if (sex == null) { - return null; - } - return switch (sex) { - case 1 -> "男"; - case 2 -> "女"; - default -> "未知"; - }; - } - - /** - * 获取状态名称 - */ - default String getStatusName(Integer status) { - if (status == null) { - return null; - } - return switch (status) { - case 0 -> "正常"; - case 1 -> "停用"; - default -> "未知"; - }; - } -} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/package-info.java b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/package-info.java deleted file mode 100644 index 19372c4..0000000 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/java/com/tashow/cloud/user/package-info.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * 用户中心模块业务层实现 - * - *

此模块包含以下主要组件： - *

    - *
  • controller - 控制器层，负责接收和响应HTTP请求
    • - *
  • service - 服务实现层，实现业务逻辑
    • - *
  • mapper - 数据访问层，与数据库交互
    • - *
  • convert - 对象转换层，负责DTO和实体间的转换
    • - *
  • config - 配置类
    • - *
- */ -package com.tashow.cloud.user; \ No newline at end of file diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemRoleMenuMapper.xml b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemRoleMenuMapper.xml deleted file mode 100644 index 24b0b0d..0000000 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemRoleMenuMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - UPDATE system_role_menu - SET deleted = 1, - update_time = NOW() - WHERE role_id = #{roleId} - AND deleted = 0 - - - - INSERT INTO system_role_menu (role_id, menu_id, creator, create_time, updater, update_time, deleted, tenant_id) - VALUES - - (#{roleId}, #{menuId}, #{creator}, NOW(), #{creator}, NOW(), 0, 0) - - - - \ No newline at end of file diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemUserPostMapper.xml b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemUserPostMapper.xml deleted file mode 100644 index ddf9410..0000000 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemUserPostMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - UPDATE system_user_post - SET deleted = 1, - update_time = NOW() - WHERE user_id = #{userId} - AND deleted = 0 - - - - - INSERT INTO system_user_post (user_id, post_id, creator, create_time, updater, update_time, deleted, tenant_id) - VALUES - - (#{userId}, #{postId}, #{creator}, NOW(), #{creator}, NOW(), 0, 0) - - - - \ No newline at end of file diff --git a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemUserRoleMapper.xml b/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemUserRoleMapper.xml deleted file mode 100644 index e40d60f..0000000 --- a/tashow-module/tashow-module-user/tashow-module-user-biz/src/main/resources/mapper/SystemUserRoleMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - UPDATE system_user_role - SET deleted = 1, - update_time = NOW() - WHERE user_id = #{userId} - AND deleted = 0 - - - - - INSERT INTO system_user_role (user_id, role_id, creator, create_time, updater, update_time, deleted, tenant_id) - VALUES - - (#{userId}, #{roleId}, #{creator}, NOW(), #{creator}, NOW(), 0, 0) - - - - \ No newline at end of file