为解决定时器关闭不能结束进程的问题，重构项目，拆分kmall-schedule，新增kmall-manager

kmall-admin/pom.xml

@@ -21,16 +21,17 @@
             <artifactId>kmall-common</artifactId>
             <version>${kmall-version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.kmall</groupId>
             <artifactId>kmall-gen</artifactId>
             <version>${kmall-version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.kmall</groupId>
             <artifactId>kmall-schedule</artifactId>
             <version>${kmall-version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.kmall</groupId>
             <artifactId>kmall-api</artifactId>
@@ -41,22 +42,51 @@
 
     <build>
         <scriptSourceDirectory>src/main/java</scriptSourceDirectory>
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                </includes>
             </resource>
             <resource>
                 <directory>src/main/java</directory>
                 <filtering>true</filtering>
                 <includes>
                     <include>**/*.xml</include>
+                    <include>**/*.properties</include>
                 </includes>
             </resource>
         </resources>
+
         <plugins>
+
+            <!-- 拷贝依赖的jar包到lib目录 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependency</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <excludeTransitive>false</excludeTransitive>
+                            <stripVersion>false</stripVersion>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>${maven.war.version}</version>
                 <configuration>
                     <warSourceDirectory>src/main/webapp</warSourceDirectory>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -70,6 +100,7 @@
                 </configuration>
             </plugin>
         </plugins>
+
     </build>
 
 </project>

kmall-admin/src/main/java/com/kmall/admin/aop/DataFilterAspect.java

@@ -1,11 +1,11 @@
 package com.kmall.admin.aop;
 
 import com.kmall.admin.annotation.DataFilter;
-import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.service.SysRoleDeptService;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.service.SysRoleDeptService;
 import com.kmall.common.utils.Constant;
 import com.kmall.common.utils.RRException;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import org.apache.commons.lang.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;

kmall-admin/src/main/java/com/kmall/admin/aop/SysLogAspect.java

@@ -2,12 +2,12 @@ package com.kmall.admin.aop;
 
 import com.alibaba.fastjson.JSON;
 import com.kmall.common.annotation.SysLog;
-import com.kmall.common.entity.SysLogEntity;
-import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.service.SysLogService;
+import com.kmall.manager.entity.SysLogEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.manager.service.SysLogService;
 import com.kmall.common.utils.HttpContextUtils;
 import com.kmall.common.utils.IPUtils;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;

kmall-admin/src/main/java/com/kmall/admin/controller/CouponController.java

@@ -3,11 +3,9 @@ package com.kmall.admin.controller;
 import com.kmall.admin.entity.CouponEntity;
 import com.kmall.admin.service.CouponService;
 import com.kmall.admin.utils.ParamUtils;
-import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

kmall-admin/src/main/java/com/kmall/admin/controller/ExportExceptionDataController.java

@@ -6,11 +6,11 @@ import java.util.Map;
 import com.kmall.admin.entity.ExportExceptionDataEntity;
 import com.kmall.admin.service.ExportExceptionDataService;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

kmall-admin/src/main/java/com/kmall/admin/controller/FeedbackController.java

@@ -3,11 +3,11 @@ package com.kmall.admin.controller;
 import com.kmall.admin.entity.FeedbackEntity;
 import com.kmall.admin.service.FeedbackService;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

kmall-admin/src/main/java/com/kmall/admin/controller/FreightController.java

@@ -8,7 +8,6 @@ import com.kmall.admin.entity.FreightEntity;
 import com.kmall.admin.entity.FreightItemEntity;
 import com.kmall.admin.service.FreightService;
 import com.kmall.admin.utils.ParamUtils;
-import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsController.java

@@ -9,9 +9,10 @@ import com.kmall.admin.service.GoodsService;
 import com.kmall.admin.service.OfflineCartService;
 import com.kmall.admin.service.StoreService;
 import com.kmall.admin.utils.ParamUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.constant.JxlsXmlTemplateName;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.*;
 import com.kmall.common.utils.excel.ExcelUtil;
 import org.apache.commons.lang3.StringUtils;

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsIssueController.java

@@ -3,8 +3,9 @@ package com.kmall.admin.controller;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.entity.GoodsIssueEntity;
 import com.kmall.admin.service.GoodsIssueService;
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

kmall-admin/src/main/java/com/kmall/admin/controller/HelpIssueController.java

@@ -3,8 +3,9 @@ package com.kmall.admin.controller;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.entity.HelpIssueEntity;
 import com.kmall.admin.service.HelpIssueService;
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

kmall-admin/src/main/java/com/kmall/admin/controller/MerchController.java

@@ -6,11 +6,9 @@ import java.util.Map;
 import com.kmall.admin.entity.MerchEntity;
 import com.kmall.admin.service.MerchService;
 import com.kmall.admin.utils.ParamUtils;
-import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

kmall-admin/src/main/java/com/kmall/admin/controller/OfflineCartController.java

@@ -8,11 +8,11 @@ import com.kmall.admin.entity.GoodsEntity;
 import com.kmall.admin.entity.OfflineCartEntity;
 import com.kmall.admin.service.GoodsService;
 import com.kmall.admin.service.OfflineCartService;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -1,27 +1,25 @@
 package com.kmall.admin.controller;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.kmall.admin.entity.*;
+import com.kmall.manager.manager.wechat.WechatUtil;
+import com.kmall.manager.manager.wechat.WechatGlobalUtil;
+import com.kmall.manager.manager.wechat.wxglobal.dto.WechatGlobalRefundApiResult;
 import com.kmall.admin.service.*;
 import com.kmall.admin.service.OrderExceptionRecordService;
 import com.kmall.admin.service.OrderProcessRecordService;
 import com.kmall.admin.service.OrderService;
 import com.kmall.admin.utils.ParamUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.*;
 import com.kmall.common.utils.excel.ExcelExport;
-import com.kmall.common.utils.excel.ExcelUtil;
-import com.kmall.common.utils.pingan.PinganUtil;
-import com.kmall.common.utils.pingan.dto.PinganResponseDto;
+import com.kmall.manager.manager.pingan.PinganUtil;
+import com.kmall.manager.manager.pingan.dto.PinganResponseDto;
 import com.kmall.common.utils.print.ticket.item.Ticket;
 import com.kmall.common.utils.wechat.WechatMicropayApiResult;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatReverseApiResult;
-import com.kmall.common.utils.wechat.WechatUtil;
-import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
-import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalRefundApiResult;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -32,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

kmall-admin/src/main/java/com/kmall/admin/controller/OrderRefundController.java

@@ -7,12 +7,11 @@ import com.kmall.admin.entity.OrderRefundEntity;
 import com.kmall.admin.service.OrderRefundService;
 import com.kmall.admin.utils.ParamUtils;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.service.SysUserService;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.service.SysUserService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

kmall-admin/src/main/java/com/kmall/admin/controller/StoreController.java

@@ -4,18 +4,16 @@ import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.entity.StoreEntity;
 import com.kmall.admin.service.StoreService;
 import com.kmall.admin.utils.ParamUtils;
-import com.kmall.api.service.pay.wxpay.WxPayPropertiesBuilder;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.utils.ShiroUtils;
+import com.kmall.manager.manager.pay.wxpay.WxPayPropertiesBuilder;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.fileserver.util.FileManager;
 import com.kmall.common.utils.*;
 import com.kmall.common.utils.wechat.AccessToken;
-import com.kmall.common.utils.wxtemplate.WxTemplateUtil;
+import com.kmall.manager.manager.wechat.wxtemplate.WxTemplateUtil;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItem;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.util.EntityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

kmall-admin/src/main/java/com/kmall/admin/controller/SupplierController.java

@@ -6,8 +6,6 @@ import java.util.Map;
 import com.kmall.admin.entity.SupplierEntity;
 import com.kmall.admin.service.SupplierService;
 import com.kmall.admin.utils.ParamUtils;
-import com.kmall.api.service.common.CommonPropertiesBuilder;
-import com.kmall.api.service.merch.OmsMerchPropertiesBuilder;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;

kmall-admin/src/main/java/com/kmall/admin/controller/SysConfigController.java

@@ -1,9 +1,9 @@
 package com.kmall.admin.controller;
 
 import com.kmall.common.annotation.SysLog;
-import com.kmall.common.controller.AbstractController;
-import com.kmall.common.entity.SysConfigEntity;
-import com.kmall.common.service.SysConfigService;
+import com.kmall.admin.fromcomm.controller.AbstractController;
+import com.kmall.admin.fromcomm.entity.SysConfigEntity;
+import com.kmall.admin.fromcomm.service.SysConfigService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;

kmall-admin/src/main/java/com/kmall/admin/controller/SysCusNationCodeController.java

@@ -6,11 +6,11 @@ import java.util.Map;
 
 import com.kmall.admin.entity.SysCusNationCodeEntity;
 import com.kmall.admin.service.SysCusNationCodeService;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

kmall-admin/src/main/java/com/kmall/admin/controller/SysCusUnitCodeController.java

@@ -6,11 +6,11 @@ import java.util.Map;
 
 import com.kmall.admin.entity.SysCusUnitCodeEntity;
 import com.kmall.admin.service.SysCusUnitCodeService;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

kmall-admin/src/main/java/com/kmall/admin/controller/SysDeptController.java

@@ -2,7 +2,7 @@ package com.kmall.admin.controller;
 
 import com.kmall.admin.entity.SysDeptEntity;
 import com.kmall.admin.service.SysDeptService;
-import com.kmall.common.controller.AbstractController;
+import com.kmall.admin.fromcomm.controller.AbstractController;
 import com.kmall.common.utils.Constant;
 import com.kmall.common.utils.R;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

kmall-admin/src/main/java/com/kmall/admin/controller/SysLogController.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.controller;
 
-import com.kmall.common.entity.SysLogEntity;
-import com.kmall.common.service.SysLogService;
+import com.kmall.manager.entity.SysLogEntity;
+import com.kmall.manager.service.SysLogService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;

kmall-admin/src/main/java/com/kmall/admin/controller/SysOssController.java

@@ -4,8 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.kmall.admin.entity.SysOssEntity;
 import com.kmall.common.fileserver.util.FileManager;
 import com.kmall.common.oss.CloudStorageConfig;
-import com.kmall.common.oss.OSSFactory;
-import com.kmall.common.service.SysConfigService;
+import com.kmall.admin.fromcomm.service.SysConfigService;
 import com.kmall.admin.service.SysOssService;
 import com.kmall.common.utils.*;
 import com.kmall.common.validator.ValidatorUtils;

kmall-admin/src/main/java/com/kmall/admin/controller/SysRegionController.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.controller;
 
-import com.kmall.common.cache.RegionCacheUtil;
-import com.kmall.common.entity.SysRegionEntity;
+import com.kmall.api.fromcomm.cache.RegionCacheUtil;
+import com.kmall.manager.entity.SysRegionEntity;
 import com.kmall.admin.service.SysRegionService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;

kmall-admin/src/main/java/com/kmall/admin/controller/SysSmsLogController.java

@@ -2,11 +2,10 @@ package com.kmall.admin.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.kmall.admin.utils.ParamUtils;
-import com.kmall.common.entity.SmsConfig;
-import com.kmall.common.entity.SysSmsLogEntity;
-import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.service.SysConfigService;
-import com.kmall.common.service.SysSmsLogService;
+import com.kmall.admin.fromcomm.entity.SmsConfig;
+import com.kmall.manager.entity.SysSmsLogEntity;
+import com.kmall.admin.fromcomm.service.SysConfigService;
+import com.kmall.manager.service.SysSmsLogService;
 import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

kmall-admin/src/main/java/com/kmall/admin/controller/ThirdMerchantBizController.java

@@ -9,8 +9,9 @@ import com.kmall.admin.entity.ThirdMerchantBizEntity;
 import com.kmall.admin.service.StoreService;
 import com.kmall.admin.service.ThirdMerchantBizService;
 import com.kmall.admin.utils.ParamUtils;
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

kmall-admin/src/main/java/com/kmall/admin/controller/UserController.java

@@ -3,11 +3,9 @@ package com.kmall.admin.controller;
 import com.kmall.admin.entity.UserEntity;
 import com.kmall.admin.service.UserService;
 import com.kmall.admin.utils.ParamUtils;
-import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
 import com.kmall.common.utils.excel.ExcelExport;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

kmall-admin/src/main/java/com/kmall/admin/dao/AdDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.AdEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/AdPositionDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.AdPositionEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 /**
  * Dao
  *

kmall-admin/src/main/java/com/kmall/admin/dao/AddressDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.AddressEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/AttributeCategoryDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.AttributeCategoryEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/AttributeDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.AttributeEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/BrandDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.BrandEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

kmall-admin/src/main/java/com/kmall/admin/dao/CartDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.CartEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 

kmall-admin/src/main/java/com/kmall/admin/dao/CategoryDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.CategoryEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

kmall-admin/src/main/java/com/kmall/admin/dao/ChannelDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.ChannelEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/CollectDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.CollectEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 

kmall-admin/src/main/java/com/kmall/admin/dao/CommentDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.CommentEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/CommentPictureDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.CommentPictureEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 评价图片Dao

kmall-admin/src/main/java/com/kmall/admin/dao/CouponDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.CouponEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/CouponGoodsDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.CouponGoodsEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 优惠券关联商品Dao

kmall-admin/src/main/java/com/kmall/admin/dao/ExportExceptionDataDao.java

@@ -2,7 +2,7 @@ package com.kmall.admin.dao;
 
 
 import com.kmall.admin.entity.ExportExceptionDataEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.springframework.stereotype.Component;
 
 /**

kmall-admin/src/main/java/com/kmall/admin/dao/FeedbackDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.FeedbackEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/FootprintDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.FootprintEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 

kmall-admin/src/main/java/com/kmall/admin/dao/FreightDao.java

@@ -2,7 +2,7 @@ package com.kmall.admin.dao;
 
 
 import com.kmall.admin.entity.FreightEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

kmall-admin/src/main/java/com/kmall/admin/dao/FreightItemDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.FreightItemEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsAttributeDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsAttributeEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * @author Scott

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsGalleryDao.java

@@ -1,10 +1,9 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsGalleryEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsGroupDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsGroupEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 团购Dao

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsGroupOpenDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsGroupOpenEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsGroupOpenDetailDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsGroupOpenDetailEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsIssueDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsIssueEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsSpecificationDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsSpecificationEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 商品对应规格表值表Dao

kmall-admin/src/main/java/com/kmall/admin/dao/HelpIssueDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.HelpIssueEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/HelpTypeDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.HelpTypeEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/KeywordsDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.KeywordsEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 热闹关键词表Dao

kmall-admin/src/main/java/com/kmall/admin/dao/MerchDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.MerchEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/OfflineCartDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.OfflineCartEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 

kmall-admin/src/main/java/com/kmall/admin/dao/OrderDao.java

@@ -2,7 +2,7 @@ package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.OrderEntity;
 import org.apache.ibatis.annotations.Param;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 import java.util.List;
 import java.util.Map;

kmall-admin/src/main/java/com/kmall/admin/dao/OrderExceptionRecordDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.OrderExceptionRecordEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 订单异常记录表Dao

kmall-admin/src/main/java/com/kmall/admin/dao/OrderGoodsDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.OrderGoodsEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 

kmall-admin/src/main/java/com/kmall/admin/dao/OrderProcessRecordDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.OrderProcessRecordEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 订单流转过程记录表Dao

kmall-admin/src/main/java/com/kmall/admin/dao/OrderRefundDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.OrderRefundEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 订单退款Dao

kmall-admin/src/main/java/com/kmall/admin/dao/OrderWXPayRecordDao.java

@@ -2,7 +2,7 @@ package com.kmall.admin.dao;
 
 
 import com.kmall.admin.entity.OrderWXPayRecordEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 import java.util.List;
 

kmall-admin/src/main/java/com/kmall/admin/dao/PinganPayOrderDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
-import com.kmall.common.dao.BaseDao;
-import com.kmall.common.utils.pingan.dto.PinganPayOrderDto;
+import com.kmall.manager.dao.BaseDao;
+import com.kmall.manager.manager.pingan.dto.PinganPayOrderDto;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/PinganResponseDao.java

@@ -1,8 +1,8 @@
 package com.kmall.admin.dao;
 
 
-import com.kmall.common.dao.BaseDao;
-import com.kmall.common.utils.pingan.dto.PinganResponseDto;
+import com.kmall.manager.dao.BaseDao;
+import com.kmall.manager.manager.pingan.dto.PinganResponseDto;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/ProductDao.java

@@ -2,7 +2,7 @@ package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.ProductEntity;
 import org.apache.ibatis.annotations.Param;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/ProductStoreRelaDao.java

@@ -2,7 +2,7 @@ package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.ProductStoreRelaEntity;
 import org.apache.ibatis.annotations.Param;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 import java.util.List;
 import java.util.Map;

kmall-admin/src/main/java/com/kmall/admin/dao/RelatedGoodsDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.RelatedGoodsEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 

kmall-admin/src/main/java/com/kmall/admin/dao/SearchHistoryDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SearchHistoryEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 

kmall-admin/src/main/java/com/kmall/admin/dao/ShippingDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.ShippingEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/SpecificationDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SpecificationEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 规格表

kmall-admin/src/main/java/com/kmall/admin/dao/StoreDao.java

@@ -2,7 +2,7 @@ package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.StoreEntity;
 import org.apache.ibatis.annotations.Param;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/SupplierDao.java

@@ -1,11 +1,9 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SupplierEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * Dao
  *

kmall-admin/src/main/java/com/kmall/admin/dao/SysCusNationCodeDao.java

@@ -1,11 +1,9 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysCusNationCodeEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 国别地区代码Dao
  *

kmall-admin/src/main/java/com/kmall/admin/dao/SysCusUnitCodeDao.java

@@ -1,11 +1,9 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysCusUnitCodeEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 计量单位代码Dao
  *

kmall-admin/src/main/java/com/kmall/admin/dao/SysDeptDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysDeptEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

kmall-admin/src/main/java/com/kmall/admin/dao/SysMacroDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysMacroEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

kmall-admin/src/main/java/com/kmall/admin/dao/SysNoticeDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysNoticeEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 通知Dao

kmall-admin/src/main/java/com/kmall/admin/dao/SysNoticeUserDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysNoticeUserEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 通知和用户关系表Dao

kmall-admin/src/main/java/com/kmall/admin/dao/SysOssDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysOssEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 文件上传

kmall-admin/src/main/java/com/kmall/admin/dao/SysPrinterDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.SysPrinterEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 飞鸽打印机Dao

kmall-admin/src/main/java/com/kmall/admin/dao/ThirdMerchantBizDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.ThirdMerchantBizEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

kmall-admin/src/main/java/com/kmall/admin/dao/TopicCategoryDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.TopicCategoryEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/TopicDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.TopicEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/dao/UserCouponDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.UserCouponEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 /**

kmall-admin/src/main/java/com/kmall/admin/dao/UserDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.UserEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * 会员Dao

kmall-admin/src/main/java/com/kmall/admin/dao/UserLevelDao.java

@@ -1,7 +1,7 @@
 package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.UserLevelEntity;
-import com.kmall.common.dao.BaseDao;
+import com.kmall.manager.dao.BaseDao;
 
 /**
  * Dao

kmall-admin/src/main/java/com/kmall/admin/entity/CategoryEntity.java

@@ -1,6 +1,6 @@
 package com.kmall.admin.entity;
 
-import com.kmall.common.entity.Tree;
+import com.kmall.manager.entity.Tree;
 
 /**
  * 实体

kmall-common/src/main/java/com/kmall/common/controller/AbstractController.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/controller/AbstractController.java

@@ -1,7 +1,7 @@
-package com.kmall.common.controller;
+package com.kmall.admin.fromcomm.controller;
 
-import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.utils.ShiroUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

kmall-common/src/main/java/com/kmall/common/controller/SysLoginController.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/controller/SysLoginController.java

@@ -1,11 +1,11 @@
-package com.kmall.common.controller;
+package com.kmall.admin.fromcomm.controller;
 
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
 import com.kmall.common.annotation.SysLog;
 import com.kmall.common.utils.R;
-import com.kmall.common.utils.ShiroUtils;
-import com.kmall.common.utils.redis.JedisUtil;
+import com.kmall.admin.utils.ShiroUtils;
+import com.kmall.manager.manager.redis.JedisUtil;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.apache.shiro.subject.Subject;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.awt.image.BufferedImage;

kmall-common/src/main/java/com/kmall/common/controller/SysMenuController.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/controller/SysMenuController.java

@@ -1,8 +1,8 @@
-package com.kmall.common.controller;
+package com.kmall.admin.fromcomm.controller;
 
 import com.kmall.common.annotation.SysLog;
-import com.kmall.common.entity.SysMenuEntity;
-import com.kmall.common.service.SysMenuService;
+import com.kmall.admin.fromcomm.entity.SysMenuEntity;
+import com.kmall.admin.fromcomm.service.SysMenuService;
 import com.kmall.common.utils.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

kmall-common/src/main/java/com/kmall/common/controller/SysRoleController.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/controller/SysRoleController.java

@@ -1,13 +1,13 @@
-package com.kmall.common.controller;
+package com.kmall.admin.fromcomm.controller;
 
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.annotation.SysLog;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysRoleEntity;
-import com.kmall.common.service.SysRoleDeptService;
-import com.kmall.common.service.SysRoleMenuService;
-import com.kmall.common.service.SysRoleService;
+import com.kmall.admin.fromcomm.entity.SysRoleEntity;
+import com.kmall.admin.fromcomm.service.SysRoleDeptService;
+import com.kmall.admin.fromcomm.service.SysRoleMenuService;
+import com.kmall.admin.fromcomm.service.SysRoleService;
 import com.kmall.common.utils.*;
-import com.kmall.common.validator.ValidatorUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

kmall-common/src/main/java/com/kmall/common/controller/SysUserController.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/controller/SysUserController.java

@@ -1,15 +1,13 @@
-package com.kmall.common.controller;
+package com.kmall.admin.fromcomm.controller;
 
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.annotation.SysLog;
 import com.kmall.common.constant.Dict;
-import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.service.SysUserRoleService;
-import com.kmall.common.service.SysUserService;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.fromcomm.service.SysUserRoleService;
+import com.kmall.admin.fromcomm.service.SysUserService;
 import com.kmall.common.utils.*;
 import com.kmall.common.validator.Assert;
-import com.kmall.common.validator.ValidatorUtils;
-import com.kmall.common.validator.group.AddGroup;
-import com.kmall.common.validator.group.UpdateGroup;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.crypto.hash.Sha256Hash;

kmall-common/src/main/java/com/kmall/common/dao/FormIdsDao.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/dao/FormIdsDao.java

@@ -1,7 +1,8 @@
-package com.kmall.common.dao;
+package com.kmall.admin.fromcomm.dao;
 
 
-import com.kmall.common.entity.FormIdsEntity;
+import com.kmall.manager.dao.BaseDao;
+import com.kmall.api.fromcomm.entity.FormIdsEntity;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 

kmall-common/src/main/java/com/kmall/common/dao/SysConfigDao.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/dao/SysConfigDao.java

@@ -1,6 +1,7 @@
-package com.kmall.common.dao;
+package com.kmall.admin.fromcomm.dao;
 
-import com.kmall.common.entity.SysConfigEntity;
+import com.kmall.admin.fromcomm.entity.SysConfigEntity;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 /**

kmall-common/src/main/java/com/kmall/common/dao/SysLogDao.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/dao/SysLogDao.java

@@ -1,6 +1,7 @@
-package com.kmall.common.dao;
+package com.kmall.admin.fromcomm.dao;
 
-import com.kmall.common.entity.SysLogEntity;
+import com.kmall.manager.dao.BaseDao;
+import com.kmall.manager.entity.SysLogEntity;
 
 /**
  * 系统日志

kmall-common/src/main/java/com/kmall/common/dao/SysMenuDao.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/dao/SysMenuDao.java

@@ -1,6 +1,7 @@
-package com.kmall.common.dao;
+package com.kmall.admin.fromcomm.dao;
 
-import com.kmall.common.entity.SysMenuEntity;
+import com.kmall.admin.fromcomm.entity.SysMenuEntity;
+import com.kmall.manager.dao.BaseDao;
 
 import java.util.List;
 

kmall-common/src/main/java/com/kmall/common/dao/SysRoleDao.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/dao/SysRoleDao.java

@@ -1,6 +1,7 @@
-package com.kmall.common.dao;
+package com.kmall.admin.fromcomm.dao;
 
-import com.kmall.common.entity.SysRoleEntity;
+import com.kmall.admin.fromcomm.entity.SysRoleEntity;
+import com.kmall.manager.dao.BaseDao;
 
 import java.util.List;
 

kmall-common/src/main/java/com/kmall/common/dao/SysRoleDeptDao.java → kmall-admin/src/main/java/com/kmall/admin/fromcomm/dao/SysRoleDeptDao.java

@@ -1,6 +1,7 @@
-package com.kmall.common.dao;
+package com.kmall.admin.fromcomm.dao;
 
-import com.kmall.common.entity.SysRoleDeptEntity;
+import com.kmall.admin.fromcomm.entity.SysRoleDeptEntity;
+import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;