diff --git a/common/common-dependencies/pom.xml b/common/common-dependencies/pom.xml deleted file mode 100644 index d1c2d5fe5..000000000 --- a/common/common-dependencies/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - common - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - common-dependencies - pom - Onemall Dependencies - Maven Bom，定义 Onemall 项目的所有依赖的版本 - - - - - 2.2.4.RELEASE - Hoxton.SR1 - 2.2.0.RELEASE - - 2.7.1 - - 1.1.0 - - 7.0.0 - - - - - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring.cloud.alibaba.version} - pom - import - - - - - org.apache.dubbo - dubbo - ${dubbo.version} - - - - - io.seata - seata-spring-boot-starter - ${seata.version} - - - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - - - diff --git a/common/common-framework/pom.xml b/common/common-framework/pom.xml index 1ce29bc92..0b3edec38 100644 --- a/common/common-framework/pom.xml +++ b/common/common-framework/pom.xml @@ -32,21 +32,6 @@ swagger-annotations - - - org.mybatis - mybatis - - - - com.baomidou - mybatis-plus-annotation - - - com.baomidou - mybatis-plus-core - - org.apache.dubbo @@ -71,11 +56,6 @@ hibernate-validator - - com.alibaba - fastjson - - org.apache.commons commons-lang3 diff --git a/common/mall-spring-boot-starter-mybatis/pom.xml b/common/mall-spring-boot-starter-mybatis/pom.xml new file mode 100644 index 000000000..287f258ce --- /dev/null +++ b/common/mall-spring-boot-starter-mybatis/pom.xml @@ -0,0 +1,41 @@ + + + + common + cn.iocoder.mall + 1.0-SNAPSHOT + + 4.0.0 + + mall-spring-boot-starter-mybatis + + + + + org.mybatis + mybatis + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + com.baomidou + mybatis-plus-core + + + com.baomidou + mybatis-plus-boot-starter + + + + + com.alibaba + fastjson + true + + + + diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/BaseDO.java b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/BaseDO.java similarity index 94% rename from common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/BaseDO.java rename to common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/BaseDO.java index 4f6882629..de1c7ec16 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/BaseDO.java +++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/BaseDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.common.framework.dataobject; +package cn.iocoder.mall.mybatis.dataobject; import java.io.Serializable; import java.util.Date; @@ -42,4 +42,4 @@ public class BaseDO implements Serializable { this.updateTime = updateTime; return this; } -} \ No newline at end of file +} diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/DeletableDO.java b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/DeletableDO.java similarity index 92% rename from common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/DeletableDO.java rename to common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/DeletableDO.java index 3e70485ce..1584c0fe0 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/DeletableDO.java +++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/DeletableDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.common.framework.dataobject; +package cn.iocoder.mall.mybatis.dataobject; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/constant/DeletedStatusEnum.java b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/enums/DeletedStatusEnum.java similarity index 84% rename from common/common-framework/src/main/java/cn/iocoder/common/framework/constant/DeletedStatusEnum.java rename to common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/enums/DeletedStatusEnum.java index 0aa80a797..f5d0301c4 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/constant/DeletedStatusEnum.java +++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/enums/DeletedStatusEnum.java @@ -1,6 +1,6 @@ -package cn.iocoder.common.framework.constant; +package cn.iocoder.mall.mybatis.enums; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; /** * {@link DeletableDO#getDeleted()} delete 状态 diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/QueryWrapperX.java b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/query/QueryWrapperX.java similarity index 82% rename from common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/QueryWrapperX.java rename to common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/query/QueryWrapperX.java index bf0a7fdf4..ec2048835 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/QueryWrapperX.java +++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/query/QueryWrapperX.java @@ -1,7 +1,8 @@ -package cn.iocoder.common.framework.mybatis; +package cn.iocoder.mall.mybatis.query; -import cn.iocoder.common.framework.util.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.springframework.util.StringUtils; import java.util.Collection; @@ -23,14 +24,14 @@ public class QueryWrapperX extends QueryWrapper { } public QueryWrapperX inIfPresent(String column, Collection values) { - if (!CollectionUtil.isEmpty(values)) { + if (!CollectionUtils.isEmpty(values)) { return (QueryWrapperX) super.in(column, values); } return this; } public QueryWrapperX inIfPresent(String column, Object... values) { - if (!CollectionUtil.isEmpty(values)) { + if (!ArrayUtils.isEmpty(values)) { return (QueryWrapperX) super.in(column, values); } return this; diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/JSONTypeHandler.java b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/type/JSONTypeHandler.java similarity index 97% rename from common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/JSONTypeHandler.java rename to common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/type/JSONTypeHandler.java index b68ced706..7a8907fd7 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/JSONTypeHandler.java +++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/type/JSONTypeHandler.java @@ -1,4 +1,4 @@ -package cn.iocoder.common.framework.mybatis; +package cn.iocoder.mall.mybatis.type; import com.alibaba.fastjson.JSON; import org.apache.ibatis.type.BaseTypeHandler; diff --git a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java index ff4bbdef3..ffdb369a1 100644 --- a/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java +++ b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.web.config; -import cn.iocoder.common.framework.servlet.CorsFilter; +import cn.iocoder.mall.web.core.servlet.CorsFilter; import cn.iocoder.mall.web.core.constant.CommonMallConstants; import cn.iocoder.mall.web.core.handler.GlobalExceptionHandler; import cn.iocoder.mall.web.core.handler.GlobalResponseBodyHandler; diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/servlet/CorsFilter.java b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/servlet/CorsFilter.java similarity index 96% rename from common/common-framework/src/main/java/cn/iocoder/common/framework/servlet/CorsFilter.java rename to common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/servlet/CorsFilter.java index 5db9df03e..75f81057e 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/servlet/CorsFilter.java +++ b/common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/servlet/CorsFilter.java @@ -1,4 +1,4 @@ -package cn.iocoder.common.framework.servlet; +package cn.iocoder.mall.web.core.servlet; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; diff --git a/common/pom.xml b/common/pom.xml index 42c4cd293..c9938d864 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -14,10 +14,10 @@ common-framework mall-spring-boot - common-dependencies mall-spring-boot-starter-swagger mall-spring-boot-starter-web mall-spring-boot-starter-security + mall-spring-boot-starter-mybatis diff --git a/mall-dependencies/pom.xml b/mall-dependencies/pom.xml index 0db67e341..467da3b1c 100644 --- a/mall-dependencies/pom.xml +++ b/mall-dependencies/pom.xml @@ -23,12 +23,19 @@ 2.2.0.RELEASE 2.0.2 + + 2.0.0 + 3.5.1 + 3.1.1 2.7.1 1.1.0 7.0.0 + + 1.2.56 + 6.0.16.Final @@ -57,6 +64,34 @@ import + + + org.mybatis + mybatis + ${mybatis.version} + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis-spring-boot-starter.version} + + + com.baomidou + mybatis-plus-core + ${mybatis-plus.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + org.springframework.boot + spring-boot-starter-jdbc + + + + com.github.xiaoymin @@ -85,6 +120,14 @@ ${skywalking.version} + + + com.alibaba + fastjson + ${fastjson.version} + + + diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java index 5f832e2d3..d0f04d40c 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java @@ -4,8 +4,6 @@ import cn.iocoder.common.framework.dataobject.BaseDO; import lombok.Data; import lombok.experimental.Accessors; -import java.io.Serializable; - /** * 订单关闭 * diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java index 038a26461..170d43ba4 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java @@ -10,7 +10,6 @@ import cn.iocoder.mall.order.api.bo.OrderLogisticsInfoBO; import cn.iocoder.mall.order.api.bo.OrderLogisticsInfoWithOrderBO; import cn.iocoder.mall.order.api.constant.OrderErrorCodeEnum; import cn.iocoder.mall.order.biz.convert.OrderLogisticsConvert; -import cn.iocoder.mall.order.biz.convert.OrderLogisticsDetailConvert; import cn.iocoder.mall.order.biz.dao.OrderItemMapper; import cn.iocoder.mall.order.biz.dao.OrderLogisticsDetailMapper; import cn.iocoder.mall.order.biz.dao.OrderLogisticsMapper; diff --git a/pay/pay-service-impl/src/main/resources/mapper/PayNotifyTaskMapper.xml b/pay/pay-service-impl/src/main/resources/mapper/PayNotifyTaskMapper.xml index 89e5b4282..e359d1f07 100644 --- a/pay/pay-service-impl/src/main/resources/mapper/PayNotifyTaskMapper.xml +++ b/pay/pay-service-impl/src/main/resources/mapper/PayNotifyTaskMapper.xml @@ -11,10 +11,10 @@ + typeHandler="cn.iocoder.mall.mybatis.type.JSONTypeHandler"/> + typeHandler="cn.iocoder.mall.mybatis.type.JSONTypeHandler"/> diff --git a/pom.xml b/pom.xml index 33107926f..2008dfae4 100644 --- a/pom.xml +++ b/pom.xml @@ -14,16 +14,16 @@ onemall 1.0-SNAPSHOT - product - order - user + + + common system - ops - pay - promotion - search - demo + + + + + mall-dependencies pom @@ -43,9 +43,7 @@ 1.5.21 2.9.2 1.9.3 - 2.0.0 - 3.5.1 - 3.1.1 + 2.0.1 27.0.1-jre @@ -61,8 +59,6 @@ 4.1.0 1.8 - 6.0.16.Final - 1.2.56 @@ -135,38 +131,6 @@ ${druid.version} - - org.mybatis - mybatis - ${mybatis.version} - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring-boot-starter.version} - - - com.baomidou - mybatis-plus-annotation - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-core - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - org.springframework.boot - spring-boot-starter-jdbc - - - - com.xuxueli @@ -240,16 +204,11 @@ ${jackson.version} + org.hibernate hibernate-validator - ${hibernate-validator.version} - - - - com.alibaba - fastjson - ${fastjson.version} + 6.0.19.Final diff --git a/promotion/promotion-service-impl/src/main/resources/mapper/PromotionActivityMapper.xml b/promotion/promotion-service-impl/src/main/resources/mapper/PromotionActivityMapper.xml index 4518b97f1..82b093cdb 100644 --- a/promotion/promotion-service-impl/src/main/resources/mapper/PromotionActivityMapper.xml +++ b/promotion/promotion-service-impl/src/main/resources/mapper/PromotionActivityMapper.xml @@ -9,8 +9,8 @@ - - + + diff --git a/system/system-biz/pom.xml b/system/system-biz/pom.xml index 32bb22302..2ca1f83bf 100644 --- a/system/system-biz/pom.xml +++ b/system/system-biz/pom.xml @@ -43,9 +43,11 @@ com.alibaba druid-spring-boot-starter + - com.baomidou - mybatis-plus-boot-starter + cn.iocoder.mall + mall-spring-boot-starter-mybatis + 1.0-SNAPSHOT @@ -71,6 +73,11 @@ org.projectlombok lombok + + + com.alibaba + fastjson + diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/account/AccountDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/account/AccountDO.java index 74208b7e3..06a07689d 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/account/AccountDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/account/AccountDO.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.system.biz.dataobject.account; import cn.iocoder.common.framework.constant.CommonStatusEnum; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/AdminDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/AdminDO.java index 647fa2bbc..e43d329ef 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/AdminDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/AdminDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.admin; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import cn.iocoder.mall.system.biz.dataobject.account.AccountDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/DepartmentDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/DepartmentDO.java index ddc354058..b35a57e7a 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/DepartmentDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/admin/DepartmentDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.admin; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/AccountRoleDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/AccountRoleDO.java index b5e63c41f..7ce40e975 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/AccountRoleDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/AccountRoleDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.authorization; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import cn.iocoder.mall.system.biz.dataobject.account.AccountDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/ResourceDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/ResourceDO.java index 0c0fab45f..a6b5409cb 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/ResourceDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/ResourceDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.authorization; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import cn.iocoder.mall.system.biz.enums.authorization.ResourceTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java index 1d803693b..46354c2de 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.authorization; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleResourceDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleResourceDO.java index 7765fdc56..304b28f10 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleResourceDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleResourceDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.authorization; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2AccessTokenDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2AccessTokenDO.java index bec913377..dfd70b1fd 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2AccessTokenDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2AccessTokenDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.oauth2; -import cn.iocoder.common.framework.dataobject.BaseDO; +import cn.iocoder.mall.mybatis.dataobject.BaseDO; import cn.iocoder.mall.system.biz.dataobject.account.AccountDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2MobileCodeDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2MobileCodeDO.java index beaa67ec7..88637d991 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2MobileCodeDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2MobileCodeDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.oauth2; -import cn.iocoder.common.framework.dataobject.BaseDO; +import cn.iocoder.mall.mybatis.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2RefreshTokenDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2RefreshTokenDO.java index ddd4e51b7..56358d1c5 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2RefreshTokenDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/oauth2/OAuth2RefreshTokenDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.oauth2; -import cn.iocoder.common.framework.dataobject.BaseDO; +import cn.iocoder.mall.mybatis.dataobject.BaseDO; import cn.iocoder.mall.system.biz.dataobject.account.AccountDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java index 0a376d11c..372a2b8d1 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.sms; -import cn.iocoder.common.framework.dataobject.BaseDO; +import cn.iocoder.mall.mybatis.dataobject.BaseDO; import lombok.Data; import lombok.experimental.Accessors; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java index e5fe58225..0b8b60972 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.sms; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java index 1dc760ebf..86d0ce525 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.sms; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/AccessLogDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/AccessLogDO.java index 50a0be9cb..7384432e1 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/AccessLogDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/AccessLogDO.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.system.biz.dataobject.systemlog; -import cn.iocoder.common.framework.dataobject.BaseDO; import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.mybatis.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/ExceptionLogDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/ExceptionLogDO.java index 29653b4b6..e9958dc7b 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/ExceptionLogDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/systemlog/ExceptionLogDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.systemlog; -import cn.iocoder.common.framework.dataobject.BaseDO; +import cn.iocoder.mall.mybatis.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/user/UserDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/user/UserDO.java index 5a30861d6..9dcfdaba2 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/user/UserDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/user/UserDO.java @@ -1,6 +1,6 @@ package cn.iocoder.mall.system.biz.dataobject.user; -import cn.iocoder.common.framework.dataobject.DeletableDO; +import cn.iocoder.mall.mybatis.dataobject.DeletableDO; import cn.iocoder.mall.system.biz.dataobject.account.AccountDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleAddDTO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleAddDTO.java new file mode 100644 index 000000000..a83dc1f9b --- /dev/null +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleAddDTO.java @@ -0,0 +1,27 @@ +package cn.iocoder.mall.system.biz.dto.authorization; + +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 角色模块 - 添加角色 DTO + */ +@Data +@Accessors(chain = true) +public class RoleAddDTO { + + @NotNull(message = "管理员编号不能为空") + private Integer adminId; + + @NotEmpty(message = "角色名字不能为空") + private String name; + + /** + * 角色编码 + */ + private String code; + +} diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleDeleteDTO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleDeleteDTO.java new file mode 100644 index 000000000..bc4f01ede --- /dev/null +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleDeleteDTO.java @@ -0,0 +1,21 @@ +package cn.iocoder.mall.system.biz.dto.authorization; + +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotNull; + +/** + * 资源模块 - 删除资源 DTO + */ +@Data +@Accessors(chain = true) +public class RoleDeleteDTO { + + @NotNull(message = "管理员编号不能为空") + private Integer adminId; + + @NotNull(message = "角色编号不能为空") + private Integer id; + +} diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RolePageDTO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RolePageDTO.java index 0ca2e2366..73d713133 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RolePageDTO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RolePageDTO.java @@ -1,13 +1,16 @@ package cn.iocoder.mall.system.biz.dto.authorization; import cn.iocoder.common.framework.vo.PageParam; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -@ApiModel("角色分页 DTO") +/** + * 角色模块 - 角色分页 DTO + */ @Data +@EqualsAndHashCode(callSuper = true) @Accessors(chain = true) public class RolePageDTO extends PageParam { diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleUpdateDTO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleUpdateDTO.java new file mode 100644 index 000000000..1a2390c4f --- /dev/null +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/authorization/RoleUpdateDTO.java @@ -0,0 +1,30 @@ +package cn.iocoder.mall.system.biz.dto.authorization; + +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 角色模块 - 修改角色 DTO + */ +@Data +@Accessors(chain = true) +public class RoleUpdateDTO { + + @NotNull(message = "管理员编号不能为空") + private Integer adminId; + + @NotNull(message = "角色编号不能为空") + private Integer id; + + @NotEmpty(message = "角色名字不能为空") + private String name; + + /** + * 角色编码 + */ + private String code; + +} diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java index 518fcdb13..0ed8bb8bb 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java @@ -25,4 +25,5 @@ public class ListSmsSignDTO extends PageParam { @ApiModelProperty("申请状态") private Integer applyStatus; + } diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java index 3f2ab55ba..eff3051a1 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java @@ -1,11 +1,11 @@ package cn.iocoder.mall.system.biz.service.sms; -import cn.iocoder.common.framework.constant.DeletedStatusEnum; import cn.iocoder.common.framework.exception.ServiceException; import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.mybatis.enums.DeletedStatusEnum; import cn.iocoder.mall.system.biz.bo.smsSign.ListSmsSignBO; -import cn.iocoder.mall.system.biz.bo.smsTemplate.ListSmsTemplateBO; import cn.iocoder.mall.system.biz.bo.smsSign.SmsSignBO; +import cn.iocoder.mall.system.biz.bo.smsTemplate.ListSmsTemplateBO; import cn.iocoder.mall.system.biz.bo.smsTemplate.SmsTemplateBO; import cn.iocoder.mall.system.biz.convert.SmsSignConvert; import cn.iocoder.mall.system.biz.convert.SmsTemplateConvert; @@ -17,8 +17,8 @@ import cn.iocoder.mall.system.biz.dataobject.sms.SmsSignDO; import cn.iocoder.mall.system.biz.dataobject.sms.SmsTemplateDO; import cn.iocoder.mall.system.biz.dto.smsSign.AddSignDTO; import cn.iocoder.mall.system.biz.dto.smsSign.ListSmsSignDTO; -import cn.iocoder.mall.system.biz.dto.smsTemplate.ListSmsTemplateDTO; import cn.iocoder.mall.system.biz.dto.smsSign.UpdateSignDTO; +import cn.iocoder.mall.system.biz.dto.smsTemplate.ListSmsTemplateDTO; import cn.iocoder.mall.system.biz.enums.AdminErrorCodeEnum; import cn.iocoder.mall.system.biz.enums.sms.SmsApplyStatusEnum; import cn.iocoder.mall.system.biz.enums.sms.SmsPlatformEnum; @@ -43,7 +43,8 @@ import java.util.stream.Collectors; * @time 2019/5/16 10:30 AM */ @Service -@org.apache.dubbo.config.annotation.Service(validation = "true", version = "${dubbo.provider.SmsService.version}") +//@org.apache.dubbo.config.annotation.Service(validation = "true", version = "${dubbo.provider.SmsService.version}") +// TODO FROM 芋艿 to 小范，biz 层，不提供 dubbo 接口 public class SmsServiceImpl implements SmsService { @Autowired diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/authorization/AdminsRoleAddRequest.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/authorization/AdminsRoleAddRequest.java new file mode 100644 index 000000000..5230b78a2 --- /dev/null +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/authorization/AdminsRoleAddRequest.java @@ -0,0 +1,22 @@ +package cn.iocoder.mall.system.rest.request.authorization; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; + +@ApiModel("管理员 - 角色模块 - 添加角色 Request") +@Data +@Accessors(chain = true) +public class AdminsRoleAddRequest { + + @ApiModelProperty(value = "角色名字", required = true, example = "系统管理员") + @NotEmpty(message = "角色名字不能为空") + private String name; + + @ApiModelProperty(value = "角色编码", example = "SUPER_ADMIN") + private String code; + +} diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/authorization/RoleUpdateDTO.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/authorization/RoleUpdateDTO.java new file mode 100644 index 000000000..664120d2d --- /dev/null +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/authorization/RoleUpdateDTO.java @@ -0,0 +1,27 @@ +package cn.iocoder.mall.system.rest.request.authorization; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@ApiModel("管理员 - 角色模块 - 修改角色 Request") +@Data +@Accessors(chain = true) +public class RoleUpdateDTO { + + @ApiModelProperty(value = "角色编号", required = true, example = "123") + @NotNull(message = "角色编号不能为空") + private Integer id; + + @ApiModelProperty(value = "角色名字", required = true, example = "系统管理员") + @NotEmpty(message = "角色名字不能为空") + private String name; + + @ApiModelProperty(value = "角色编码", example = "SUPER_ADMIN") + private String code; + +} diff --git a/system/system-rpc-api/pom.xml b/system/system-rpc-api/pom.xml index 35bdfe646..61568b1cd 100644 --- a/system/system-rpc-api/pom.xml +++ b/system/system-rpc-api/pom.xml @@ -15,7 +15,7 @@ cn.iocoder.mall - system-biz-api + common-framework 1.0-SNAPSHOT diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java index 30a23c0b4..48bdebb6f 100644 --- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java +++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java @@ -7,15 +7,11 @@ import cn.iocoder.common.framework.util.CollectionUtil; import cn.iocoder.common.framework.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.system.api.AdminService; -import cn.iocoder.mall.system.api.bo.admin.AdminAuthenticationBO; -import cn.iocoder.mall.system.api.bo.admin.AdminAuthorizationBO; import cn.iocoder.mall.system.api.bo.admin.AdminBO; -import cn.iocoder.mall.system.api.bo.oauth2.OAuth2AccessTokenBO; import cn.iocoder.mall.system.api.bo.role.RoleBO; import cn.iocoder.mall.system.api.constant.AdminConstants; import cn.iocoder.mall.system.api.constant.AdminErrorCodeEnum; import cn.iocoder.mall.system.api.dto.admin.*; -import cn.iocoder.mall.system.api.dto.oauth2.OAuth2CreateTokenDTO; import cn.iocoder.mall.system.api.dto.oauth2.OAuth2RemoveTokenByUserDTO; import cn.iocoder.mall.admin.convert.AdminConvert; import cn.iocoder.mall.admin.dao.AdminMapper; @@ -29,7 +25,6 @@ import com.google.common.collect.Multimap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.DigestUtils; import java.util.*; import java.util.stream.Collectors;