diff --git a/common/mall-spring-boot-starter-web/pom.xml b/common/mall-spring-boot-starter-web/pom.xml index c78428cf..c649798c 100644 --- a/common/mall-spring-boot-starter-web/pom.xml +++ b/common/mall-spring-boot-starter-web/pom.xml @@ -39,6 +39,12 @@ dubbo true + + + + com.alibaba + fastjson + diff --git a/demo/pom.xml b/demo/pom.xml index 50d1176a..094822a0 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -25,7 +25,7 @@ cn.iocoder.mall - common-dependencies + mall-dependencies 1.0-SNAPSHOT pom import diff --git a/mall-dependencies/pom.xml b/mall-dependencies/pom.xml index 467da3b1..f5a17b15 100644 --- a/mall-dependencies/pom.xml +++ b/mall-dependencies/pom.xml @@ -127,8 +127,11 @@ ${fastjson.version} - - + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + diff --git a/order/pom.xml b/order/pom.xml index 116af0d2..3fe0dbfa 100644 --- a/order/pom.xml +++ b/order/pom.xml @@ -21,7 +21,7 @@ cn.iocoder.mall - common-dependencies + mall-dependencies 1.0-SNAPSHOT pom import diff --git a/pay/pom.xml b/pay/pom.xml index 89320ffc..2fc7124b 100644 --- a/pay/pom.xml +++ b/pay/pom.xml @@ -21,7 +21,7 @@ cn.iocoder.mall - common-dependencies + mall-dependencies 1.0-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 2008dfae..6212fd52 100644 --- a/pom.xml +++ b/pom.xml @@ -204,13 +204,6 @@ ${jackson.version} - - - org.hibernate - hibernate-validator - 6.0.19.Final - - diff --git a/product/pom.xml b/product/pom.xml index 0e0fb4fa..7e103f17 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -21,7 +21,7 @@ cn.iocoder.mall - common-dependencies + mall-dependencies 1.0-SNAPSHOT pom import diff --git a/promotion/pom.xml b/promotion/pom.xml index a7037530..c055f059 100644 --- a/promotion/pom.xml +++ b/promotion/pom.xml @@ -21,7 +21,7 @@ cn.iocoder.mall - common-dependencies + mall-dependencies 1.0-SNAPSHOT pom import diff --git a/search/pom.xml b/search/pom.xml index 250fc31c..865c280c 100644 --- a/search/pom.xml +++ b/search/pom.xml @@ -21,7 +21,7 @@ cn.iocoder.mall - common-dependencies + mall-dependencies 1.0-SNAPSHOT pom import diff --git a/system/pom.xml b/system/pom.xml index 2052279e..ce815a2d 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -29,7 +29,7 @@ cn.iocoder.mall - common-dependencies + mall-dependencies 1.0-SNAPSHOT pom import diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/ResourceMapper.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/ResourceMapper.java index c87c61cd..669eff1b 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/ResourceMapper.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/ResourceMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dao.authorization; -import cn.iocoder.common.framework.mybatis.QueryWrapperX; +import cn.iocoder.mall.mybatis.query.QueryWrapperX; import cn.iocoder.mall.system.biz.dataobject.authorization.ResourceDO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/RoleMapper.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/RoleMapper.java index dc007a7e..f19c515a 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/RoleMapper.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/authorization/RoleMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dao.authorization; -import cn.iocoder.common.framework.mybatis.QueryWrapperX; +import cn.iocoder.mall.mybatis.query.QueryWrapperX; import cn.iocoder.mall.system.biz.dataobject.authorization.RoleDO; import cn.iocoder.mall.system.biz.dto.authorization.RolePageDTO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/authorization/ResourceServiceImpl.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/authorization/ResourceServiceImpl.java index e2088cd0..3b80dc31 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/authorization/ResourceServiceImpl.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/authorization/ResourceServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.system.biz.service.authorization; -import cn.iocoder.common.framework.constant.DeletedStatusEnum; import cn.iocoder.common.framework.util.ServiceExceptionUtil; +import cn.iocoder.mall.mybatis.enums.DeletedStatusEnum; import cn.iocoder.mall.system.biz.bo.authorization.ResourceBO; import cn.iocoder.mall.system.biz.bo.authorization.ResourceTreeNodeBO; import cn.iocoder.mall.system.biz.convert.authorization.ResourceConvert; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/user/UserServiceImpl.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/user/UserServiceImpl.java index 035f3b48..3c894b7a 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/user/UserServiceImpl.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/user/UserServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.service.user; -import cn.iocoder.common.framework.constant.DeletedStatusEnum; +import cn.iocoder.mall.mybatis.enums.DeletedStatusEnum; import cn.iocoder.mall.system.biz.bo.ouath2.OAuth2AccessTokenBO; import cn.iocoder.mall.system.biz.bo.user.UserAuthenticateBO; import cn.iocoder.mall.system.biz.bo.user.UserBO; diff --git a/system/system-rpc-api/pom.xml b/system/system-rpc-api/pom.xml index 61568b1c..35bdfe64 100644 --- a/system/system-rpc-api/pom.xml +++ b/system/system-rpc-api/pom.xml @@ -15,7 +15,7 @@ cn.iocoder.mall - common-framework + system-biz-api 1.0-SNAPSHOT