diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/security/LoginRequest.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/security/LoginRequest.java similarity index 92% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/security/LoginRequest.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/security/LoginRequest.java index b40b7e0..ec90031 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/security/LoginRequest.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/security/LoginRequest.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.security; +package com.spring.bean.dto.security; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/DeptDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/DeptDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/DeptDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/DeptDto.java index 49658b6..c563efb 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/DeptDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/DeptDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailTemplateDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailTemplateDto.java index 0e17de4..6883322 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailUsersDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailUsersDto.java index f4597d5..821b9ac 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailUsersDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/FilesDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesDto.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/FilesDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesDto.java index 6a8cd3c..fc6fc92 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/FilesDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesPartDetailDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesPartDetailDto.java index 692d6ce..de7d2bb 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesPartDetailDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/I18nDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/I18nDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nDto.java index 60d6cc0..f835450 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/I18nDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nTypeDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nTypeDto.java index 5cc5f60..e87c8eb 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MenuIconDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MenuIconDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/MenuIconDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/MenuIconDto.java index ce4018d..36b1b82 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MenuIconDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MenuIconDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageDto.java index 5dc0928..a789e4c 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageReceivedDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageReceivedDto.java index 71203b6..cd6cb07 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageReceivedDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageTypeDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageTypeDto.java index 68ac9fa..c9ffc51 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/PermissionDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/PermissionDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/PermissionDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/PermissionDto.java index d02098b..d10cd1c 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/PermissionDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/PermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RoleDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RoleDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/RoleDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/RoleDto.java index d5dbfbf..7fd80d0 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RoleDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RolePermissionDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/RolePermissionDto.java index eaf7e87..7df964b 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RolePermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RouterDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/RouterDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterDto.java index 7abf946..8b79826 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RouterDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterRoleDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterRoleDto.java index ad0b8fe..7a40ce0 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserDeptDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDeptDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserDeptDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDeptDto.java index b46f599..650c047 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserDeptDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDeptDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDto.java index aeaee41..b5698e1 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserLoginDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserLoginDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserLoginDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserLoginDto.java index 7ef5463..9d53c9e 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserLoginDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserLoginDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserRoleDto.java b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserRoleDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserRoleDto.java rename to spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserRoleDto.java index 581974f..9a626fc 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/dto/system/UserRoleDto.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/DeptEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/DeptEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/DeptEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/DeptEntity.java index 6d89550..566b108 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/DeptEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/DeptEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailTemplateEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/EmailTemplateEntity.java index 1dcdc85..37602ab 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailTemplateEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/EmailUsersEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailUsersEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/EmailUsersEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/EmailUsersEntity.java index 1eccbad..850ec0b 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/EmailUsersEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailUsersEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/FilesEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesEntity.java similarity index 99% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/FilesEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/FilesEntity.java index 83cad16..6b12c6d 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/FilesEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesPartDetailEntity.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/FilesPartDetailEntity.java index 699c373..81b0166 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesPartDetailEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/I18nEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/I18nEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/I18nEntity.java index d72507a..77f61a2 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/I18nEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/I18nTypeEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nTypeEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/I18nTypeEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/I18nTypeEntity.java index 471791a..855b05e 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/I18nTypeEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nTypeEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/MenuIconEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/MenuIconEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/MenuIconEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/MenuIconEntity.java index 3db7391..2ec25d0 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/MenuIconEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/MenuIconEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/MessageEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageEntity.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/MessageEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/MessageEntity.java index da85048..3e48ce3 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/MessageEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageReceivedEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/MessageReceivedEntity.java index e14457c..852d861 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageReceivedEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/MessageTypeEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageTypeEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/MessageTypeEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/MessageTypeEntity.java index c4fb873..d2ec90a 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/MessageTypeEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageTypeEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/PermissionEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/PermissionEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/PermissionEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/PermissionEntity.java index 3e65088..b0523cd 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/PermissionEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/PermissionEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/RoleEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/RoleEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/RoleEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/RoleEntity.java index 20eafb8..fca3ce6 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/RoleEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/RoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/RolePermissionEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/RolePermissionEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/RolePermissionEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/RolePermissionEntity.java index 4774931..ff77252 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/RolePermissionEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/RolePermissionEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/RouterEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/RouterEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/RouterEntity.java index 86e4a42..18426a2 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/RouterEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/RouterRoleEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterRoleEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/RouterRoleEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/RouterRoleEntity.java index 6b3a691..cab3141 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/RouterRoleEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterRoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserDeptEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserDeptEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/UserDeptEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/UserDeptEntity.java index aef437e..4bc2f75 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserDeptEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserDeptEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserEntity.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/UserEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/UserEntity.java index c03f325..e0fd7cc 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserLoginEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserLoginEntity.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/UserLoginEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/UserLoginEntity.java index 6fde138..37dc41d 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserLoginEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserLoginEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserRoleEntity.java b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserRoleEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/entity/UserRoleEntity.java rename to spring-security/step-1/src/main/java/com/spring/bean/entity/UserRoleEntity.java index d66f931..cb830e4 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/entity/UserRoleEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/entity/UserRoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/DeptVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/DeptVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/DeptVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/DeptVo.java index dafe312..eeadc9e 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/DeptVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/DeptVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/EmailTemplateVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailTemplateVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/EmailTemplateVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/EmailTemplateVo.java index e006209..fd82826 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/EmailTemplateVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/EmailUsersVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailUsersVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/EmailUsersVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/EmailUsersVo.java index e4d6f3f..06e8460 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/EmailUsersVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailUsersVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesPartDetailVo.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/FilesPartDetailVo.java index e8368ea..aa02288 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesPartDetailVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/FilesVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesVo.java similarity index 99% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/FilesVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/FilesVo.java index 3e8faf6..cb48a03 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/FilesVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/I18nTypeVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nTypeVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/I18nTypeVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/I18nTypeVo.java index 75ba159..abe247e 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/I18nTypeVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nTypeVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/I18nVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/I18nVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/I18nVo.java index dd42bdd..cd4760c 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/I18nVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/MenuIconVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/MenuIconVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/MenuIconVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/MenuIconVo.java index 0ffdbe4..a5a8def 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/MenuIconVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/MenuIconVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/MessageReceivedVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageReceivedVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/MessageReceivedVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/MessageReceivedVo.java index ebbcec2..e8db89c 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/MessageReceivedVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageReceivedVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/MessageTypeVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageTypeVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/MessageTypeVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/MessageTypeVo.java index 7291755..4cb38c0 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/MessageTypeVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageTypeVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/MessageVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageVo.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/MessageVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/MessageVo.java index ebe4f4e..01dbbaf 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/MessageVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/PermissionVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/PermissionVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/PermissionVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/PermissionVo.java index e468819..d1e24b5 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/PermissionVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/PermissionVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/RolePermissionVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/RolePermissionVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/RolePermissionVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/RolePermissionVo.java index fd8f610..2dda71f 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/RolePermissionVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/RolePermissionVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/RoleVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/RoleVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/RoleVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/RoleVo.java index 99f97bd..0ef40e0 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/RoleVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/RoleVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/RouterRoleVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterRoleVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/RouterRoleVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/RouterRoleVo.java index ab3dc81..5e29f5e 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/RouterRoleVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterRoleVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/RouterVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterVo.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/RouterVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/RouterVo.java index 50e2db4..90d72bc 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/RouterVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserDeptVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserDeptVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/UserDeptVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/UserDeptVo.java index 9938d1a..c1a06e0 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserDeptVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserDeptVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserLoginVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserLoginVo.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/UserLoginVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/UserLoginVo.java index c3a16a3..495f6cc 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserLoginVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserLoginVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserRoleVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserRoleVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/UserRoleVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/UserRoleVo.java index 2b6b87a..543855f 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserRoleVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserRoleVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserVo.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserVo.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/UserVo.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/UserVo.java index ec8eab2..8dc3a88 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/UserVo.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/UserVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/result/PageResult.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/result/PageResult.java similarity index 95% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/result/PageResult.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/result/PageResult.java index d192789..2a63921 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/result/PageResult.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo.result; +package com.spring.bean.vo.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/result/Result.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/result/Result.java similarity index 99% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/result/Result.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/result/Result.java index 49a353d..546db04 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/result/Result.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/result/Result.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo.result; +package com.spring.bean.vo.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/spring-security/step-1/src/main/java/com/spring/domain/vo/result/ResultCodeEnum.java b/spring-security/step-1/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/domain/vo/result/ResultCodeEnum.java rename to spring-security/step-1/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java index af3ffaf..7ab3b98 100644 --- a/spring-security/step-1/src/main/java/com/spring/domain/vo/result/ResultCodeEnum.java +++ b/spring-security/step-1/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo.result; +package com.spring.bean.vo.result; import lombok.Getter; diff --git a/spring-security/step-1/src/main/java/com/spring/config/Knife4jConfig.java b/spring-security/step-1/src/main/java/com/spring/config/Knife4jConfig.java index e41e07e..10167f2 100644 --- a/spring-security/step-1/src/main/java/com/spring/config/Knife4jConfig.java +++ b/spring-security/step-1/src/main/java/com/spring/config/Knife4jConfig.java @@ -43,8 +43,18 @@ public class Knife4jConfig { } @Bean - public GroupedOpenApi system() { - return GroupedOpenApi.builder().group("系统请求接口").pathsToMatch("/api/system/**").build(); + public GroupedOpenApi dept() { + return GroupedOpenApi.builder().group("部门请求接口").pathsToMatch("/api/dept/**").build(); + } + + @Bean + public GroupedOpenApi normal() { + return GroupedOpenApi.builder().group("访客请求接口").pathsToMatch("/api/normal/**").build(); + } + + @Bean + public GroupedOpenApi user() { + return GroupedOpenApi.builder().group("用户请求接口").pathsToMatch("/api/user/**").build(); } @Bean diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/EmailTemplateController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailTemplateController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/EmailTemplateController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailTemplateController.java index 08dabb9..e6a4b94 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/EmailTemplateController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailTemplateController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.EmailTemplateService; +import com.spring.bean.dto.system.EmailTemplateDto; +import com.spring.bean.entity.EmailTemplateEntity; +import com.spring.bean.vo.EmailTemplateVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.EmailTemplateService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "邮件模板表", description = "邮件模板表相关接口") @RestController -@RequestMapping("/api/system/email-template") +@RequestMapping("/api/normal/email-template") @RequiredArgsConstructor public class EmailTemplateController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/EmailUsersController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailUsersController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/EmailUsersController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailUsersController.java index e076d6d..562f8ac 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/EmailUsersController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailUsersController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.EmailUsersService; +import com.spring.bean.dto.system.EmailUsersDto; +import com.spring.bean.entity.EmailUsersEntity; +import com.spring.bean.vo.EmailUsersVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.EmailUsersService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,7 +28,7 @@ import java.util.List; */ @Tag(name = "邮箱发送表", description = "邮箱发送表相关接口") @RestController -@RequestMapping("/api/system/email-users") +@RequestMapping("/api/normal/email-users") @RequiredArgsConstructor public class EmailUsersController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/FilesController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/FilesController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesController.java index 842e86e..1626584 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/FilesController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.FilesService; +import com.spring.bean.dto.system.FilesDto; +import com.spring.bean.entity.FilesEntity; +import com.spring.bean.vo.FilesVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.FilesService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "文件记录", description = "文件记录相关接口") @RestController -@RequestMapping("/api/system/files") +@RequestMapping("/api/normal/files") @RequiredArgsConstructor public class FilesController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/FilesPartDetailController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesPartDetailController.java similarity index 86% rename from spring-security/step-1/src/main/java/com/spring/controller/system/FilesPartDetailController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesPartDetailController.java index 1e12ffe..16c4bcb 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/FilesPartDetailController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesPartDetailController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.FilesPartDetailService; +import com.spring.bean.dto.system.FilesPartDetailDto; +import com.spring.bean.entity.FilesPartDetailEntity; +import com.spring.bean.vo.FilesPartDetailVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.FilesPartDetailService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "文件分片信息表，仅在手动分片上传时使用", description = "文件分片信息表，仅在手动分片上传时使用相关接口") @RestController -@RequestMapping("/api/system/files-part-detail") +@RequestMapping("/api/normal/files-part-detail") @RequiredArgsConstructor public class FilesPartDetailController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/I18nController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/I18nController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nController.java index c930ae3..fe00c6a 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/I18nController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.I18nService; +import com.spring.bean.dto.system.I18nDto; +import com.spring.bean.entity.I18nEntity; +import com.spring.bean.vo.I18nVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.I18nService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "多语言表", description = "多语言表相关接口") @RestController -@RequestMapping("/api/system/i18n") +@RequestMapping("/api/normal/i18n") @RequiredArgsConstructor public class I18nController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/I18nTypeController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nTypeController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/I18nTypeController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nTypeController.java index 3a680a1..d2caa23 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/I18nTypeController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nTypeController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.I18nTypeService; +import com.spring.bean.dto.system.I18nTypeDto; +import com.spring.bean.entity.I18nTypeEntity; +import com.spring.bean.vo.I18nTypeVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "多语言类型表", description = "多语言类型表相关接口") @RestController -@RequestMapping("/api/system/i18n-type") +@RequestMapping("/api/normal/i18n-type") @RequiredArgsConstructor public class I18nTypeController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/MenuIconController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/MenuIconController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/system/MenuIconController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/MenuIconController.java index e6ae140..e89a3f8 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/MenuIconController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/MenuIconController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MenuIconService; +import com.spring.bean.dto.system.MenuIconDto; +import com.spring.bean.entity.MenuIconEntity; +import com.spring.bean.vo.MenuIconVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.MenuIconService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "图标code不能重复", description = "图标code不能重复相关接口") @RestController -@RequestMapping("/api/system/menu-icon") +@RequestMapping("/api/normal/menu-icon") @RequiredArgsConstructor public class MenuIconController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/PermissionController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/PermissionController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/PermissionController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/PermissionController.java index 530aea9..d708d13 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/PermissionController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/PermissionController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.PermissionService; +import com.spring.bean.dto.system.PermissionDto; +import com.spring.bean.entity.PermissionEntity; +import com.spring.bean.vo.PermissionVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.PermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统权限表", description = "系统权限表相关接口") @RestController -@RequestMapping("/api/system/permission") +@RequestMapping("/api/normal/permission") @RequiredArgsConstructor public class PermissionController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/RoleController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RoleController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/RoleController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RoleController.java index df4b36d..2c79165 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/RoleController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RoleService; +import com.spring.bean.dto.system.RoleDto; +import com.spring.bean.entity.RoleEntity; +import com.spring.bean.vo.RoleVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.RoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统角色表", description = "系统角色表相关接口") @RestController -@RequestMapping("/api/system/role") +@RequestMapping("/api/normal/role") @RequiredArgsConstructor public class RoleController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/RolePermissionController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RolePermissionController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/RolePermissionController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RolePermissionController.java index 9c0af54..2865df0 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/RolePermissionController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RolePermissionController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RolePermissionService; +import com.spring.bean.dto.system.RolePermissionDto; +import com.spring.bean.entity.RolePermissionEntity; +import com.spring.bean.vo.RolePermissionVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.RolePermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统角色权限表", description = "系统角色权限表相关接口") @RestController -@RequestMapping("/api/system/role-permission") +@RequestMapping("/api/normal/role-permission") @RequiredArgsConstructor public class RolePermissionController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/RouterController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/RouterController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterController.java index aec7d14..051ea1c 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/RouterController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RouterService; +import com.spring.bean.dto.system.RouterDto; +import com.spring.bean.entity.RouterEntity; +import com.spring.bean.vo.RouterVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.RouterService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统菜单表", description = "系统菜单表相关接口") @RestController -@RequestMapping("/api/system/router") +@RequestMapping("/api/normal/router") @RequiredArgsConstructor public class RouterController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/RouterRoleController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterRoleController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/system/RouterRoleController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterRoleController.java index 38b4630..000c1a1 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/RouterRoleController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterRoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RouterRoleService; +import com.spring.bean.dto.system.RouterRoleDto; +import com.spring.bean.entity.RouterRoleEntity; +import com.spring.bean.vo.RouterRoleVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.RouterRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统路由角色关系表", description = "系统路由角色关系表相关接口") @RestController -@RequestMapping("/api/system/router-role") +@RequestMapping("/api/normal/router-role") @RequiredArgsConstructor public class RouterRoleController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/DeptController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/dept/DeptController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/DeptController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/dept/DeptController.java index 94131c1..b535775 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/DeptController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/dept/DeptController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.dept; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.DeptService; +import com.spring.bean.dto.system.DeptDto; +import com.spring.bean.entity.DeptEntity; +import com.spring.bean.vo.DeptVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.DeptService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "部门表", description = "部门表相关接口") @RestController -@RequestMapping("/api/system/dept") +@RequestMapping("/api/dept") @RequiredArgsConstructor public class DeptController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/MessageController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/MessageController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageController.java index 28e93e8..b77dabb 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/MessageController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.message; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MessageService; +import com.spring.bean.dto.system.MessageDto; +import com.spring.bean.entity.MessageEntity; +import com.spring.bean.vo.MessageVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.MessageService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统消息", description = "系统消息相关接口") @RestController -@RequestMapping("/api/system/message") +@RequestMapping("/api/message") @RequiredArgsConstructor public class MessageController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/MessageReceivedController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageReceivedController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/MessageReceivedController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageReceivedController.java index 644f3ca..fe0540b 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/MessageReceivedController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageReceivedController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.message; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MessageReceivedService; +import com.spring.bean.dto.system.MessageReceivedDto; +import com.spring.bean.entity.MessageReceivedEntity; +import com.spring.bean.vo.MessageReceivedVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.MessageReceivedService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "消息接受接口", description = "消息接受相关接口") @RestController -@RequestMapping("/api/system/message-received") +@RequestMapping("/api/message/message-received") @RequiredArgsConstructor public class MessageReceivedController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/MessageTypeController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageTypeController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/MessageTypeController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageTypeController.java index 19e8453..75b7dfe 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/MessageTypeController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageTypeController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.message; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MessageTypeService; +import com.spring.bean.dto.system.MessageTypeDto; +import com.spring.bean.entity.MessageTypeEntity; +import com.spring.bean.vo.MessageTypeVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.MessageTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统消息类型", description = "系统消息类型相关接口") @RestController -@RequestMapping("/api/system/message-type") +@RequestMapping("/api/message/message-type") @RequiredArgsConstructor public class MessageTypeController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/UserController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/UserController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserController.java index baa4c6a..1040e02 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/UserController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserService; +import com.spring.bean.dto.system.UserDto; +import com.spring.bean.entity.UserEntity; +import com.spring.bean.vo.UserVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "用户信息", description = "用户信息相关接口") @RestController -@RequestMapping("/api/system/user") +@RequestMapping("/api/user") @RequiredArgsConstructor public class UserController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/UserDeptController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserDeptController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/system/UserDeptController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserDeptController.java index 12ce347..6eb9e28 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/UserDeptController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserDeptController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserDeptService; +import com.spring.bean.dto.system.UserDeptDto; +import com.spring.bean.entity.UserDeptEntity; +import com.spring.bean.vo.UserDeptVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.UserDeptService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "部门用户关系表", description = "部门用户关系表相关接口") @RestController -@RequestMapping("/api/system/user-dept") +@RequestMapping("/api/user/user-dept") @RequiredArgsConstructor public class UserDeptController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/UserLoginController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserLoginController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/system/UserLoginController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserLoginController.java index 3504d8b..82436a6 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/UserLoginController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserLoginController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserLoginService; +import com.spring.bean.dto.system.UserLoginDto; +import com.spring.bean.entity.UserLoginEntity; +import com.spring.bean.vo.UserLoginVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.UserLoginService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "用户登录日志", description = "用户登录日志相关接口") @RestController -@RequestMapping("/api/system/user-login") +@RequestMapping("/api/user/user-login") @RequiredArgsConstructor public class UserLoginController { diff --git a/spring-security/step-1/src/main/java/com/spring/controller/system/UserRoleController.java b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserRoleController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/system/UserRoleController.java rename to spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserRoleController.java index 00f049b..656035f 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/system/UserRoleController.java +++ b/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserRoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserRoleService; +import com.spring.bean.dto.system.UserRoleDto; +import com.spring.bean.entity.UserRoleEntity; +import com.spring.bean.vo.UserRoleVo; +import com.spring.bean.vo.result.PageResult; +import com.spring.bean.vo.result.Result; +import com.spring.bean.vo.result.ResultCodeEnum; +import com.spring.service.sample.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,7 +27,7 @@ import java.util.List; */ @Tag(name = "系统用户角色关系表", description = "系统用户角色关系表相关接口") @RestController -@RequestMapping("/api/system/user-role") +@RequestMapping("/api/user/user-role") @RequiredArgsConstructor public class UserRoleController { diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/DeptMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/DeptMapper.java index 8bebd64..45e5d21 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/DeptMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/DeptMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; +import com.spring.bean.dto.system.DeptDto; +import com.spring.bean.entity.DeptEntity; +import com.spring.bean.vo.DeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/EmailTemplateMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/EmailTemplateMapper.java index aa65ff7..398847a 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/EmailTemplateMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/EmailTemplateMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; +import com.spring.bean.dto.system.EmailTemplateDto; +import com.spring.bean.entity.EmailTemplateEntity; +import com.spring.bean.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/EmailUsersMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/EmailUsersMapper.java index 646f602..e58e756 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/EmailUsersMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/EmailUsersMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; +import com.spring.bean.dto.system.EmailUsersDto; +import com.spring.bean.entity.EmailUsersEntity; +import com.spring.bean.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/FilesMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/FilesMapper.java index b1ee1f9..49af869 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/FilesMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/FilesMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; +import com.spring.bean.dto.system.FilesDto; +import com.spring.bean.entity.FilesEntity; +import com.spring.bean.vo.FilesVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/FilesPartDetailMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/FilesPartDetailMapper.java index d533b3d..46c8993 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/FilesPartDetailMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/FilesPartDetailMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; +import com.spring.bean.dto.system.FilesPartDetailDto; +import com.spring.bean.entity.FilesPartDetailEntity; +import com.spring.bean.vo.FilesPartDetailVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/I18nMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/I18nMapper.java index e0bd3a9..3e6c17f 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/I18nMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/I18nMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; +import com.spring.bean.dto.system.I18nDto; +import com.spring.bean.entity.I18nEntity; +import com.spring.bean.vo.I18nVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/I18nTypeMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/I18nTypeMapper.java index fd6a9fd..70fbb86 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/I18nTypeMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/I18nTypeMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; +import com.spring.bean.dto.system.I18nTypeDto; +import com.spring.bean.entity.I18nTypeEntity; +import com.spring.bean.vo.I18nTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MenuIconMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/MenuIconMapper.java index fe4d7be..451e07e 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MenuIconMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/MenuIconMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; +import com.spring.bean.dto.system.MenuIconDto; +import com.spring.bean.entity.MenuIconEntity; +import com.spring.bean.vo.MenuIconVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MessageMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/MessageMapper.java index 309362d..0d30636 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MessageMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/MessageMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; +import com.spring.bean.dto.system.MessageDto; +import com.spring.bean.entity.MessageEntity; +import com.spring.bean.vo.MessageVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MessageReceivedMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/MessageReceivedMapper.java index 2b563bc..e4f3e71 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MessageReceivedMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/MessageReceivedMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; +import com.spring.bean.dto.system.MessageReceivedDto; +import com.spring.bean.entity.MessageReceivedEntity; +import com.spring.bean.vo.MessageReceivedVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MessageTypeMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/MessageTypeMapper.java index 53d8180..16c0a56 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MessageTypeMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/MessageTypeMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; +import com.spring.bean.dto.system.MessageTypeDto; +import com.spring.bean.entity.MessageTypeEntity; +import com.spring.bean.vo.MessageTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/PermissionMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/PermissionMapper.java index 8d3ee4d..1b37581 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/PermissionMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/PermissionMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; +import com.spring.bean.dto.system.PermissionDto; +import com.spring.bean.entity.PermissionEntity; +import com.spring.bean.vo.PermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RoleMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/RoleMapper.java index b0f0602..ac73d9a 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RoleMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/RoleMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; +import com.spring.bean.dto.system.RoleDto; +import com.spring.bean.entity.RoleEntity; +import com.spring.bean.vo.RoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RolePermissionMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/RolePermissionMapper.java index 653cd97..3bb18e9 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RolePermissionMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/RolePermissionMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; +import com.spring.bean.dto.system.RolePermissionDto; +import com.spring.bean.entity.RolePermissionEntity; +import com.spring.bean.vo.RolePermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RouterMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/RouterMapper.java index 9272b87..c8a0011 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RouterMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/RouterMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; +import com.spring.bean.dto.system.RouterDto; +import com.spring.bean.entity.RouterEntity; +import com.spring.bean.vo.RouterVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RouterRoleMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/RouterRoleMapper.java index 35a1d6e..f1a3d4c 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RouterRoleMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/RouterRoleMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; +import com.spring.bean.dto.system.RouterRoleDto; +import com.spring.bean.entity.RouterRoleEntity; +import com.spring.bean.vo.RouterRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserDeptMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/UserDeptMapper.java index 2366d2f..f5e243e 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserDeptMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/UserDeptMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; +import com.spring.bean.dto.system.UserDeptDto; +import com.spring.bean.entity.UserDeptEntity; +import com.spring.bean.vo.UserDeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserLoginMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/UserLoginMapper.java index e43e0c7..8b1202f 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserLoginMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/UserLoginMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; +import com.spring.bean.dto.system.UserLoginDto; +import com.spring.bean.entity.UserLoginEntity; +import com.spring.bean.vo.UserLoginVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/UserMapper.java index 82f43ef..e6bdbd1 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/UserMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; +import com.spring.bean.dto.system.UserDto; +import com.spring.bean.entity.UserEntity; +import com.spring.bean.vo.UserVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserRoleMapper.java b/spring-security/step-1/src/main/java/com/spring/mapper/UserRoleMapper.java index 184b03b..394872c 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserRoleMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/mapper/UserRoleMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; +import com.spring.bean.dto.system.UserRoleDto; +import com.spring.bean.entity.UserRoleEntity; +import com.spring.bean.vo.UserRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/security/SecurityConfiguration.java b/spring-security/step-1/src/main/java/com/spring/security/config/SecurityConfiguration.java similarity index 90% rename from spring-security/step-1/src/main/java/com/spring/security/SecurityConfiguration.java rename to spring-security/step-1/src/main/java/com/spring/security/config/SecurityConfiguration.java index a4cd695..2ff213b 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/SecurityConfiguration.java +++ b/spring-security/step-1/src/main/java/com/spring/security/config/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package com.spring.security; +package com.spring.security.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -15,6 +15,7 @@ public class SecurityConfiguration { /** * 添加内存用户 + * 我们想要实现普通用户只能查看 /api/user * * @return {@link ConditionalOnMissingBean} */ @@ -24,9 +25,11 @@ public class SecurityConfiguration { // 使用注入的密码加密器进行密码加密 String generatedPassword = passwordEncoder.encode("123456"); - // 创建用户 + // 创建用户 权限为只读 UserDetails userDetails1 = User.withUsername("bunny").password(generatedPassword).roles("USER").authorities("read").build(); - UserDetails userDetails2 = User.withUsername("rabbit").password(generatedPassword).roles("USER").build(); + + // + UserDetails userDetails2 = User.withUsername("rabbit").password(generatedPassword).roles("USER").authorities("all").build(); UserDetails userDetails3 = User.withUsername("admin").password(generatedPassword).roles("ADMIN").authorities("all").build(); // 返回内存中的用户 diff --git a/spring-security/step-1/src/main/java/com/spring/security/SecurityWebConfiguration.java b/spring-security/step-1/src/main/java/com/spring/security/config/SecurityWebConfiguration.java similarity index 91% rename from spring-security/step-1/src/main/java/com/spring/security/SecurityWebConfiguration.java rename to spring-security/step-1/src/main/java/com/spring/security/config/SecurityWebConfiguration.java index 5cfc476..11bf0a8 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/SecurityWebConfiguration.java +++ b/spring-security/step-1/src/main/java/com/spring/security/config/SecurityWebConfiguration.java @@ -1,4 +1,4 @@ -package com.spring.security; +package com.spring.security.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -23,7 +23,8 @@ public class SecurityWebConfiguration { http.authorizeHttpRequests(authorizeRequests -> // 访问路径为 /api/** 时需要进行认证 authorizeRequests - .requestMatchers("/api/**").authenticated() + .requestMatchers("/api/system/**").hasRole("USER") + .requestMatchers("/api/**").hasAnyRole("ADMIN") .requestMatchers(permitAllUrls).permitAll() ) .formLogin(loginPage -> loginPage diff --git a/spring-security/step-1/src/main/java/com/spring/config/handler/SecurityAccessDeniedHandler.java b/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java similarity index 92% rename from spring-security/step-1/src/main/java/com/spring/config/handler/SecurityAccessDeniedHandler.java rename to spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java index dfbf1a6..661e686 100644 --- a/spring-security/step-1/src/main/java/com/spring/config/handler/SecurityAccessDeniedHandler.java +++ b/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ -package com.spring.config.handler; +package com.spring.security.handler; import com.alibaba.fastjson2.JSON; -import com.spring.domain.vo.result.Result; +import com.spring.bean.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/step-1/src/main/java/com/spring/config/handler/SecurityAuthenticationEntryPoint.java b/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java similarity index 92% rename from spring-security/step-1/src/main/java/com/spring/config/handler/SecurityAuthenticationEntryPoint.java rename to spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java index c10becd..7e48511 100644 --- a/spring-security/step-1/src/main/java/com/spring/config/handler/SecurityAuthenticationEntryPoint.java +++ b/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package com.spring.config.handler; +package com.spring.security.handler; import com.alibaba.fastjson2.JSON; -import com.spring.domain.vo.result.Result; +import com.spring.bean.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/step-1/src/main/java/com/spring/security/password/MD5PasswordEncoder.java b/spring-security/step-1/src/main/java/com/spring/security/password/MD5PasswordEncoder.java index d60e33a..1cab71c 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/password/MD5PasswordEncoder.java +++ b/spring-security/step-1/src/main/java/com/spring/security/password/MD5PasswordEncoder.java @@ -17,9 +17,8 @@ import java.util.HexFormat; *

Spring Security推荐使用BCrypt、PBKDF2、Argon2或Scrypt等自适应单向函数替代MD5。

* * @see PasswordEncoder - * @deprecated 此类仅用于遗留系统兼容，新系统应使用更安全的密码编码器 + * 一般仅用于遗留系统兼容，新系统应使用更安全的密码编码器 */ -@Deprecated public class MD5PasswordEncoder implements PasswordEncoder { @Override diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/DeptService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/DeptService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/system/DeptService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/DeptService.java index 5f29aae..e2f7f03 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/DeptService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/DeptService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.DeptDto; +import com.spring.bean.entity.DeptEntity; +import com.spring.bean.vo.DeptVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/EmailTemplateService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/EmailTemplateService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/EmailTemplateService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/EmailTemplateService.java index ae5344f..409a960 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/EmailTemplateService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/EmailTemplateService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.EmailTemplateDto; +import com.spring.bean.entity.EmailTemplateEntity; +import com.spring.bean.vo.EmailTemplateVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/EmailUsersService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/EmailUsersService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/EmailUsersService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/EmailUsersService.java index 0564d96..5b39286 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/EmailUsersService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/EmailUsersService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.EmailUsersDto; +import com.spring.bean.entity.EmailUsersEntity; +import com.spring.bean.vo.EmailUsersVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/FilesPartDetailService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/FilesPartDetailService.java similarity index 83% rename from spring-security/step-1/src/main/java/com/spring/service/system/FilesPartDetailService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/FilesPartDetailService.java index dfa83a1..4d3cdd6 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/FilesPartDetailService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/FilesPartDetailService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.FilesPartDetailDto; +import com.spring.bean.entity.FilesPartDetailEntity; +import com.spring.bean.vo.FilesPartDetailVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/FilesService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/FilesService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/system/FilesService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/FilesService.java index 8ab8193..a80c24d 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/FilesService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/FilesService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.FilesDto; +import com.spring.bean.entity.FilesEntity; +import com.spring.bean.vo.FilesVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/I18nService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/I18nService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/system/I18nService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/I18nService.java index 79ef7f5..d7c88eb 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/I18nService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/I18nService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.I18nDto; +import com.spring.bean.entity.I18nEntity; +import com.spring.bean.vo.I18nVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/I18nTypeService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/I18nTypeService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/I18nTypeService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/I18nTypeService.java index 9491d8c..4f46a5c 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/I18nTypeService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/I18nTypeService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.I18nTypeDto; +import com.spring.bean.entity.I18nTypeEntity; +import com.spring.bean.vo.I18nTypeVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/MenuIconService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/MenuIconService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/MenuIconService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/MenuIconService.java index 1f89acb..9bace8b 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/MenuIconService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/MenuIconService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MenuIconDto; +import com.spring.bean.entity.MenuIconEntity; +import com.spring.bean.vo.MenuIconVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/MessageReceivedService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/MessageReceivedService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/system/MessageReceivedService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/MessageReceivedService.java index 4cd6161..2b05b5c 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/MessageReceivedService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/MessageReceivedService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MessageReceivedDto; +import com.spring.bean.entity.MessageReceivedEntity; +import com.spring.bean.vo.MessageReceivedVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/MessageService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/MessageService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/system/MessageService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/MessageService.java index 2b24179..afd688b 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/MessageService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/MessageService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MessageDto; +import com.spring.bean.entity.MessageEntity; +import com.spring.bean.vo.MessageVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/MessageTypeService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/MessageTypeService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/MessageTypeService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/MessageTypeService.java index ad05096..97f8c6a 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/MessageTypeService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/MessageTypeService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MessageTypeDto; +import com.spring.bean.entity.MessageTypeEntity; +import com.spring.bean.vo.MessageTypeVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/PermissionService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/PermissionService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/PermissionService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/PermissionService.java index 6872bf9..150e00d 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/PermissionService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/PermissionService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.PermissionDto; +import com.spring.bean.entity.PermissionEntity; +import com.spring.bean.vo.PermissionVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/RolePermissionService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/RolePermissionService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/RolePermissionService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/RolePermissionService.java index 13027e4..b4ef6b4 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/RolePermissionService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/RolePermissionService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RolePermissionDto; +import com.spring.bean.entity.RolePermissionEntity; +import com.spring.bean.vo.RolePermissionVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/RoleService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/RoleService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/RoleService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/RoleService.java index 2c8fb2d..0c592c2 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/RoleService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/RoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RoleDto; +import com.spring.bean.entity.RoleEntity; +import com.spring.bean.vo.RoleVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/RouterRoleService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/RouterRoleService.java similarity index 82% rename from spring-security/step-1/src/main/java/com/spring/service/system/RouterRoleService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/RouterRoleService.java index 605eec6..1ddacfd 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/RouterRoleService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/RouterRoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RouterRoleDto; +import com.spring.bean.entity.RouterRoleEntity; +import com.spring.bean.vo.RouterRoleVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/RouterService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/RouterService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/RouterService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/RouterService.java index 69d12d3..cfb33b5 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/RouterService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/RouterService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RouterDto; +import com.spring.bean.entity.RouterEntity; +import com.spring.bean.vo.RouterVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/UserDeptService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/UserDeptService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/UserDeptService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/UserDeptService.java index 9feca96..ac40cc9 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/UserDeptService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/UserDeptService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserDeptDto; +import com.spring.bean.entity.UserDeptEntity; +import com.spring.bean.vo.UserDeptVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/UserLoginService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/UserLoginService.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/service/system/UserLoginService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/UserLoginService.java index fbe1d60..08bd270 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/UserLoginService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/UserLoginService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserLoginDto; +import com.spring.bean.entity.UserLoginEntity; +import com.spring.bean.vo.UserLoginVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/UserRoleService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/UserRoleService.java similarity index 82% rename from spring-security/step-1/src/main/java/com/spring/service/system/UserRoleService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/UserRoleService.java index 2cfdd13..0ea23ee 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/UserRoleService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/UserRoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserRoleDto; +import com.spring.bean.entity.UserRoleEntity; +import com.spring.bean.vo.UserRoleVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/UserService.java b/spring-security/step-1/src/main/java/com/spring/service/sample/UserService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/system/UserService.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/UserService.java index 35939ae..1df6744 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/UserService.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/UserService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserDto; +import com.spring.bean.entity.UserEntity; +import com.spring.bean.vo.UserVo; +import com.spring.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/DeptServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/DeptServiceImpl.java index 1131a11..cf4361c 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/DeptServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.DeptDto; +import com.spring.bean.entity.DeptEntity; +import com.spring.bean.vo.DeptVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.DeptMapper; -import com.spring.service.system.DeptService; +import com.spring.service.sample.DeptService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailTemplateServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailTemplateServiceImpl.java index 0a92977..eeb0715 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailTemplateServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.EmailTemplateDto; +import com.spring.bean.entity.EmailTemplateEntity; +import com.spring.bean.vo.EmailTemplateVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.EmailTemplateMapper; -import com.spring.service.system.EmailTemplateService; +import com.spring.service.sample.EmailTemplateService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/EmailUsersServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailUsersServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/EmailUsersServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailUsersServiceImpl.java index e3c7836..a48d1c0 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/EmailUsersServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailUsersServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.EmailUsersDto; +import com.spring.bean.entity.EmailUsersEntity; +import com.spring.bean.vo.EmailUsersVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.EmailUsersMapper; -import com.spring.service.system.EmailUsersService; +import com.spring.service.sample.EmailUsersService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/FilesPartDetailServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesPartDetailServiceImpl.java similarity index 89% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/FilesPartDetailServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesPartDetailServiceImpl.java index 382b348..e7e11fe 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/FilesPartDetailServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesPartDetailServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.FilesPartDetailDto; +import com.spring.bean.entity.FilesPartDetailEntity; +import com.spring.bean.vo.FilesPartDetailVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.FilesPartDetailMapper; -import com.spring.service.system.FilesPartDetailService; +import com.spring.service.sample.FilesPartDetailService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/FilesServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/FilesServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesServiceImpl.java index 2818d3d..8eee78f 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/FilesServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.FilesDto; +import com.spring.bean.entity.FilesEntity; +import com.spring.bean.vo.FilesVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.FilesMapper; -import com.spring.service.system.FilesService; +import com.spring.service.sample.FilesService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nServiceImpl.java index 14a6095..66915f0 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.I18nDto; +import com.spring.bean.entity.I18nEntity; +import com.spring.bean.vo.I18nVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.I18nMapper; -import com.spring.service.system.I18nService; +import com.spring.service.sample.I18nService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nTypeServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nTypeServiceImpl.java index 755b7c9..0f2f9a5 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nTypeServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.I18nTypeDto; +import com.spring.bean.entity.I18nTypeEntity; +import com.spring.bean.vo.I18nTypeVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.I18nTypeMapper; -import com.spring.service.system.I18nTypeService; +import com.spring.service.sample.I18nTypeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MenuIconServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MenuIconServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/MenuIconServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/MenuIconServiceImpl.java index 56b254d..a7005ad 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MenuIconServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MenuIconServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MenuIconDto; +import com.spring.bean.entity.MenuIconEntity; +import com.spring.bean.vo.MenuIconVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.MenuIconMapper; -import com.spring.service.system.MenuIconService; +import com.spring.service.sample.MenuIconService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageReceivedServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageReceivedServiceImpl.java similarity index 87% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageReceivedServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageReceivedServiceImpl.java index 7935e08..02a77f4 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageReceivedServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageReceivedServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MessageReceivedDto; +import com.spring.bean.entity.MessageReceivedEntity; +import com.spring.bean.vo.MessageReceivedVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.MessageReceivedMapper; -import com.spring.service.system.MessageReceivedService; +import com.spring.service.sample.MessageReceivedService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageServiceImpl.java index 2c2fd56..0a4a4e1 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MessageDto; +import com.spring.bean.entity.MessageEntity; +import com.spring.bean.vo.MessageVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.MessageMapper; -import com.spring.service.system.MessageService; +import com.spring.service.sample.MessageService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageTypeServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageTypeServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageTypeServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageTypeServiceImpl.java index 03e7617..147e22a 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/MessageTypeServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageTypeServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.MessageTypeDto; +import com.spring.bean.entity.MessageTypeEntity; +import com.spring.bean.vo.MessageTypeVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.MessageTypeMapper; -import com.spring.service.system.MessageTypeService; +import com.spring.service.sample.MessageTypeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/PermissionServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/PermissionServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/PermissionServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/PermissionServiceImpl.java index 6dd59d7..7f9eba8 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/PermissionServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/PermissionServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.PermissionDto; +import com.spring.bean.entity.PermissionEntity; +import com.spring.bean.vo.PermissionVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.PermissionMapper; -import com.spring.service.system.PermissionService; +import com.spring.service.sample.PermissionService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RolePermissionServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RolePermissionServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/RolePermissionServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/RolePermissionServiceImpl.java index a38c90d..b961a18 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RolePermissionServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RolePermissionServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RolePermissionDto; +import com.spring.bean.entity.RolePermissionEntity; +import com.spring.bean.vo.RolePermissionVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.RolePermissionMapper; -import com.spring.service.system.RolePermissionService; +import com.spring.service.sample.RolePermissionService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RoleServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RoleServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/RoleServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/RoleServiceImpl.java index f340e9b..74ab676 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RoleServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RoleDto; +import com.spring.bean.entity.RoleEntity; +import com.spring.bean.vo.RoleVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.RoleMapper; -import com.spring.service.system.RoleService; +import com.spring.service.sample.RoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterRoleServiceImpl.java similarity index 89% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterRoleServiceImpl.java index 36b2257..30a34f9 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterRoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RouterRoleDto; +import com.spring.bean.entity.RouterRoleEntity; +import com.spring.bean.vo.RouterRoleVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.RouterRoleMapper; -import com.spring.service.system.RouterRoleService; +import com.spring.service.sample.RouterRoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RouterServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/RouterServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterServiceImpl.java index 14db4ed..a36025d 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/RouterServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.RouterDto; +import com.spring.bean.entity.RouterEntity; +import com.spring.bean.vo.RouterVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.RouterMapper; -import com.spring.service.system.RouterService; +import com.spring.service.sample.RouterService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserDeptServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserDeptServiceImpl.java index 2a4296d..69cbcc9 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserDeptServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserDeptDto; +import com.spring.bean.entity.UserDeptEntity; +import com.spring.bean.vo.UserDeptVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.UserDeptMapper; -import com.spring.service.system.UserDeptService; +import com.spring.service.sample.UserDeptService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserLoginServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserLoginServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/UserLoginServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserLoginServiceImpl.java index af63e48..dda43e0 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserLoginServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserLoginServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserLoginDto; +import com.spring.bean.entity.UserLoginEntity; +import com.spring.bean.vo.UserLoginVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.UserLoginMapper; -import com.spring.service.system.UserLoginService; +import com.spring.service.sample.UserLoginService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserRoleServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserRoleServiceImpl.java similarity index 89% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/UserRoleServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserRoleServiceImpl.java index b8207ce..f0fcd03 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserRoleServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserRoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserRoleDto; +import com.spring.bean.entity.UserRoleEntity; +import com.spring.bean.vo.UserRoleVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.UserRoleMapper; -import com.spring.service.system.UserRoleService; +import com.spring.service.sample.UserRoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserServiceImpl.java similarity index 88% rename from spring-security/step-1/src/main/java/com/spring/service/system/impl/UserServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserServiceImpl.java index 5e52064..8b8749a 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/system/impl/UserServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.service.sample.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.bean.dto.system.UserDto; +import com.spring.bean.entity.UserEntity; +import com.spring.bean.vo.UserVo; +import com.spring.bean.vo.result.PageResult; import com.spring.mapper.UserMapper; -import com.spring.service.system.UserService; +import com.spring.service.sample.UserService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml b/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml index ab3f3c5..7794732 100644 --- a/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml b/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml index 905e486..eb64eaa 100644 --- a/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml b/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml index b04c917..b027726 100644 --- a/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml b/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml index b17e6d5..b98eea4 100644 --- a/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml b/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml index 53a6c78..d19c5dc 100644 --- a/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml b/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml index 2282d4a..0f13745 100644 --- a/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml b/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml index 1ea80f3..70f7954 100644 --- a/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml b/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml index b2466bf..06b4e3e 100644 --- a/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml b/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml index 6e19592..1f939cc 100644 --- a/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml @@ -3,7 +3,7 @@ - + @@ -27,7 +27,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml b/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml index e28ffce..7114e07 100644 --- a/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml b/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml index f97556c..54d9481 100644 --- a/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml b/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml index a75e585..814f2c2 100644 --- a/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -23,7 +23,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml b/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml index 246e5e0..5466f4a 100644 --- a/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml b/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml index 9a557b7..6f95d62 100644 --- a/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml b/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml index 024cb00..e5e49bc 100644 --- a/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml b/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml index 9433d76..7863cad 100644 --- a/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml index 3f3d06e..e74f3b9 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml index a8d12f2..4740c3b 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/UserMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserMapper.xml index f4412a5..373e5ef 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserMapper.xml @@ -3,7 +3,7 @@ - + @@ -29,7 +29,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml index 8152079..2b00976 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/step-1/src/main/resources/templates/index.html b/spring-security/step-1/src/main/resources/templates/index.html index 7edf047..15d63fc 100644 --- a/spring-security/step-1/src/main/resources/templates/index.html +++ b/spring-security/step-1/src/main/resources/templates/index.html @@ -382,6 +382,7 @@
  • 文档
  • API 文档
  • Swagger UI
    • +
  • 登录
    • diff --git a/spring-security/step-1/src/main/resources/templates/login.html b/spring-security/step-1/src/main/resources/templates/login.html index 1fb92e1..247581e 100644 --- a/spring-security/step-1/src/main/resources/templates/login.html +++ b/spring-security/step-1/src/main/resources/templates/login.html @@ -167,7 +167,7 @@
    + type="password" value="123456">