diff --git a/boot-service/src/main/java/com/xwbing/entity/ExpressInfo.java b/boot-service/src/main/java/com/xwbing/domain/entity/ExpressInfo.java similarity index 95% rename from boot-service/src/main/java/com/xwbing/entity/ExpressInfo.java rename to boot-service/src/main/java/com/xwbing/domain/entity/ExpressInfo.java index 9d7d690..1bf81fc 100644 --- a/boot-service/src/main/java/com/xwbing/entity/ExpressInfo.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/ExpressInfo.java @@ -1,4 +1,4 @@ -package com.xwbing.entity; +package com.xwbing.domain.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/boot-service/src/main/java/com/xwbing/entity/ExpressTrace.java b/boot-service/src/main/java/com/xwbing/domain/entity/ExpressTrace.java similarity index 87% rename from boot-service/src/main/java/com/xwbing/entity/ExpressTrace.java rename to boot-service/src/main/java/com/xwbing/domain/entity/ExpressTrace.java index acb66a1..1470136 100644 --- a/boot-service/src/main/java/com/xwbing/entity/ExpressTrace.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/ExpressTrace.java @@ -1,4 +1,4 @@ -package com.xwbing.entity; +package com.xwbing.domain.entity; import lombok.Data; diff --git a/boot-service/src/main/java/com/xwbing/entity/model/EmailModel.java b/boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java similarity index 98% rename from boot-service/src/main/java/com/xwbing/entity/model/EmailModel.java rename to boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java index 74d6c7e..3eca536 100644 --- a/boot-service/src/main/java/com/xwbing/entity/model/EmailModel.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.model; +package com.xwbing.domain.entity.model; import java.util.Date; diff --git a/boot-service/src/main/java/com/xwbing/entity/model/ValidateModel.java b/boot-service/src/main/java/com/xwbing/domain/entity/model/ValidateModel.java similarity index 97% rename from boot-service/src/main/java/com/xwbing/entity/model/ValidateModel.java rename to boot-service/src/main/java/com/xwbing/domain/entity/model/ValidateModel.java index 7f75e49..e8a574d 100644 --- a/boot-service/src/main/java/com/xwbing/entity/model/ValidateModel.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/model/ValidateModel.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.model; +package com.xwbing.domain.entity.model; import lombok.Data; import org.hibernate.validator.constraints.Email; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/BaseEntity.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/BaseEntity.java similarity index 96% rename from boot-service/src/main/java/com/xwbing/entity/sys/BaseEntity.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/BaseEntity.java index 14d0e22..c83b7f9 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/BaseEntity.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/BaseEntity.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/SysAuthority.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java similarity index 95% rename from boot-service/src/main/java/com/xwbing/entity/sys/SysAuthority.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java index b701a9e..b2c8ea6 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/SysAuthority.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/SysConfig.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java similarity index 97% rename from boot-service/src/main/java/com/xwbing/entity/sys/SysConfig.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java index 8758ecb..4e7364c 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/SysConfig.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/SysRole.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java similarity index 94% rename from boot-service/src/main/java/com/xwbing/entity/sys/SysRole.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java index 148e755..1902a3a 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/SysRole.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/SysRoleAuthority.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java similarity index 94% rename from boot-service/src/main/java/com/xwbing/entity/sys/SysRoleAuthority.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java index 9165d48..fe09327 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/SysRoleAuthority.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/SysUser.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java similarity index 97% rename from boot-service/src/main/java/com/xwbing/entity/sys/SysUser.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java index f70903f..2033b80 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/SysUser.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/SysUserLoginInOut.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java similarity index 95% rename from boot-service/src/main/java/com/xwbing/entity/sys/SysUserLoginInOut.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java index c19fe85..b570072 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/SysUserLoginInOut.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/boot-service/src/main/java/com/xwbing/entity/sys/SysUserRole.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java similarity index 94% rename from boot-service/src/main/java/com/xwbing/entity/sys/SysUserRole.java rename to boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java index 1fac0ef..b7da0a0 100644 --- a/boot-service/src/main/java/com/xwbing/entity/sys/SysUserRole.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java @@ -1,4 +1,4 @@ -package com.xwbing.entity.sys; +package com.xwbing.domain.entity.sys; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/boot-service/src/main/java/com/xwbing/entity/vo/ExpressInfoVo.java b/boot-service/src/main/java/com/xwbing/domain/entity/vo/ExpressInfoVo.java similarity index 81% rename from boot-service/src/main/java/com/xwbing/entity/vo/ExpressInfoVo.java rename to boot-service/src/main/java/com/xwbing/domain/entity/vo/ExpressInfoVo.java index 9cdf466..092d11a 100644 --- a/boot-service/src/main/java/com/xwbing/entity/vo/ExpressInfoVo.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/vo/ExpressInfoVo.java @@ -1,6 +1,6 @@ -package com.xwbing.entity.vo; +package com.xwbing.domain.entity.vo; -import com.xwbing.entity.ExpressTrace; +import com.xwbing.domain.entity.ExpressTrace; import lombok.Data; import java.util.List; @@ -29,7 +29,7 @@ public class ExpressInfoVo { /** * 物流信息 */ - private List expressTraces; + private List traces; /** * 描述 */ diff --git a/boot-service/src/main/java/com/xwbing/entity/vo/SysAuthVo.java b/boot-service/src/main/java/com/xwbing/domain/entity/vo/SysAuthVo.java similarity index 87% rename from boot-service/src/main/java/com/xwbing/entity/vo/SysAuthVo.java rename to boot-service/src/main/java/com/xwbing/domain/entity/vo/SysAuthVo.java index 756680e..4c99110 100644 --- a/boot-service/src/main/java/com/xwbing/entity/vo/SysAuthVo.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/vo/SysAuthVo.java @@ -1,6 +1,6 @@ -package com.xwbing.entity.vo; +package com.xwbing.domain.entity.vo; -import com.xwbing.entity.sys.SysAuthority; +import com.xwbing.domain.entity.sys.SysAuthority; import lombok.Data; import org.apache.commons.beanutils.BeanUtils; diff --git a/boot-service/src/main/java/com/xwbing/repository/sys/SysAuthorityRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java similarity index 87% rename from boot-service/src/main/java/com/xwbing/repository/sys/SysAuthorityRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java index 2e81a0a..a11ec06 100644 --- a/boot-service/src/main/java/com/xwbing/repository/sys/SysAuthorityRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java @@ -1,6 +1,6 @@ -package com.xwbing.repository.sys; +package com.xwbing.domain.repository.sys; -import com.xwbing.entity.sys.SysAuthority; +import com.xwbing.domain.entity.sys.SysAuthority; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/boot-service/src/main/java/com/xwbing/repository/sys/SysConfigRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysConfigRepository.java similarity index 80% rename from boot-service/src/main/java/com/xwbing/repository/sys/SysConfigRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/sys/SysConfigRepository.java index bb368f9..ed699f9 100644 --- a/boot-service/src/main/java/com/xwbing/repository/sys/SysConfigRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysConfigRepository.java @@ -1,6 +1,6 @@ -package com.xwbing.repository.sys; +package com.xwbing.domain.repository.sys; -import com.xwbing.entity.sys.SysConfig; +import com.xwbing.domain.entity.sys.SysConfig; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleAuthorityRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java similarity index 78% rename from boot-service/src/main/java/com/xwbing/repository/sys/SysRoleAuthorityRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java index 57048a0..831b014 100644 --- a/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleAuthorityRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java @@ -1,6 +1,6 @@ -package com.xwbing.repository.sys; +package com.xwbing.domain.repository.sys; -import com.xwbing.entity.sys.SysRoleAuthority; +import com.xwbing.domain.entity.sys.SysRoleAuthority; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java similarity index 84% rename from boot-service/src/main/java/com/xwbing/repository/sys/SysRoleRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java index aba8e36..952cf7c 100644 --- a/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java @@ -1,6 +1,6 @@ -package com.xwbing.repository.sys; +package com.xwbing.domain.repository.sys; -import com.xwbing.entity.sys.SysRole; +import com.xwbing.domain.entity.sys.SysRole; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/boot-service/src/main/java/com/xwbing/repository/sys/SysUserLoginInOutRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java similarity index 78% rename from boot-service/src/main/java/com/xwbing/repository/sys/SysUserLoginInOutRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java index 6d20731..8331143 100644 --- a/boot-service/src/main/java/com/xwbing/repository/sys/SysUserLoginInOutRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java @@ -1,6 +1,6 @@ -package com.xwbing.repository.sys; +package com.xwbing.domain.repository.sys; -import com.xwbing.entity.sys.SysUserLoginInOut; +import com.xwbing.domain.entity.sys.SysUserLoginInOut; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java similarity index 76% rename from boot-service/src/main/java/com/xwbing/repository/sys/SysUserRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java index 1598ae4..39caeb4 100644 --- a/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java @@ -1,6 +1,6 @@ -package com.xwbing.repository.sys; +package com.xwbing.domain.repository.sys; -import com.xwbing.entity.sys.SysUser; +import com.xwbing.domain.entity.sys.SysUser; import org.springframework.data.jpa.repository.JpaRepository; /** * 说明: diff --git a/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRoleRepository.java b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java similarity index 78% rename from boot-service/src/main/java/com/xwbing/repository/sys/SysUserRoleRepository.java rename to boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java index 7be9805..6d4bc28 100644 --- a/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRoleRepository.java +++ b/boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java @@ -1,6 +1,6 @@ -package com.xwbing.repository.sys; +package com.xwbing.domain.repository.sys; -import com.xwbing.entity.sys.SysUserRole; +import com.xwbing.domain.entity.sys.SysUserRole; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/boot-service/src/main/java/com/xwbing/service/ExpressDeliveryService.java b/boot-service/src/main/java/com/xwbing/service/ExpressDeliveryService.java index 7eb8fb6..3f08cd2 100644 --- a/boot-service/src/main/java/com/xwbing/service/ExpressDeliveryService.java +++ b/boot-service/src/main/java/com/xwbing/service/ExpressDeliveryService.java @@ -2,8 +2,8 @@ package com.xwbing.service; import com.alibaba.fastjson.JSONObject; import com.xwbing.constant.CommonEnum; -import com.xwbing.entity.ExpressInfo; -import com.xwbing.entity.vo.ExpressInfoVo; +import com.xwbing.domain.entity.ExpressInfo; +import com.xwbing.domain.entity.vo.ExpressInfoVo; import com.xwbing.exception.BusinessException; import com.xwbing.util.KdniaoUtil; import org.apache.commons.lang3.StringUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java index 9382878..843bcd1 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java @@ -1,11 +1,11 @@ package com.xwbing.service.sys; import com.xwbing.constant.CommonConstant; -import com.xwbing.entity.sys.SysAuthority; -import com.xwbing.entity.sys.SysRoleAuthority; -import com.xwbing.entity.vo.SysAuthVo; +import com.xwbing.domain.entity.sys.SysAuthority; +import com.xwbing.domain.entity.sys.SysRoleAuthority; +import com.xwbing.domain.entity.vo.SysAuthVo; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.sys.SysAuthorityRepository; +import com.xwbing.domain.repository.sys.SysAuthorityRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java index 08fae0d..2a74bca 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java @@ -1,8 +1,8 @@ package com.xwbing.service.sys; -import com.xwbing.entity.sys.SysConfig; +import com.xwbing.domain.entity.sys.SysConfig; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.sys.SysConfigRepository; +import com.xwbing.domain.repository.sys.SysConfigRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.slf4j.Logger; diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java index 7efd44c..6044b08 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java @@ -1,7 +1,7 @@ package com.xwbing.service.sys; -import com.xwbing.entity.sys.SysRoleAuthority; -import com.xwbing.repository.sys.SysRoleAuthorityRepository; +import com.xwbing.domain.entity.sys.SysRoleAuthority; +import com.xwbing.domain.repository.sys.SysRoleAuthorityRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java index f3bf273..7a40279 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java @@ -1,10 +1,10 @@ package com.xwbing.service.sys; -import com.xwbing.entity.sys.SysRole; -import com.xwbing.entity.sys.SysRoleAuthority; -import com.xwbing.entity.sys.SysUserRole; +import com.xwbing.domain.entity.sys.SysRole; +import com.xwbing.domain.entity.sys.SysRoleAuthority; +import com.xwbing.domain.entity.sys.SysUserRole; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.sys.SysRoleRepository; +import com.xwbing.domain.repository.sys.SysRoleRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java index b3ce6f8..7ce5a21 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java @@ -1,9 +1,9 @@ package com.xwbing.service.sys; import com.xwbing.constant.CommonEnum; -import com.xwbing.entity.sys.SysUser; -import com.xwbing.entity.sys.SysUserLoginInOut; -import com.xwbing.repository.sys.SysUserLoginInOutRepository; +import com.xwbing.domain.entity.sys.SysUser; +import com.xwbing.domain.entity.sys.SysUserLoginInOut; +import com.xwbing.domain.repository.sys.SysUserLoginInOutRepository; import com.xwbing.util.DateUtil2; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java index 213d6dc..984b397 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java @@ -1,7 +1,7 @@ package com.xwbing.service.sys; -import com.xwbing.entity.sys.SysUserRole; -import com.xwbing.repository.sys.SysUserRoleRepository; +import com.xwbing.domain.entity.sys.SysUserRole; +import com.xwbing.domain.repository.sys.SysUserRoleRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java index 891a18f..0a1d517 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java @@ -3,10 +3,10 @@ package com.xwbing.service.sys; import com.alibaba.fastjson.JSONObject; import com.xwbing.constant.CommonConstant; import com.xwbing.constant.CommonEnum; -import com.xwbing.entity.model.EmailModel; -import com.xwbing.entity.sys.*; +import com.xwbing.domain.entity.model.EmailModel; +import com.xwbing.domain.entity.sys.*; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.sys.SysUserRepository; +import com.xwbing.domain.repository.sys.SysUserRepository; import com.xwbing.util.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/boot-service/src/main/java/com/xwbing/util/EmailUtil.java b/boot-service/src/main/java/com/xwbing/util/EmailUtil.java index 9b017eb..d56dfd3 100644 --- a/boot-service/src/main/java/com/xwbing/util/EmailUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/EmailUtil.java @@ -1,7 +1,7 @@ package com.xwbing.util; -import com.xwbing.entity.model.EmailModel; +import com.xwbing.domain.entity.model.EmailModel; import com.xwbing.exception.BusinessException; import org.apache.commons.lang3.StringUtils; diff --git a/boot-web/src/main/java/com/xwbing/controller/TestControl.java b/boot-web/src/main/java/com/xwbing/controller/TestControl.java index 743d70e..3bd6d4a 100644 --- a/boot-web/src/main/java/com/xwbing/controller/TestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/TestControl.java @@ -2,8 +2,8 @@ package com.xwbing.controller; import com.alibaba.fastjson.JSONObject; import com.xwbing.annotation.LogInfo; -import com.xwbing.entity.ExpressInfo; -import com.xwbing.entity.vo.ExpressInfoVo; +import com.xwbing.domain.entity.ExpressInfo; +import com.xwbing.domain.entity.vo.ExpressInfoVo; import com.xwbing.redis.RedisService; import com.xwbing.service.ExpressDeliveryService; import com.xwbing.service.QRCodeZipService; diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java index af2bc4a..476aa45 100644 --- a/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.xwbing.annotation.LogInfo; import com.xwbing.constant.CommonConstant; import com.xwbing.constant.CommonEnum; -import com.xwbing.entity.sys.SysAuthority; -import com.xwbing.entity.vo.SysAuthVo; +import com.xwbing.domain.entity.sys.SysAuthority; +import com.xwbing.domain.entity.vo.SysAuthVo; import com.xwbing.redis.RedisService; import com.xwbing.service.sys.SysAuthorityService; import com.xwbing.util.JSONObjResult; diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java index 260bb77..3bd7b5a 100644 --- a/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java @@ -1,7 +1,7 @@ package com.xwbing.controller.sys; import com.alibaba.fastjson.JSONObject; -import com.xwbing.entity.sys.SysConfig; +import com.xwbing.domain.entity.sys.SysConfig; import com.xwbing.service.sys.SysConfigService; import com.xwbing.util.JSONObjResult; import com.xwbing.util.RestMessage; diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java index 251aa56..d6f7867 100644 --- a/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java @@ -2,9 +2,9 @@ package com.xwbing.controller.sys; import com.alibaba.fastjson.JSONObject; import com.xwbing.annotation.LogInfo; -import com.xwbing.entity.sys.SysAuthority; -import com.xwbing.entity.sys.SysRole; -import com.xwbing.entity.sys.SysRoleAuthority; +import com.xwbing.domain.entity.sys.SysAuthority; +import com.xwbing.domain.entity.sys.SysRole; +import com.xwbing.domain.entity.sys.SysRoleAuthority; import com.xwbing.service.sys.SysAuthorityService; import com.xwbing.service.sys.SysRoleAuthorityService; import com.xwbing.service.sys.SysRoleService; diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java index cbac635..c224ec7 100644 --- a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java @@ -4,10 +4,10 @@ import com.alibaba.fastjson.JSONObject; import com.xwbing.annotation.LogInfo; import com.xwbing.constant.CommonConstant; import com.xwbing.constant.CommonEnum; -import com.xwbing.entity.sys.SysAuthority; -import com.xwbing.entity.sys.SysRole; -import com.xwbing.entity.sys.SysUser; -import com.xwbing.entity.sys.SysUserRole; +import com.xwbing.domain.entity.sys.SysAuthority; +import com.xwbing.domain.entity.sys.SysRole; +import com.xwbing.domain.entity.sys.SysUser; +import com.xwbing.domain.entity.sys.SysUserRole; import com.xwbing.service.sys.SysAuthorityService; import com.xwbing.service.sys.SysRoleService; import com.xwbing.service.sys.SysUserRoleService; diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserLoginInOutControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserLoginInOutControl.java index 7337d23..690e46b 100644 --- a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserLoginInOutControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserLoginInOutControl.java @@ -2,7 +2,7 @@ package com.xwbing.controller.sys; import com.alibaba.fastjson.JSONObject; import com.xwbing.annotation.LogInfo; -import com.xwbing.entity.sys.SysUserLoginInOut; +import com.xwbing.domain.entity.sys.SysUserLoginInOut; import com.xwbing.service.sys.SysUserLoginInOutService; import com.xwbing.util.JSONObjResult; import io.swagger.annotations.Api; diff --git a/pom.xml b/pom.xml index 6da4362..87cd1e8 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ 1.3.1 1.16.16 3.2.1 + 1.2.20 true 2.4.0 @@ -67,7 +68,7 @@ com.alibaba fastjson - 1.2.20 + ${fastjson.veersion} com.google.code.gson