1. system 提供新的 Resource 相关接口

2. admin-web 接入新的 Resource 相关接口

common/common-dependencies/pom.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>common</artifactId>
-        <groupId>cn.iocoder.mall</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>common-dependencies</artifactId>
-    <packaging>pom</packaging>
-    <name>Onemall Dependencies</name>
-    <description>Maven Bom，定义 Onemall 项目的所有依赖的版本</description>
-
-    <!-- 属性 -->
-    <properties>
-        <!-- TODO Spring Boot && Spring Cloud && Spring Cloud Alibaba -->
-        <spring.boot.version>2.2.4.RELEASE</spring.boot.version>
-        <spring.cloud.version>Hoxton.SR1</spring.cloud.version>
-        <spring.cloud.alibaba.version>2.2.0.RELEASE</spring.cloud.alibaba.version>
-        <!-- RPC 相关 -->
-        <dubbo.version>2.7.1</dubbo.version>
-        <!-- Transaction 相关 -->
-        <seata.version>1.1.0</seata.version>
-        <!-- 监控相关 -->
-        <skywalking.version>7.0.0</skywalking.version>
-    </properties>
-
-    <!-- 依赖管理 -->
-    <dependencyManagement>
-        <!-- TODO Spring Boot && Spring Cloud && Spring Cloud Alibaba -->
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>${spring.boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring.cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring.cloud.alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- RPC 相关 -->
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo</artifactId>
-                <version>${dubbo.version}</version>
-            </dependency>
-
-            <!-- Transaction 相关 -->
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-spring-boot-starter</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
-
-            <!-- 监控相关 -->
-            <dependency>
-                <groupId>org.apache.skywalking</groupId>
-                <artifactId>apm-toolkit-trace</artifactId>
-                <version>${skywalking.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-</project>

common/common-framework/pom.xml

@@ -32,21 +32,6 @@
             <artifactId>swagger-annotations</artifactId>
         </dependency>
 
-        <!-- DB 相关  -->
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-annotation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-core</artifactId>
-        </dependency>
-
         <!-- RPC 相关  -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
@@ -71,11 +56,6 @@
             <artifactId>hibernate-validator</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

common/mall-spring-boot-starter-mybatis/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>common</artifactId>
+        <groupId>cn.iocoder.mall</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mall-spring-boot-starter-mybatis</artifactId>
+
+    <dependencies>
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 工具相关 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

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;
     }
-}
+}

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;
 

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 状态

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<T> extends QueryWrapper<T> {
     }
 
     public QueryWrapperX<T> inIfPresent(String column, Collection<?> values) {
-        if (!CollectionUtil.isEmpty(values)) {
+        if (!CollectionUtils.isEmpty(values)) {
             return (QueryWrapperX<T>) super.in(column, values);
         }
         return this;
     }
 
     public QueryWrapperX<T> inIfPresent(String column, Object... values) {
-        if (!CollectionUtil.isEmpty(values)) {
+        if (!ArrayUtils.isEmpty(values)) {
             return (QueryWrapperX<T>) super.in(column, values);
         }
         return this;

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;

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;

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;

common/pom.xml

@@ -14,10 +14,10 @@
     <modules>
         <module>common-framework</module>
         <module>mall-spring-boot</module>
-        <module>common-dependencies</module>
         <module>mall-spring-boot-starter-swagger</module>
         <module>mall-spring-boot-starter-web</module>
         <module>mall-spring-boot-starter-security</module>
+        <module>mall-spring-boot-starter-mybatis</module>
     </modules>
 
     <dependencyManagement>

mall-dependencies/pom.xml

@@ -23,12 +23,19 @@
         <spring.cloud.alibaba.version>2.2.0.RELEASE</spring.cloud.alibaba.version>
         <!-- Web 相关 -->
         <knife4j.version>2.0.2</knife4j.version>
+        <!-- DB 相关 -->
+        <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>
         <!-- RPC 相关 -->
         <dubbo.version>2.7.1</dubbo.version>
         <!-- Transaction 相关 -->
         <seata.version>1.1.0</seata.version>
         <!-- 监控相关 -->
         <skywalking.version>7.0.0</skywalking.version>
+        <!-- 工具类相关 -->
+        <fastjson.version>1.2.56</fastjson.version>
+        <hibernate-validator.version>6.0.16.Final</hibernate-validator.version>
     </properties>
 
     <!-- 依赖管理 -->
@@ -57,6 +64,34 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- DB 相关 -->
+            <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>
+                <version>${mybatis-spring-boot-starter.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-core</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-jdbc</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <!-- Web 相关 -->
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
@@ -85,6 +120,14 @@
                 <version>${skywalking.version}</version>
             </dependency>
 
+            <!-- 工具类相关 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+
 
         </dependencies>
     </dependencyManagement>

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;
-
 /**
  * 订单关闭
  *

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;

pay/pay-service-impl/src/main/resources/mapper/PayNotifyTaskMapper.xml

@@ -11,10 +11,10 @@
     <resultMap id="PayNotifyTaskResultMap" type="PayNotifyTaskDO">
         <result property="transaction" column="transaction"
                 javaType="cn.iocoder.mall.pay.biz.dataobject.PayNotifyTaskDO$Transaction"
-                typeHandler="cn.iocoder.common.framework.mybatis.JSONTypeHandler"/>
+                typeHandler="cn.iocoder.mall.mybatis.type.JSONTypeHandler"/>
         <result property="refund" column="refund"
                 javaType="cn.iocoder.mall.pay.biz.dataobject.PayNotifyTaskDO$Refund"
-                typeHandler="cn.iocoder.common.framework.mybatis.JSONTypeHandler"/>
+                typeHandler="cn.iocoder.mall.mybatis.type.JSONTypeHandler"/>
     </resultMap>
 
     <insert id="insert" parameterType="PayNotifyTaskDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">

pom.xml

@@ -14,16 +14,16 @@
     <artifactId>onemall</artifactId>
     <version>1.0-SNAPSHOT</version>
     <modules>
-        <module>product</module>
+<!--        <module>product</module>-->
-        <module>order</module>
+<!--        <module>order</module>-->
-        <module>user</module>
+<!--        <module>user</module>-->
         <module>common</module>
         <module>system</module>
-        <module>ops</module>
+<!--        <module>ops</module>-->
-        <module>pay</module>
+<!--        <module>pay</module>-->
-        <module>promotion</module>
+<!--        <module>promotion</module>-->
-        <module>search</module>
+<!--        <module>search</module>-->
-        <module>demo</module>
+<!--        <module>demo</module>-->
         <module>mall-dependencies</module>
     </modules>
     <packaging>pom</packaging>
@@ -43,9 +43,7 @@
         <swagger.version>1.5.21</swagger.version>
         <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>
 
@@ -61,8 +59,6 @@
         <aliyun-java-sdk-core.version>4.1.0</aliyun-java-sdk-core.version>
 
         <java.version>1.8</java.version>
-        <hibernate-validator.version>6.0.16.Final</hibernate-validator.version>
-        <fastjson.version>1.2.56</fastjson.version>
     </properties>
 
     <dependencyManagement>
@@ -135,38 +131,6 @@
                 <version>${druid.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>
-                <version>${mybatis-spring-boot-starter.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-annotation</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-core</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>${mybatis-plus.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-starter-jdbc</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <!-- Job 相关 -->
             <dependency>
                 <groupId>com.xuxueli</groupId>
@@ -240,16 +204,11 @@
                 <version>${jackson.version}</version>
             </dependency>
 
+
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator</artifactId>
-                <version>${hibernate-validator.version}</version>
+                <version>6.0.19.Final</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
             </dependency>
 
         </dependencies>

promotion/promotion-service-impl/src/main/resources/mapper/PromotionActivityMapper.xml

@@ -9,8 +9,8 @@
     </sql>
 
     <resultMap id="PromotionActivityResultMap" type="PromotionActivityDO">
-        <result property="timeLimitedDiscount" column="time_limited_discount" javaType="cn.iocoder.mall.promotion.biz.dataobject.PromotionActivityDO$TimeLimitedDiscount" typeHandler="cn.iocoder.common.framework.mybatis.JSONTypeHandler"/>
+        <result property="timeLimitedDiscount" column="time_limited_discount" javaType="cn.iocoder.mall.promotion.biz.dataobject.PromotionActivityDO$TimeLimitedDiscount" typeHandler="cn.iocoder.mall.mybatis.type.JSONTypeHandler"/>
-        <result property="fullPrivilege" column="full_privilege" javaType="cn.iocoder.mall.promotion.biz.dataobject.PromotionActivityDO$FullPrivilege" typeHandler="cn.iocoder.common.framework.mybatis.JSONTypeHandler"/>
+        <result property="fullPrivilege" column="full_privilege" javaType="cn.iocoder.mall.promotion.biz.dataobject.PromotionActivityDO$FullPrivilege" typeHandler="cn.iocoder.mall.mybatis.type.JSONTypeHandler"/>
     </resultMap>
 
 <!--    <select id="selectListByPidAndStatusOrderBySort" resultType="PromotionActivityDO">-->

system/system-biz/pom.xml

@@ -43,9 +43,11 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.baomidou</groupId>
+            <groupId>cn.iocoder.mall</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mall-spring-boot-starter-mybatis</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <!-- 短信平台 阿里云、云片 -->
@@ -71,6 +73,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;
+
+}

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;
+
+}

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 {
 

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;
+
+}

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;
+
 }

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

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;
+
+}

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;
+
+}

system/system-rpc-api/pom.xml

@@ -15,7 +15,7 @@
         <!-- Mall 相关 -->
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
-            <artifactId>system-biz-api</artifactId>
+            <artifactId>common-framework</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 

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;