Merge remote-tracking branch 'origin/master'

cooleshow-api/pom.xml

@@ -0,0 +1,24 @@
+<?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>cooleshow</artifactId>
+        <groupId>com.yonge.cooleshow</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cooleshow-api</artifactId>
+    <version>1.0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+    </dependencies>
+</project>

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -6,14 +6,12 @@ import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.config.FeignConfiguration;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @FeignClient(contextId = "sysUserFeignService", name = "auth-server", configuration = { FeignConfiguration.class }, fallback = SysUserFeignServiceFallback.class)

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
-import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import org.springframework.stereotype.Component;
 
@@ -12,8 +11,6 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
-import javax.servlet.http.HttpServletRequest;
-
 @Component
 public class SysUserFeignServiceFallback implements SysUserFeignService {
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/MenuQueryInfo.java

@@ -1,8 +1,7 @@
 package com.yonge.cooleshow.auth.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
-
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class MenuQueryInfo extends QueryInfo{
     @ApiModelProperty(value = "父节点编号，默认0",required = false)

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/SysUserQueryInfo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.auth.api.dto;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class SysUserQueryInfo extends QueryInfo {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysConfigDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysConfig;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import java.util.List;
 
 public interface SysConfigDao extends BaseDAO<Long, SysConfig> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysMenuDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysMenu;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysMenuDao extends BaseDAO<Long, SysMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysOauthClientDetailsDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysOauthClientDetails;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysOauthClientDetailsDao extends BaseDAO<String, SysOauthClientDetails> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysRoleDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysRole;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysRoleDao extends BaseDAO<Long, SysRole> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysRoleMenuDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysRoleMenuDao extends BaseDAO<Long, SysRoleMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.UserLockFlag;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 
 public interface SysUserDao extends BaseDAO<Long, SysUser> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDeviceDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysUserDeviceDao extends BaseDAO<Long, SysUserDevice> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserLoginDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLogin;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysUserLoginDao extends BaseDAO<Long, SysUserLogin> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserLoginLogDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.dal.dao;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLoginLog;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysUserLoginLogDao extends BaseDAO<Long, SysUserLoginLog> {
 	

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserRoleDao.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.dal.dao;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 public interface SysUserRoleDao extends BaseDAO<Long, SysUserRole> {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysConfigService.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysConfig;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysConfigService extends BaseService<Long, SysConfig> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysMenuService.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.yonge.cooleshow.auth.api.dto.MenuQueryInfo;
 import com.yonge.cooleshow.auth.api.entity.SysMenu;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysMenuService extends BaseService<Long, SysMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysOauthClientDetailsService.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysOauthClientDetails;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysOauthClientDetailsService extends BaseService<String, SysOauthClientDetails> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysRoleMenuService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysRoleMenuService extends BaseService<Long, SysRoleMenu> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysRoleService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysRole;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysRoleService extends BaseService<Long, SysRole> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserDeviceService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserDeviceService extends BaseService<Long, SysUserDevice> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserLoginLogService.java

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLoginLog;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
-public interface SysUserLoginLogService extends BaseService<Long,SysUserLoginLog>{
+public interface SysUserLoginLogService extends BaseService<Long,SysUserLoginLog> {
 
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserLoginService.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLogin;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserLoginService extends BaseService<Long, SysUserLogin> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserRoleService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.auth.service;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserRoleService extends BaseService<Long, SysUserRole> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.common.entity.ImUserModel;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysUserService extends BaseService<Long, SysUser> {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysConfigServiceImpl.java

@@ -3,8 +3,8 @@ package com.yonge.cooleshow.auth.service.impl;
 import com.yonge.cooleshow.auth.api.entity.SysConfig;
 import com.yonge.cooleshow.auth.dal.dao.SysConfigDao;
 import com.yonge.cooleshow.auth.service.SysConfigService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysMenuServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,11 +13,10 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.dal.dao.SysMenuDao;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
 import com.yonge.cooleshow.auth.service.SysMenuService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysMenuServiceImpl extends BaseServiceImpl<Long, SysMenu>  implements SysMenuService {
+public class SysMenuServiceImpl extends BaseServiceImpl<Long, SysMenu> implements SysMenuService {
 	
 	@Autowired
 	private SysMenuDao sysMenuDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysOauthClientDetailsServiceImpl.java

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.auth.service.impl;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysOauthClientDetails;
 import com.yonge.cooleshow.auth.dal.dao.SysOauthClientDetailsDao;
 import com.yonge.cooleshow.auth.service.SysOauthClientDetailsService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysOauthClientDetailsServiceImpl extends BaseServiceImpl<String, SysOauthClientDetails>  implements SysOauthClientDetailsService {
+public class SysOauthClientDetailsServiceImpl extends BaseServiceImpl<String, SysOauthClientDetails> implements SysOauthClientDetailsService {
 	
 	@Autowired
 	private SysOauthClientDetailsDao sysOauthClientDetailsDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysRoleMenuServiceImpl.java

@@ -3,14 +3,14 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
 import com.yonge.cooleshow.auth.dal.dao.SysRoleMenuDao;
 import com.yonge.cooleshow.auth.service.SysRoleMenuService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class SysRoleMenuServiceImpl extends BaseServiceImpl<Long, SysRoleMenu> implements SysRoleMenuService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysRoleServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,12 +12,11 @@ import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.auth.dal.dao.SysRoleDao;
 import com.yonge.cooleshow.auth.dal.dao.SysRoleMenuDao;
 import com.yonge.cooleshow.auth.service.SysRoleService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.exception.BizException;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysRoleServiceImpl extends BaseServiceImpl<Long, SysRole>  implements SysRoleService {
+public class SysRoleServiceImpl extends BaseServiceImpl<Long, SysRole> implements SysRoleService {
 	
 	@Autowired
 	private SysRoleDao sysRoleDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserDeviceServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -13,11 +14,10 @@ import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDeviceDao;
 import com.yonge.cooleshow.auth.service.SysUserDeviceService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysUserDeviceServiceImpl extends BaseServiceImpl<Long, SysUserDevice>  implements SysUserDeviceService {
+public class SysUserDeviceServiceImpl extends BaseServiceImpl<Long, SysUserDevice> implements SysUserDeviceService {
 	
 	@Autowired
 	private SysUserDeviceDao sysUserDeviceDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserLoginLogServiceImpl.java

@@ -1,13 +1,13 @@
 package com.yonge.cooleshow.auth.service.impl;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserLoginLog;
 import com.yonge.cooleshow.auth.dal.dao.SysUserLoginLogDao;
 import com.yonge.cooleshow.auth.service.SysUserLoginLogService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class SysUserLoginLogServiceImpl extends BaseServiceImpl<Long,SysUserLoginLog> implements SysUserLoginLogService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserLoginServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,8 +16,7 @@ import com.yonge.cooleshow.auth.api.enums.UserLockFlag;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
 import com.yonge.cooleshow.auth.dal.dao.SysUserLoginDao;
 import com.yonge.cooleshow.auth.service.SysUserLoginService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class SysUserLoginServiceImpl extends BaseServiceImpl<Long, SysUserLogin> implements SysUserLoginService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserRoleServiceImpl.java

@@ -2,17 +2,17 @@ package com.yonge.cooleshow.auth.service.impl;
 
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
 import com.yonge.cooleshow.auth.dal.dao.SysUserRoleDao;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysUserRoleServiceImpl extends BaseServiceImpl<Long, SysUserRole>  implements SysUserRoleService {
+public class SysUserRoleServiceImpl extends BaseServiceImpl<Long, SysUserRole> implements SysUserRoleService {
 	
 	@Autowired
 	private SysUserRoleDao sysUserRoleDao;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -21,10 +22,9 @@ import com.yonge.cooleshow.auth.service.SysRoleMenuService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
 import com.yonge.cooleshow.auth.service.SysUserService;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.cooleshow.common.exception.BizException;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implements SysUserService {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/RoleController.java

@@ -25,7 +25,7 @@ import com.yonge.cooleshow.auth.service.SysRoleMenuService;
 import com.yonge.cooleshow.auth.service.SysRoleService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 import com.yonge.cooleshow.common.security.SecurityConstants;
 
 @RestController()

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/queryInfo/RoleQueryInfo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.auth.web.controller.queryInfo;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class RoleQueryInfo extends QueryInfo {
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/queryInfo/SysUserDeviceQueryInfo.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.auth.web.controller.queryInfo;
 
 import java.util.Date;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class SysUserDeviceQueryInfo extends QueryInfo {
 

cooleshow-auth/pom.xml

@@ -22,6 +22,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>toolset-mybatis</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
     <modules>
         <module>auth-api</module>

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/HelpCenterContentController.java

@@ -17,7 +17,7 @@ import com.yonge.cooleshow.cms.controller.queryinfo.HelpCenterContentQueryInfo;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
 import com.yonge.cooleshow.cms.service.HelpCenterContentService;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.log.model.AuditLogAnnotation;
 
 import javax.validation.Valid;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/MusicTheoryController.java

@@ -5,8 +5,8 @@ import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
 import com.yonge.cooleshow.cms.dto.search.MusicTheorySearch;
 import com.yonge.cooleshow.cms.service.SysNewsTypeService;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -5,7 +5,7 @@ import com.yonge.cooleshow.cms.dto.AppHomeDto;
 import com.yonge.cooleshow.cms.dto.AppParam;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/queryinfo/HelpCenterContentQueryInfo.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.cms.controller.queryinfo;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -6,7 +6,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.yonge.cooleshow.cms.dal.entity.NewsStatusEnum;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/HelpCenterCatalogDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface HelpCenterCatalogDao extends BaseDAO<Long, HelpCenterCatalog> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/HelpCenterContentDao.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.cms.dal.dao;
 import java.util.Map;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface HelpCenterContentDao extends BaseDAO<Long, HelpCenterContent> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysConfigDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.cms.dal.dao;
 
 import com.yonge.cooleshow.cms.dal.entity.SysConfig;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsInformationDao.java

@@ -5,7 +5,7 @@ import java.util.Map;
 
 import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsTypeDao.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysNewsTypeDao extends BaseDAO<Long, SysNewsType> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dto/search/MusicTheorySearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.cms.dto.search;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/HelpCenterCatalogService.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.cms.service;
 import java.util.List;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface HelpCenterCatalogService extends BaseService<Long, HelpCenterCatalog> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/HelpCenterContentService.java

@@ -1,9 +1,9 @@
 package com.yonge.cooleshow.cms.service;
 
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.service.BaseService;
 
-public interface HelpCenterContentService extends BaseService<Long,HelpCenterContent>{
+public interface HelpCenterContentService extends BaseService<Long,HelpCenterContent> {
 	
 	public boolean updateContentByCatalog(Long catalogId,Integer status);
 	

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/SysNewsInformationService.java

@@ -7,9 +7,9 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysNewsInformationService extends BaseService<Long, SysNewsInformation> {
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/SysNewsTypeService.java

@@ -5,9 +5,9 @@ import java.util.List;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SysNewsTypeService extends BaseService<Long, SysNewsType> {
 	

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/HelpCenterCatalogServiceImpl.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.cms.service.impl;
 
 import java.util.List;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,8 +10,7 @@ import com.yonge.cooleshow.cms.dal.dao.HelpCenterCatalogDao;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
 import com.yonge.cooleshow.cms.service.HelpCenterCatalogService;
 import com.yonge.cooleshow.cms.service.HelpCenterContentService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Long, HelpCenterCatalog> implements HelpCenterCatalogService {

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/HelpCenterContentServiceImpl.java

@@ -3,14 +3,14 @@ package com.yonge.cooleshow.cms.service.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.yonge.cooleshow.cms.dal.dao.HelpCenterContentDao;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
 import com.yonge.cooleshow.cms.service.HelpCenterContentService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
 public class HelpCenterContentServiceImpl extends BaseServiceImpl<Long, HelpCenterContent> implements HelpCenterContentService {

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -7,10 +7,10 @@ import com.yonge.cooleshow.cms.dal.entity.NewsStatusEnum;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
 import com.yonge.cooleshow.cms.service.SysNewsInformationService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import com.yonge.toolset.utils.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsTypeServiceImpl.java

@@ -5,10 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.yonge.cooleshow.cms.dal.entity.SysNewsInformation;
 import com.yonge.cooleshow.cms.dto.SysNewsTypeDto;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
+import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import com.yonge.toolset.utils.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,11 +17,10 @@ import com.yonge.cooleshow.cms.dal.dao.SysNewsTypeDao;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.cms.service.SysNewsTypeService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 @Service
-public class SysNewsTypeServiceImpl extends BaseServiceImpl<Long, SysNewsType>  implements SysNewsTypeService {
+public class SysNewsTypeServiceImpl extends BaseServiceImpl<Long, SysNewsType> implements SysNewsTypeService {
 	
 	@Autowired
 	private SysNewsTypeDao sysNewsTypeDao;

cooleshow-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -17,7 +17,7 @@
 		<result column="online_time_" property="onlineTime"/>
 		<result column="offline_time_" property="offlineTime"/>
 		<result column="sub_type_" property="subType"/>
-		<result column="status_" property="status" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler" />
+		<result column="status_" property="status" typeHandler="com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="del_flag_" property="delFlag" />
@@ -46,7 +46,7 @@
 				and sni.sub_type_ = #{subType}
 			</if>
 			<if test="status != null">
-				and sni.status_ = #{status, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
+				and sni.status_ = #{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="title != null">
 				and (sni.title_ like '%' #{title} '%'
@@ -93,7 +93,7 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.yonge.cooleshow.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,video_cover_image_,type_,online_time_,offline_time_,sub_type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,memo_,attribute1_,attribute2_,subject_id_list_,create_by_,update_by_,show_time_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{videoCoverImage},#{type},#{onlineTime},#{offlineTime},#{subType},#{status, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{attribute1},#{attribute2},#{subjectIdList},#{createBy},#{updateBy},#{showTime})
+		VALUES(#{id},#{title},#{content},#{coverImage},#{videoCoverImage},#{type},#{onlineTime},#{offlineTime},#{subType},#{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{attribute1},#{attribute2},#{subjectIdList},#{createBy},#{updateBy},#{showTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -101,7 +101,7 @@
 		UPDATE sys_news_information
 		<set>
 			<if test="status != null">
-				status_ = #{status, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},
+				status_ = #{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="title != null">
 				title_ = #{title},
@@ -212,7 +212,7 @@
 		</if>
 		<if test="status != null">
 			and sni.status_ = #{status,
-			typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
+			typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
 		</if>
 		<if test="title != null">
 			and sni.title_ like '%' #{title} '%'
@@ -245,7 +245,7 @@
 		</if>
 		<if test="status != null">
 			and sni.status_ = #{status,
-			typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
+			typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
 		</if>
 		<if test="title != null">
 			and sni.title_ like '%' #{title} '%'

cooleshow-cms/src/main/resources/config/mybatis/SysNewsTypeMapper.xml

@@ -138,7 +138,7 @@
 			<result column="online_time_" property="onlineTime"/>
 			<result column="offline_time_" property="offlineTime"/>
 			<result column="sub_type_" property="subType"/>
-			<result column="status_" property="status" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler" />
+			<result column="status_" property="status" typeHandler="com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler" />
 			<result column="create_time_" property="createTime" />
 			<result column="update_time_" property="updateTime" />
 			<result column="del_flag_" property="delFlag" />

cooleshow-common/pom.xml

@@ -27,11 +27,6 @@
 			<artifactId>thirdparty-component</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
-		</dependency>
-
 		<!-- Redis缓存整合开始 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/UmsAdminServiceImpl.java

@@ -11,7 +11,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.cooleshow.mall.common.util.RequestUtil;
 import com.yonge.cooleshow.mbg.mapper.SysConfigMapper;
 import com.yonge.cooleshow.mbg.mapper.UmsAdminLoginLogMapper;

cooleshow-task/src/main/java/com/yonge/cooleshow/task/controller/TaskController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.cooleshow.task.dal.model.Task;
 import com.yonge.cooleshow.task.queryinfo.TaskQueryInfo;
 import com.yonge.cooleshow.task.service.TaskService;

cooleshow-task/src/main/java/com/yonge/cooleshow/task/queryinfo/TaskQueryInfo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.task.queryinfo;
 
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 public class TaskQueryInfo extends QueryInfo {
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/AdminApplication.java

@@ -14,7 +14,15 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
 @MapperScan("com.yonge.cooleshow.biz.dal.dao")
-@ComponentScan(basePackages = { "com.yonge.cooleshow.admin", "com.yonge.cooleshow.auth", "com.yonge.cooleshow.biz", "com.yonge.cooleshow.common", "com.yonge.cooleshow.common.security", "com.yonge.toolset.log", "com.yonge.toolset.thirdparty" })
+@ComponentScan(basePackages = {
+		"com.yonge.cooleshow.admin",
+		"com.yonge.cooleshow.auth",
+		"com.yonge.cooleshow.biz",
+		"com.yonge.cooleshow.common",
+		"com.yonge.cooleshow.common.security",
+		"com.yonge.toolset.log",
+		"com.yonge.toolset.thirdparty"
+})
 @Configuration
 @EnableSwagger2Doc
 public class AdminApplication {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AdminCourseGroupController.java

@@ -12,7 +12,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AppVersionInfoController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.queryInfo.AppVersionInfoQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 
 @RequestMapping("appVersionInfo")
 @Api(tags = "APP版本信息服务")

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ContractTemplateController.java

@@ -22,7 +22,7 @@ import com.yonge.cooleshow.biz.dal.queryInfo.ContractTemplateQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.ContractTemplateService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 
 @RequestMapping("contractTemplate")
 @Api(tags = "机构协议模板")

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseHomeworkController.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseScheduleRepliedController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MemberPriceSettingsController.java

@@ -21,8 +21,8 @@ import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
 import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.cooleshow.common.page.QueryInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
+import com.yonge.toolset.mybatis.page.QueryInfo;
 
 import javax.validation.Valid;
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicAlbumController.java

@@ -15,7 +15,7 @@ import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -22,7 +22,7 @@ import com.yonge.cooleshow.biz.dal.vo.StudentMusicSheetOrderVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicTagController.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/PracticeController.java

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.PracticeVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/StudentAttendanceController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/StudentController.java

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/StudentCourseHomeworkController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SubjectController.java

@@ -21,7 +21,7 @@ import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 
 @RequestMapping("subject")
 @Api(tags = "声部服务")

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SysManualController.java

@@ -5,7 +5,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.SysManualVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.exception.BizException;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthEntryRecordController.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthMusicianRecordController.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherController.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.admin.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 
 import io.swagger.annotations.*;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountRecordController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.*;
 import org.apache.commons.beanutils.BeanUtils;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderRefundsController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserWithdrawalController.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.biz.dal.enums.BizHttpStatus;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.*;
 import io.swagger.annotations.*;
 import org.apache.commons.beanutils.BeanUtils;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -15,7 +15,7 @@ import com.yonge.cooleshow.biz.dal.valid.SelectGroup;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.mybatis.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-biz/pom.xml

@@ -25,6 +25,12 @@
         </dependency>
 
         <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>toolset-mybatis</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.spring4all</groupId>
             <artifactId>swagger-spring-boot-starter</artifactId>
         </dependency>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/AppVersionInfoDao.java

@@ -3,12 +3,11 @@ package com.yonge.cooleshow.biz.dal.dao;
 import java.util.List;
 
 import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface AppVersionInfoDao extends BaseDAO<Long, AppVersionInfo> {
 
 	List<AppVersionInfo> queryNewestByPlatform(String platform);
-
 	/**
 	 * 修改所有的为历史
 	 * @param platform

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ContractTemplateDao.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.biz.dal.dto.ContractTemplateDto;
 import com.yonge.cooleshow.biz.dal.entity.ContractTemplate;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface ContractTemplateDao extends BaseDAO<Integer, ContractTemplate> {
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/EmployeeDao.java

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface EmployeeDao extends BaseDAO<Long, Employee> {
     /***

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/HolidaysFestivalsDao.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
 
 public interface HolidaysFestivalsDao extends BaseDAO<Integer, HolidaysFestivals> {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.biz.dal.entity.Subject;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SubjectDao extends BaseDAO<Long, Subject> {
     /***

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysConfigDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.biz.dal.entity.SysConfig;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysMessageConfigDao.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.biz.dal.entity.SysMessageConfig;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysMessageConfigDao extends BaseDAO<Long, SysMessageConfig> {
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysMessageDao.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.dto.SysMessageDto;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.Mapper;
 
 public interface SysMessageDao extends BaseDAO<Long, SysMessage> {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysSuggestionDao.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.SysSuggestion;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.toolset.mybatis.dal.BaseDAO;
 
 public interface SysSuggestionDao extends BaseDAO<Long, SysSuggestion> {