diff --git a/hcframe-parent/hcframe-base/pom.xml b/hcframe-parent/hcframe-base/pom.xml
index 95edfc0..b50fb32 100644
--- a/hcframe-parent/hcframe-base/pom.xml
+++ b/hcframe-parent/hcframe-base/pom.xml
@@ -116,6 +116,12 @@
knife4j-spring-boot-starter
2.0.2
+
+
+
+
+
+
javax.validation
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/Mapper.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/MyMapper.java
similarity index 88%
rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/Mapper.java
rename to hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/MyMapper.java
index b26d356..ce1ec31 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/Mapper.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/MyMapper.java
@@ -6,7 +6,7 @@ import tk.mybatis.mapper.common.*;
* @description 调用tkmapper进行接口封装
* @param
*/
-public interface Mapper extends
+public interface MyMapper extends
BaseMapper,
ExampleMapper,
RowBoundsMapper,
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java
index 0526721..2904b7a 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java
@@ -1,6 +1,6 @@
package com.hcframe.base.module.auth.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.auth.entity.FtUser;
/**
@@ -9,6 +9,6 @@ import com.hcframe.base.module.auth.entity.FtUser;
* @author lhc
* @since 2020-02-11 19:29:10
*/
-public interface FtUserDao extends Mapper {
+public interface FtUserDao extends MyMapper {
}
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java
index 68e4dfa..de48a1e 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java
@@ -1,6 +1,6 @@
package com.hcframe.base.module.auth.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.auth.entity.OsSysMenu;
import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import java.util.Set;
* @author makejava
* @since 2020-12-09 09:57:20
*/
-public interface OsSysMenuDao extends Mapper {
+public interface OsSysMenuDao extends MyMapper {
List selectMenu();
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java
index db96d7f..2c56663 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java
@@ -1,7 +1,7 @@
package com.hcframe.base.module.datasource.config;
import com.alibaba.druid.pool.DruidDataSource;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.datasource.dynamic.MyDynamicDataSource;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan;
@@ -31,7 +31,7 @@ import java.util.Map;
// 配置tk.mybatis参数及通用mapper,指定sqlSession工厂Bean
@tk.mybatis.spring.annotation.MapperScan(basePackages = "com.hcframe.**.dao", //这里扫描dao层的接口
sqlSessionFactoryRef = "sqlSessionFactoryBean222",
- markerInterface = Mapper.class //指定tkmybatis 中的通用mapper
+ markerInterface = MyMapper.class //指定tkmybatis 中的通用mapper
)
// 配置mybatis参数,指定sqlSession工厂Bean
@MapperScan(basePackages = "com.hcframe.**.dao",sqlSessionFactoryRef = "sqlSessionFactoryBean222")
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java
index ce00ec1..6b44675 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java
@@ -1,6 +1,6 @@
package com.hcframe.base.module.datasource.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.datasource.entity.DatasourceConfig;
/**
@@ -9,7 +9,7 @@ import com.hcframe.base.module.datasource.entity.DatasourceConfig;
* @author lhc
* @since 2020-09-23 09:28:03
*/
-public interface DatasourceConfigDao extends Mapper {
+public interface DatasourceConfigDao extends MyMapper {
int getCount();
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java
index 4b47492..3f25887 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java
@@ -1,6 +1,6 @@
package com.hcframe.base.module.datasource.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.datasource.entity.DatasourceToken;
/**
@@ -9,6 +9,6 @@ import com.hcframe.base.module.datasource.entity.DatasourceToken;
* @author makejava
* @since 2020-10-10 10:35:49
*/
-public interface DatasourceTokenDao extends Mapper {
+public interface DatasourceTokenDao extends MyMapper {
}
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java
index 110447f..078c047 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java
@@ -1,6 +1,6 @@
package com.hcframe.base.module.datasource.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.datasource.entity.DatasourceType;
/**
@@ -9,7 +9,7 @@ import com.hcframe.base.module.datasource.entity.DatasourceType;
* @author lhc
* @since 2020-09-28 15:18:29
*/
-public interface DatasourceTypeDao extends Mapper {
+public interface DatasourceTypeDao extends MyMapper {
}
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java
index 75a96e9..e34bf9c 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java
@@ -1,7 +1,7 @@
package com.hcframe.base.module.shiro.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.shiro.FtToken;
/**
@@ -10,7 +10,7 @@ import com.hcframe.base.module.shiro.FtToken;
* @author lhc
* @since 2020-02-11 20:26:15
*/
-public interface FtTokenDao extends Mapper {
+public interface FtTokenDao extends MyMapper {
}
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java
index 7a8bbe1..86eb3c8 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java
@@ -1,8 +1,9 @@
package com.hcframe.base.module.tableconfig.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.tableconfig.entity.OsSysField;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -13,8 +14,8 @@ import java.util.List;
* @author lhc
* @since 2020-03-17 17:26:53
*/
-public interface OsSysFieldDao extends Mapper {
-
+@Mapper
+public interface OsSysFieldDao extends MyMapper {
List getTableAlise(@Param("ids") String ids);
}
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java
index e52fb97..14ea720 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java
@@ -1,7 +1,7 @@
package com.hcframe.base.module.tableconfig.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.tableconfig.entity.OsSysSelect;
/**
@@ -10,7 +10,7 @@ import com.hcframe.base.module.tableconfig.entity.OsSysSelect;
* @author lhc
* @since 2020-03-17 17:42:34
*/
-public interface OsSysSelectDao extends Mapper {
+public interface OsSysSelectDao extends MyMapper {
}
diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java
index c04425d..78579f3 100644
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java
@@ -1,10 +1,12 @@
package com.hcframe.base.module.tableconfig.dao;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-public interface OsSysTableMapper extends Mapper {
+@Mapper
+public interface OsSysTableMapper extends MyMapper {
OsSysTable getTableAllInfo(@Param("typeName") String typeName);
diff --git a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml
index d891aa9..9153314 100644
--- a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml
+++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml
@@ -18,6 +18,7 @@
+