提交 36018c84 authored 作者: YunaiV's avatar YunaiV

- 后端:修复一些 bug ,引入错包的问题。

上级 ec2151c9
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
<version>3.5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<springfox-swagger.version>2.9.2</springfox-swagger.version> <springfox-swagger.version>2.9.2</springfox-swagger.version>
<swagger-bootstrap-ui.version>1.9.3</swagger-bootstrap-ui.version> <swagger-bootstrap-ui.version>1.9.3</swagger-bootstrap-ui.version>
<mybatis-spring-boot-starter.version>2.0.0</mybatis-spring-boot-starter.version> <mybatis-spring-boot-starter.version>2.0.0</mybatis-spring-boot-starter.version>
<mybatis.version>3.5.1</mybatis.version>
<mybatis-plus.version>3.1.1</mybatis-plus.version> <mybatis-plus.version>3.1.1</mybatis-plus.version>
<xxl-job.version>2.0.1</xxl-job.version> <xxl-job.version>2.0.1</xxl-job.version>
<guava.version>27.0.1-jre</guava.version> <guava.version>27.0.1-jre</guava.version>
...@@ -49,6 +50,8 @@ ...@@ -49,6 +50,8 @@
<qiniu.version>7.2.18</qiniu.version> <qiniu.version>7.2.18</qiniu.version>
<seata.version>0.5.1</seata.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>
...@@ -137,6 +140,11 @@ ...@@ -137,6 +140,11 @@
<version>${swagger-bootstrap-ui.version}</version> <version>${swagger-bootstrap-ui.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
...@@ -204,6 +212,24 @@ ...@@ -204,6 +212,24 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring</artifactId>
<version>${seata.version}</version>
</dependency>
<!--dependency for Apache Dubbo-->
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-dubbo</artifactId>
<version>${seata.version}</version>
</dependency>
<!--dependency for Alibaba Dubbo-->
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-dubbo-alibaba</artifactId>
<version>${seata.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
...@@ -17,6 +17,11 @@ ...@@ -17,6 +17,11 @@
<artifactId>common-framework</artifactId> <artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>mall-spring-boot</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
......
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
<artifactId>search-service-impl</artifactId> <artifactId>search-service-impl</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>system-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -6,13 +6,14 @@ import org.hibernate.validator.constraints.Length; ...@@ -6,13 +6,14 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable;
/** /**
* 管理员添加 DTO * 管理员添加 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class AdminAddDTO { public class AdminAddDTO implements Serializable {
/** /**
* 登陆账号 * 登陆账号
......
...@@ -4,13 +4,14 @@ import lombok.Data; ...@@ -4,13 +4,14 @@ import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 管理员分页 DTO * 管理员分页 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class AdminPageDTO { public class AdminPageDTO implements Serializable {
/** /**
* 昵称,模糊匹配 * 昵称,模糊匹配
......
...@@ -7,13 +7,14 @@ import org.hibernate.validator.constraints.Length; ...@@ -7,13 +7,14 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable;
/** /**
* 管理员更新 DTO * 管理员更新 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class AdminUpdateDTO { public class AdminUpdateDTO implements Serializable {
/** /**
* 管理员编号 * 管理员编号
......
...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors; ...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 数据字典添加 DTO * 数据字典添加 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class DataDictAddDTO { public class DataDictAddDTO implements Serializable {
/** /**
* 大类枚举值 * 大类枚举值
......
...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors; ...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 数据字典更新 DTO * 数据字典更新 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class DataDictUpdateDTO { public class DataDictUpdateDTO implements Serializable {
/** /**
* 编号 * 编号
......
...@@ -4,6 +4,7 @@ import lombok.Data; ...@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
...@@ -11,7 +12,7 @@ import java.util.Date; ...@@ -11,7 +12,7 @@ import java.util.Date;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class ExceptionLogAddDTO { public class ExceptionLogAddDTO implements Serializable {
/** /**
* 用户编号 - 空 * 用户编号 - 空
......
...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors; ...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 资源添加 DTO * 资源添加 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class ResourceAddDTO { public class ResourceAddDTO implements Serializable {
/** /**
* 资源名字(标识) * 资源名字(标识)
......
...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors; ...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 资源更新 DTO * 资源更新 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class ResourceUpdateDTO { public class ResourceUpdateDTO implements Serializable {
/** /**
* 资源编号 * 资源编号
......
...@@ -4,13 +4,14 @@ import lombok.Data; ...@@ -4,13 +4,14 @@ import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
/** /**
* 角色添加 DTO * 角色添加 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class RoleAddDTO { public class RoleAddDTO implements Serializable {
/** /**
* 角色名字(标识) * 角色名字(标识)
......
...@@ -3,12 +3,14 @@ package cn.iocoder.mall.admin.api.dto; ...@@ -3,12 +3,14 @@ package cn.iocoder.mall.admin.api.dto;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 角色分页 DTO * 角色分页 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class RolePageDTO { public class RolePageDTO implements Serializable {
private Integer pageNo; private Integer pageNo;
private Integer pageSize; private Integer pageSize;
......
...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors; ...@@ -5,13 +5,14 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 角色添加 DTO * 角色添加 DTO
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class RoleUpdateDTO { public class RoleUpdateDTO implements Serializable {
/** /**
* 角色编号 * 角色编号
......
...@@ -7,19 +7,19 @@ spring: ...@@ -7,19 +7,19 @@ spring:
password: ${MALL_MYSQL_PASSWORD} password: ${MALL_MYSQL_PASSWORD}
# mybatis # mybatis
#mybatis: mybatis:
# config-location: classpath:mybatis-config.xml config-location: classpath:mybatis-config.xml
# mapper-locations: classpath:mapper/*.xml mapper-locations: classpath:mapper/*.xml
# type-aliases-package: cn.iocoder.mall.user.biz.dataobject type-aliases-package: cn.iocoder.mall.user.biz.dataobject
# mybatis-plus # mybatis-plus
mybatis-plus: #mybatis-plus:
configuration: # configuration:
mapUnderscoreToCamelCase: true # 虽然默认为 true ,但是还是显示去指定下。 # mapUnderscoreToCamelCase: true # 虽然默认为 true ,但是还是显示去指定下。
mapperLocations: classpath*:mapper/*.xml # mapperLocations: classpath*:mapper/*.xml
typeAliasesPackage: cn.iocoder.mall.user.biz.dataobject # typeAliasesPackage: cn.iocoder.mall.user.biz.dataobject
mapper-locations: classpath*:mapper/*.xml # mapper-locations: classpath*:mapper/*.xml
type-aliases-package: cn.iocoder.mall.user.biz.dataobject # type-aliases-package: cn.iocoder.mall.user.biz.dataobject
# dubbo # dubbo
dubbo: dubbo:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论