From 36018c84dadbec2a61e067dbc79f69dc1e502090 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 11 May 2019 18:12:22 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=80=E4=BA=9B=20bug=20=EF=BC=8C=E5=BC=95=E5=85=A5?=
 =?UTF-8?q?=E9=94=99=E5=8C=85=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/common-framework/pom.xml               |  1 -
 pom.xml                                       | 26 +++++++++++++++++++
 promotion/promotion-application/pom.xml       |  5 ++++
 search/search-application/pom.xml             |  5 ++++
 .../mall/admin/api/dto/AdminAddDTO.java       |  3 ++-
 .../mall/admin/api/dto/AdminPageDTO.java      |  3 ++-
 .../mall/admin/api/dto/AdminUpdateDTO.java    |  3 ++-
 .../mall/admin/api/dto/DataDictAddDTO.java    |  3 ++-
 .../mall/admin/api/dto/DataDictUpdateDTO.java |  3 ++-
 .../admin/api/dto/ExceptionLogAddDTO.java     |  3 ++-
 .../mall/admin/api/dto/ResourceAddDTO.java    |  3 ++-
 .../mall/admin/api/dto/ResourceUpdateDTO.java |  3 ++-
 .../mall/admin/api/dto/RoleAddDTO.java        |  3 ++-
 .../mall/admin/api/dto/RolePageDTO.java       |  4 ++-
 .../mall/admin/api/dto/RoleUpdateDTO.java     |  3 ++-
 .../main/resources/config/application.yaml    | 22 ++++++++--------
 16 files changed, 70 insertions(+), 23 deletions(-)

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 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index 46eb2efa3..363510e39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
         <springfox-swagger.version>2.9.2</springfox-swagger.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.version>3.5.1</mybatis.version>
         <mybatis-plus.version>3.1.1</mybatis-plus.version>
         <xxl-job.version>2.0.1</xxl-job.version>
         <guava.version>27.0.1-jre</guava.version>
@@ -49,6 +50,8 @@
 
         <qiniu.version>7.2.18</qiniu.version>
 
+        <seata.version>0.5.1</seata.version>
+
         <java.version>1.8</java.version>
     </properties>
 
@@ -137,6 +140,11 @@
                 <version>${swagger-bootstrap-ui.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis</artifactId>
+                <version>${mybatis.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
                 <artifactId>mybatis-spring-boot-starter</artifactId>
@@ -204,6 +212,24 @@
                 <optional>true</optional>
             </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>
     </dependencyManagement>
 
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 @@
             <artifactId>common-framework</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>mall-spring-boot</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
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 @@
             <artifactId>search-service-impl</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>system-service-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
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: