From 4e38bf75caf5317278c2d4032030ea638f838af4 Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Mon, 27 Apr 2020 23:30:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202.=20=E6=B3=A8=E9=87=8A=E6=8E=89=E6=9A=82=E6=9C=AA=E5=9C=A8?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=B8=AD=E7=9A=84=E9=A1=B9=E7=9B=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/mall-spring-boot-starter-web/pom.xml                | 6 ++++++
 demo/pom.xml                                               | 2 +-
 mall-dependencies/pom.xml                                  | 7 +++++--
 order/pom.xml                                              | 2 +-
 pay/pom.xml                                                | 2 +-
 pom.xml                                                    | 7 -------
 product/pom.xml                                            | 2 +-
 promotion/pom.xml                                          | 2 +-
 search/pom.xml                                             | 2 +-
 system/pom.xml                                             | 2 +-
 .../mall/system/biz/dao/authorization/ResourceMapper.java  | 2 +-
 .../mall/system/biz/dao/authorization/RoleMapper.java      | 2 +-
 .../biz/service/authorization/ResourceServiceImpl.java     | 2 +-
 .../mall/system/biz/service/user/UserServiceImpl.java      | 2 +-
 system/system-rpc-api/pom.xml                              | 2 +-
 15 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/common/mall-spring-boot-starter-web/pom.xml b/common/mall-spring-boot-starter-web/pom.xml
index c78428cf0..c649798cf 100644
--- a/common/mall-spring-boot-starter-web/pom.xml
+++ b/common/mall-spring-boot-starter-web/pom.xml
@@ -39,6 +39,12 @@
             <artifactId>dubbo</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- 工具相关 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/demo/pom.xml b/demo/pom.xml
index 50d1176ad..094822a0c 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -25,7 +25,7 @@
         <dependencies>
             <dependency>
                 <groupId>cn.iocoder.mall</groupId>
-                <artifactId>common-dependencies</artifactId>
+                <artifactId>mall-dependencies</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
diff --git a/mall-dependencies/pom.xml b/mall-dependencies/pom.xml
index 467da3b1c..f5a17b15e 100644
--- a/mall-dependencies/pom.xml
+++ b/mall-dependencies/pom.xml
@@ -127,8 +127,11 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
-
-
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>${hibernate-validator.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/order/pom.xml b/order/pom.xml
index 116af0d2e..3fe0dbfaf 100644
--- a/order/pom.xml
+++ b/order/pom.xml
@@ -21,7 +21,7 @@
         <dependencies>
             <dependency>
                 <groupId>cn.iocoder.mall</groupId>
-                <artifactId>common-dependencies</artifactId>
+                <artifactId>mall-dependencies</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
diff --git a/pay/pom.xml b/pay/pom.xml
index 89320ffc4..2fc7124bd 100644
--- a/pay/pom.xml
+++ b/pay/pom.xml
@@ -21,7 +21,7 @@
         <dependencies>
             <dependency>
                 <groupId>cn.iocoder.mall</groupId>
-                <artifactId>common-dependencies</artifactId>
+                <artifactId>mall-dependencies</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
diff --git a/pom.xml b/pom.xml
index 2008dfae4..6212fd52d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,13 +204,6 @@
                 <version>${jackson.version}</version>
             </dependency>
 
-
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>6.0.19.Final</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 
diff --git a/product/pom.xml b/product/pom.xml
index 0e0fb4fa6..7e103f173 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -21,7 +21,7 @@
         <dependencies>
             <dependency>
                 <groupId>cn.iocoder.mall</groupId>
-                <artifactId>common-dependencies</artifactId>
+                <artifactId>mall-dependencies</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
diff --git a/promotion/pom.xml b/promotion/pom.xml
index a70375300..c055f0591 100644
--- a/promotion/pom.xml
+++ b/promotion/pom.xml
@@ -21,7 +21,7 @@
         <dependencies>
             <dependency>
                 <groupId>cn.iocoder.mall</groupId>
-                <artifactId>common-dependencies</artifactId>
+                <artifactId>mall-dependencies</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
diff --git a/search/pom.xml b/search/pom.xml
index 250fc31c5..865c280c6 100644
--- a/search/pom.xml
+++ b/search/pom.xml
@@ -21,7 +21,7 @@
         <dependencies>
             <dependency>
                 <groupId>cn.iocoder.mall</groupId>
-                <artifactId>common-dependencies</artifactId>
+                <artifactId>mall-dependencies</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
diff --git a/system/pom.xml b/system/pom.xml
index 2052279e4..ce815a2d3 100644
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -29,7 +29,7 @@
         <dependencies>
             <dependency>
                 <groupId>cn.iocoder.mall</groupId>
-                <artifactId>common-dependencies</artifactId>
+                <artifactId>mall-dependencies</artifactId>
                 <version>1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
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 c87c61cdd..669eff1b3 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 dc007a7e1..f19c515ab 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 e2088cd0e..3b80dc317 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 035f3b489..3c894b7a4 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 61568b1cd..35bdfe646 100644
--- a/system/system-rpc-api/pom.xml
+++ b/system/system-rpc-api/pom.xml
@@ -15,7 +15,7 @@
         <!-- Mall 相关 -->
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
-            <artifactId>common-framework</artifactId>
+            <artifactId>system-biz-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>