diff --git a/common/common-framework/pom.xml b/common/common-framework/pom.xml index 82ed1d073..a98245a4c 100644 --- a/common/common-framework/pom.xml +++ b/common/common-framework/pom.xml @@ -69,7 +69,6 @@ org.mybatis mybatis - 3.5.1 com.fasterxml.jackson.core diff --git a/pom.xml b/pom.xml index 46eb2efa3..363510e39 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ 2.9.2 1.9.3 2.0.0 + 3.5.1 3.1.1 2.0.1 27.0.1-jre @@ -49,6 +50,8 @@ 7.2.18 + 0.5.1 + 1.8 @@ -137,6 +140,11 @@ ${swagger-bootstrap-ui.version} + + org.mybatis + mybatis + ${mybatis.version} + org.mybatis.spring.boot mybatis-spring-boot-starter @@ -204,6 +212,24 @@ true + + io.seata + seata-spring + ${seata.version} + + + + io.seata + seata-dubbo + ${seata.version} + + + + io.seata + seata-dubbo-alibaba + ${seata.version} + + diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index debb678aa..b6b11aac4 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -17,6 +17,11 @@ common-framework 1.0-SNAPSHOT + + cn.iocoder.mall + mall-spring-boot + 1.0-SNAPSHOT + cn.iocoder.mall diff --git a/search/search-application/pom.xml b/search/search-application/pom.xml index 540a03aa4..095f3be8e 100644 --- a/search/search-application/pom.xml +++ b/search/search-application/pom.xml @@ -37,6 +37,11 @@ search-service-impl 1.0-SNAPSHOT + + cn.iocoder.mall + system-service-api + 1.0-SNAPSHOT + org.springframework.boot diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java index da242b6bc..822fcb005 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java @@ -6,13 +6,14 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; +import java.io.Serializable; /** * 管理员添加 DTO */ @Data @Accessors(chain = true) -public class AdminAddDTO { +public class AdminAddDTO implements Serializable { /** * 登陆账号 diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java index 9f32e9d25..8a347793d 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java @@ -4,13 +4,14 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 管理员分页 DTO */ @Data @Accessors(chain = true) -public class AdminPageDTO { +public class AdminPageDTO implements Serializable { /** * 昵称，模糊匹配 diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java index 6700b708f..8399faeb3 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java @@ -7,13 +7,14 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import java.io.Serializable; /** * 管理员更新 DTO */ @Data @Accessors(chain = true) -public class AdminUpdateDTO { +public class AdminUpdateDTO implements Serializable { /** * 管理员编号 diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java index e8728ca12..ca451df94 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java @@ -5,13 +5,14 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 数据字典添加 DTO */ @Data @Accessors(chain = true) -public class DataDictAddDTO { +public class DataDictAddDTO implements Serializable { /** * 大类枚举值 diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java index 02735be66..582f958ce 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java @@ -5,13 +5,14 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 数据字典更新 DTO */ @Data @Accessors(chain = true) -public class DataDictUpdateDTO { +public class DataDictUpdateDTO implements Serializable { /** * 编号 diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ExceptionLogAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ExceptionLogAddDTO.java index 737280124..5767238f9 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ExceptionLogAddDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ExceptionLogAddDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -11,7 +12,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -public class ExceptionLogAddDTO { +public class ExceptionLogAddDTO implements Serializable { /** * 用户编号 - 空 diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java index ae413a55b..4892adad9 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java @@ -5,13 +5,14 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 资源添加 DTO */ @Data @Accessors(chain = true) -public class ResourceAddDTO { +public class ResourceAddDTO implements Serializable { /** * 资源名字（标识） diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java index 279a4a822..ee915e59f 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java @@ -5,13 +5,14 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 资源更新 DTO */ @Data @Accessors(chain = true) -public class ResourceUpdateDTO { +public class ResourceUpdateDTO implements Serializable { /** * 资源编号 diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java index 56bcc8804..02268f4a2 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java @@ -4,13 +4,14 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotEmpty; +import java.io.Serializable; /** * 角色添加 DTO */ @Data @Accessors(chain = true) -public class RoleAddDTO { +public class RoleAddDTO implements Serializable { /** * 角色名字（标识） diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java index bd53f34af..3f7ee4c80 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java @@ -3,12 +3,14 @@ package cn.iocoder.mall.admin.api.dto; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 角色分页 DTO */ @Data @Accessors(chain = true) -public class RolePageDTO { +public class RolePageDTO implements Serializable { private Integer pageNo; private Integer pageSize; diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java index 7d97e6e17..66e2d7bb4 100644 --- a/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java +++ b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java @@ -5,13 +5,14 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 角色添加 DTO */ @Data @Accessors(chain = true) -public class RoleUpdateDTO { +public class RoleUpdateDTO implements Serializable { /** * 角色编号 diff --git a/user/user-service-impl/src/main/resources/config/application.yaml b/user/user-service-impl/src/main/resources/config/application.yaml index 4d4edb0fb..8d8573feb 100644 --- a/user/user-service-impl/src/main/resources/config/application.yaml +++ b/user/user-service-impl/src/main/resources/config/application.yaml @@ -7,19 +7,19 @@ spring: password: ${MALL_MYSQL_PASSWORD} # mybatis -#mybatis: -# config-location: classpath:mybatis-config.xml -# mapper-locations: classpath:mapper/*.xml -# type-aliases-package: cn.iocoder.mall.user.biz.dataobject +mybatis: + config-location: classpath:mybatis-config.xml + mapper-locations: classpath:mapper/*.xml + type-aliases-package: cn.iocoder.mall.user.biz.dataobject # mybatis-plus -mybatis-plus: - configuration: - mapUnderscoreToCamelCase: true # 虽然默认为 true ，但是还是显示去指定下。 - mapperLocations: classpath*:mapper/*.xml - typeAliasesPackage: cn.iocoder.mall.user.biz.dataobject - mapper-locations: classpath*:mapper/*.xml - type-aliases-package: cn.iocoder.mall.user.biz.dataobject +#mybatis-plus: +# configuration: +# mapUnderscoreToCamelCase: true # 虽然默认为 true ，但是还是显示去指定下。 +# mapperLocations: classpath*:mapper/*.xml +# typeAliasesPackage: cn.iocoder.mall.user.biz.dataobject +# mapper-locations: classpath*:mapper/*.xml +# type-aliases-package: cn.iocoder.mall.user.biz.dataobject # dubbo dubbo: