增加动态数据库和动态表支持

hsweb-commons/create-crud.md

@@ -164,7 +164,9 @@ public interface MenuDao extends CrudDao<MenuEntity, String> {
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_menu where u_id =#{id}
+         <include refid="config"/>
+         <include refid="BasicMapper.switcher"/> <!--支持表切换-->
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java

@@ -146,7 +146,7 @@ public class EasyOrmSqlBuilder {
     }
 
     protected RDBTableMetaData createMeta(String tableName, String resultMapId) {
-        tableName = getRealTableName(tableName);
+//        tableName = getRealTableName(tableName);
         RDBDatabaseMetaData active = getActiveDatabase();
         String cacheKey = tableName.concat("-").concat(resultMapId);
         Map<String, RDBTableMetaData> cache = metaCache.computeIfAbsent(active, k -> new ConcurrentHashMap<>());
@@ -155,7 +155,14 @@ public class EasyOrmSqlBuilder {
         if (cached != null) {
             return cached;
         }
-        RDBTableMetaData rdbTableMetaData = new RDBTableMetaData();
+
+        RDBTableMetaData rdbTableMetaData = new RDBTableMetaData(){
+            @Override
+            public String getName() {
+                //动态切换表名
+                return getRealTableName(tableName);
+            }
+        };
         ResultMap resultMaps = MybatisUtils.getResultMap(resultMapId);
         rdbTableMetaData.setName(tableName);
         rdbTableMetaData.setDatabaseMetaData(active);

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/basic/BasicMapper.xml

@@ -45,12 +45,36 @@
         ${@org.hswebframework.web.dao.mybatis.builder.SqlBuilder@current().buildOrder(resultMapId,tableName,#this['_parameter'])}
     </sql>
 
+    <sql id="switcher">
+        <bind name="_fullTableName" value="tableName"/>
+        <!--当前数据库-->
+        <bind name="_databaseName"
+              value="@org.hswebframework.web.datasource.DataSourceHolder@databaseSwitcher().currentDatabase()"/>
+        <!--表全名前缀-->
+        <bind name="_databasePrefix" value="''"/>
+
+        <!--当前表名-->
+        <bind name="_currentTableName"
+              value="@org.hswebframework.web.datasource.DataSourceHolder@tableSwitcher().getTable(tableName)"/>
+
+        <if test="_currentTableName==null">
+            <bind name="_currentTableName" value="tableName"/>
+        </if>
+        <if test="_databaseName!=null">
+            <bind name="_databasePrefix" value="_databaseName+'.'"/>
+        </if>
+        <if test="_currentTableName!=null">
+            <bind name="_fullTableName" value="_databasePrefix+_currentTableName"/>
+        </if>
+    </sql>
+
     <!--生成查询sql-->
     <sql id="buildSelectSql">
+        <include refid="BasicMapper.switcher"/>
         <trim>
             select
             <include refid="BasicMapper.buildSelectField"/>
-            from ${tableName}
+            from ${_fullTableName}
             <where>
                 <include refid="BasicMapper.buildWhere"/>
             </where>
@@ -60,8 +84,9 @@
 
     <!--生成删除sql-->
     <sql id="buildDeleteSql">
+        <include refid="BasicMapper.switcher"/>
         <trim>
-            delete from ${tableName}
+            delete from ${_fullTableName}
             <where>
                 <include refid="BasicMapper.buildWhereForUpdate"/>
             </where>
@@ -75,8 +100,9 @@
 
     <!--生成UpdateSql-->
     <sql id="buildUpdateSql">
+        <include refid="BasicMapper.switcher"/>
         <trim>
-            update ${tableName}
+            update ${_fullTableName}
             <include refid="BasicMapper.buildUpdateField"/>
             <where>
                 <include refid="BasicMapper.buildWhereForUpdate"/>
@@ -86,8 +112,9 @@
 
     <!--生成查询数量sql-->
     <sql id="buildTotalSql">
+        <include refid="BasicMapper.switcher"/>
         <trim>
-            select count(0) as total from ${tableName}
+            select count(0) as total from ${_fullTableName}
             <where>
                 <include refid="BasicMapper.buildWhere"/>
             </where>

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java

@@ -60,6 +60,8 @@ public class TestCrud extends AbstractTransactionalJUnit4SpringContextTests {
     @Test
     public void testInsert() {
 
+        DataSourceHolder.databaseSwitcher().use("PUBLIC");
+
         TestEntity entity = new TestEntity();
         entity.setName("测试");
         entity.setDataType(DataType.TYPE1);
@@ -72,17 +74,18 @@ public class TestCrud extends AbstractTransactionalJUnit4SpringContextTests {
         query.where("dataTypes$in$any", Arrays.asList(DataType.TYPE1, DataType.TYPE2));
 
         //#102
-        query.where("createTime","2017-11-10");
+        query.where("createTime", "2017-11-10");
 
-        query.includes("nest.name", "*");
+//        query.includes("nest.name", "*");
 
-        //  DataSourceHolder.tableSwitcher().use("h_test", "h_test2");
+//        DataSourceHolder.tableSwitcher().use("h_test", "h_test2");
         List<TestEntity> entities = testDao.queryNest(query);
 
-//        testDao.query(entity);
-
+        testDao.query(query);
+        testDao.countNest(query);
+        testDao.count(query);
         DeleteParamEntity.newDelete()
-                .where("id","1234")
+                .where("id", "1234")
                 .exec(testDao::delete);
         System.out.println(entities);
     }

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/resources/org/hswebframework/web/dao/test/TestDao.xml

@@ -46,10 +46,11 @@
     <select id="queryNest" parameterType="org.hswebframework.web.commons.entity.Entity" resultMap="TestNestResultMap">
         <bind name="tableName" value="'h_test'"/>
         <bind name="resultMapId" value="'TestNestResultMap'"/>
+        <include refid="BasicMapper.switcher"/>
         select
         <include refid="BasicMapper.buildSelectField"/>
-        from h_test
-        left join h_nest_table nest_table on nest_table.id=h_test.id
+        from ${_fullTableName} h_test
+        left join ${databasePrefix}h_nest_table nest_table on nest_table.id=h_test.id
         <where>
             <include refid="BasicMapper.buildWhere"/>
         </where>
@@ -58,10 +59,11 @@
 
     <select id="countNest" parameterType="org.hswebframework.web.commons.entity.Entity" resultType="int">
         <include refid="config"/>
+        <include refid="BasicMapper.switcher"/>
         select
         count(1)
-        from h_test
-        left join h_nest_table nest_table on nest_table.id=h_test.id
+        from ${_fullTableName} h_test
+        left join ${databasePrefix}h_nest_table nest_table on nest_table.id=h_test.id
         <where>
             <include refid="BasicMapper.buildWhere"/>
         </where>

hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DataSourceHolder.java

@@ -1,6 +1,5 @@
 package org.hswebframework.web.datasource;
 
-import org.hswebframework.ezorm.core.Database;
 import org.hswebframework.web.datasource.exception.DataSourceNotFoundException;
 import org.hswebframework.web.datasource.switcher.*;
 
@@ -23,9 +22,9 @@ public final class DataSourceHolder {
      */
     static volatile DynamicDataSourceService dynamicDataSourceService;
 
-    static volatile TableSwitcher tableSwitcher;
+    static volatile TableSwitcher tableSwitcher = new DefaultTableSwitcher();
 
-    static volatile DatabaseSwitcher databaseSwitcher=new DefaultDatabaseSwitcher();
+    static volatile DatabaseSwitcher databaseSwitcher = new DefaultDatabaseSwitcher();
 
 
     public static void checkDynamicDataSourceReady() {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/AuthorizationSettingDetailMapper.xml

@@ -42,11 +42,13 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_autz_detail where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <select id="selectBySettingId" parameterType="String" resultMap="AuthorizationSettingDetailResultMap">
-        select * from s_autz_detail where setting_id =#{setting_id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        select * from ${_fullTableName} where setting_id =#{setting_id}
     </select>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/AuthorizationSettingMapper.xml

@@ -41,7 +41,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_autz_setting where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/AuthorizationSettingMenuMapper.xml

@@ -43,11 +43,13 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_autz_menu where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <select id="selectBySettingId" parameterType="String" resultMap="AuthorizationSettingMenuResultMap">
-        select * from s_autz_menu where setting_id =#{setting_id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        select * from ${_fullTableName} where setting_id =#{setting_id}
     </select>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/MenuGroupBindMapper.xml

@@ -42,7 +42,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_menu_group_bind where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">
@@ -56,7 +57,8 @@
     </update>
 
     <select id="queryByGroupId" parameterType="String" resultMap="MenuGroupBindResultMap">
-        select * from s_menu_group_bind where group_id =#{id}
+        <include refid="config"/>
+        select * from ${_fullTableName} where group_id =#{id}
     </select>
 
     <select id="query" parameterType="org.hswebframework.web.commons.entity.Entity" resultMap="MenuGroupBindResultMap">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/MenuGroupMapper.xml

@@ -44,7 +44,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from S_MENU_GROUP where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} here u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/MenuMapper.xml

@@ -46,7 +46,9 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_menu where u_id =#{id}
+        <include refid="config"/>
+        <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/PermissionMapper.xml

@@ -45,7 +45,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_permission where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/RoleMapper.xml

@@ -40,7 +40,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_role where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/UserMapper.xml

@@ -44,7 +44,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_user where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/UserRoleMapper.xml

@@ -38,19 +38,23 @@
     </insert>
 
     <delete id="deleteByRoleId" parameterType="String">
-        delete from s_user_role where role_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where role_id =#{id}
     </delete>
 
     <delete id="deleteByUserId" parameterType="String">
-        delete from s_user_role where user_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where user_id =#{id}
     </delete>
 
     <select id="selectByUserId" parameterType="string" resultMap="UserRoleResultMap">
-        select * from s_user_role where user_id=#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where user_id=#{id}
     </select>
 
     <select id="selectByRoleId" parameterType="String" resultMap="UserRoleResultMap">
-        select * from s_user_role where role_id=#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where role_id=#{id}
     </select>
 
 </mapper>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/UserSettingMapper.xml

@@ -45,7 +45,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_user_setting where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-config/hsweb-system-config-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/config/ConfigMapper.xml

@@ -26,7 +26,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_config where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dashboard/DashBoardConfigMapper.xml

@@ -30,7 +30,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_dashboard_conf where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-datasource/hsweb-system-datasource-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/datasource/DataSourceConfigMapper.xml

@@ -24,7 +24,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_datasource_conf where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml

@@ -49,7 +49,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_dict_item where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryMapper.xml

@@ -41,7 +41,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_dictionary where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryParserMapper.xml

@@ -44,7 +44,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_dict_parser where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/entity/form/DynamicFormEntity.java

@@ -69,6 +69,10 @@ public interface DynamicFormEntity extends GenericEntity<String> {
 
     String tags = "tags";
 
+    String getDatabaseName();
+
+    void setDatabaseName(String databaseName);
+
     /**
      * @return 表单名称
      */

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/entity/form/SimpleDynamicFormEntity.java

@@ -14,6 +14,8 @@ import org.hswebframework.web.commons.entity.SimpleGenericEntity;
 public class SimpleDynamicFormEntity extends SimpleGenericEntity<String> implements DynamicFormEntity {
     //表单名称
     private String  name;
+    //数据库名
+    private String databaseName;
     //数据库表名
     private String  databaseTableName;
     //备注

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-api/src/main/java/org/hswebframework/web/service/form/DatabaseRepository.java

@@ -10,9 +10,9 @@ import org.hswebframework.ezorm.rdb.RDBDatabase;
  * @since 3.0
  */
 public interface DatabaseRepository {
-    RDBDatabase getDefaultDatabase();
+    RDBDatabase getDefaultDatabase(String databaseName);
 
-    RDBDatabase getDatabase(String datasourceId);
+    RDBDatabase getDatabase(String datasourceId,String databaseName);
 
     RDBDatabase getCurrentDatabase();
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDatabaseRepository.java

@@ -29,7 +29,7 @@ import java.util.function.Supplier;
 public class SimpleDatabaseRepository implements DatabaseRepository {
 
     private volatile RDBDatabase defaultDatabase = null;
-    private          SqlExecutor sqlExecutor     = null;
+    private SqlExecutor sqlExecutor = null;
 
     @Value("${hsweb.dynamic-form.cluster:false}")
     private boolean cluster = false;
@@ -37,7 +37,7 @@ public class SimpleDatabaseRepository implements DatabaseRepository {
     @Autowired
     private ApplicationEventPublisher eventPublisher;
 
-    private final Map<String, RDBDatabase>                                 repository            = new HashMap<>();
+    private final Map<String, RDBDatabase> repository = new HashMap<>();
     private final Map<DatabaseType, Supplier<AbstractRDBDatabaseMetaData>> databaseMetaSuppliers = new EnumMap<>(DatabaseType.class);
 
     @Autowired
@@ -81,36 +81,29 @@ public class SimpleDatabaseRepository implements DatabaseRepository {
     }
 
     @Override
-    public RDBDatabase getDefaultDatabase() {
-        if (defaultDatabase == null) {
-            synchronized (this) {
-                if (defaultDatabase == null) {
-                    defaultDatabase = initDatabase(DataSourceHolder.defaultDatabaseType());
-                }
-            }
-        }
-        return defaultDatabase;
+    public RDBDatabase getDefaultDatabase(String databaseName) {
+        return repository.computeIfAbsent("DEFAULT." + databaseName, id -> this.initDatabase(DataSourceHolder.defaultDatabaseType(), databaseName));
     }
 
     @Override
-    public RDBDatabase getDatabase(String datasourceId) {
+    public RDBDatabase getDatabase(String datasourceId, String databaseName) {
         DynamicDataSource dynamicDataSource = DataSourceHolder.dataSource(datasourceId);
-        return repository.computeIfAbsent(datasourceId, id -> this.initDatabase(dynamicDataSource.getType()));
+        return repository.computeIfAbsent(datasourceId + "." + databaseName, id -> this.initDatabase(dynamicDataSource.getType(), databaseName));
     }
 
     @Override
     public RDBDatabase getCurrentDatabase() {
         return repository
                 .computeIfAbsent(DataSourceHolder.switcher().currentDataSourceId()
-                        , id -> this.initDatabase(DataSourceHolder.currentDatabaseType()));
+                        , id -> this.initDatabase(DataSourceHolder.currentDatabaseType(), null));
     }
 
 
-    private RDBDatabase initDatabase(DatabaseType databaseType) {
+    private RDBDatabase initDatabase(DatabaseType databaseType, String databaseName) {
         Supplier<AbstractRDBDatabaseMetaData> supplier = databaseMetaSuppliers.get(databaseType);
         Objects.requireNonNull(supplier, "database type" + databaseType + " is not support");
         AbstractRDBDatabaseMetaData metaData = supplier.get();
-
+        metaData.setDatabaseName(databaseName);
         SimpleDatabase database = cluster ?
                 new ClusterDatabase(metaData, sqlExecutor) :
                 new SimpleDatabase(metaData, sqlExecutor);

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormOperationService.java

@@ -56,7 +56,8 @@ public class SimpleDynamicFormOperationService implements DynamicFormOperationSe
             throw new NotFoundException("表单不存在");
         }
         RDBDatabase database = StringUtils.isEmpty(form.getDataSourceId()) ?
-                databaseRepository.getDefaultDatabase() : databaseRepository.getDatabase(form.getDataSourceId());
+                databaseRepository.getDefaultDatabase(form.getDatabaseName()) :
+                databaseRepository.getDatabase(form.getDataSourceId(),form.getDatabaseName());
         return database.getTable(form.getDatabaseTableName());
     }
 
@@ -66,8 +67,8 @@ public class SimpleDynamicFormOperationService implements DynamicFormOperationSe
             throw new NotFoundException("表单不存在");
         }
         return StringUtils.isEmpty(form.getDataSourceId()) ?
-                databaseRepository.getDefaultDatabase() :
-                databaseRepository.getDatabase(form.getDataSourceId());
+                databaseRepository.getDefaultDatabase(form.getDatabaseName()) :
+                databaseRepository.getDatabase(form.getDataSourceId(),form.getDatabaseName());
     }
 
     @Override

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java

@@ -222,8 +222,8 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
         dynamicFormDeployLogService.cancelDeployed(formId);
         //移除表结构定义
         RDBDatabase database = StringUtils.isEmpty(form.getDataSourceId())
-                ? databaseRepository.getDefaultDatabase()
-                : databaseRepository.getDatabase(form.getDataSourceId());
+                ? databaseRepository.getDefaultDatabase(form.getDatabaseName())
+                : databaseRepository.getDatabase(form.getDataSourceId(),form.getDatabaseName());
         database.removeTable(form.getDatabaseTableName());
         createUpdate().set(DynamicFormEntity.deployed, false).where(DynamicFormEntity.id, formId).exec();
         eventPublisher.publishEvent(new FormDeployEvent(formId));
@@ -427,8 +427,9 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
 
     public void deploy(DynamicFormEntity form, List<DynamicFormColumnEntity> columns, boolean updateMeta) {
         RDBDatabase database = StringUtils.isEmpty(form.getDataSourceId())
-                ? databaseRepository.getDefaultDatabase()
-                : databaseRepository.getDatabase(form.getDataSourceId());
+                ? databaseRepository.getDefaultDatabase(form.getDatabaseName())
+                : databaseRepository.getDatabase(form.getDataSourceId(),form.getDatabaseName());
+
         initDatabase(database);
         RDBTableMetaData metaData = buildTable(database, form, columns);
         try {
@@ -515,6 +516,7 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
 
         metaData.setAlias(form.getAlias());
         metaData.setCorrelations(buildCorrelations(form.getCorrelations()));
+        metaData.setDatabaseMetaData(database.getMeta());
         buildTrigger(form.getTriggers()).forEach(metaData::on);
 
         columns.forEach(column -> {

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/form/DynamicFormColumnMapper.xml

@@ -29,12 +29,13 @@
     </sql>
 
     <insert id="insert" parameterType="org.hswebframework.web.entity.form.DynamicFormColumnEntity">
-        <include refid="config"/>
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_dyn_form_column where u_id =#{id}
+        <include refid="config"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/form/DynamicFormDeployLogMapper.xml

@@ -24,7 +24,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_dyn_form_log where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/form/DynamicFormMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="DynamicFormResultMap" type="org.hswebframework.web.entity.form.DynamicFormEntity">
         <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
+        <result property="databaseName" column="db_name" javaType="String" jdbcType="VARCHAR"/>
         <result property="databaseTableName" column="t_name" javaType="String" jdbcType="VARCHAR"/>
         <result property="describe" column="describe" javaType="String" jdbcType="VARCHAR"/>
         <result property="version" column="version" javaType="Long" jdbcType="DECIMAL"/>
@@ -29,12 +30,13 @@
     </sql>
 
     <insert id="insert" parameterType="org.hswebframework.web.entity.form.DynamicFormEntity">
-        <include refid="config"/>
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_dyn_form where u_id =#{id}
+        <include refid="config"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/main/resources/hsweb-starter.js

@@ -10,12 +10,14 @@ var info = {
 
 //版本更新信息
 var versions = [
-    // {
-    //     version: "3.0.2",
-    //     upgrade: function (context) {
-    //         java.lang.System.out.println("更新到3.0.2了");
-    //     }
-    // }
+    {
+        version: "3.0.8",
+        upgrade: function (context) {
+            database.createOrAlter("s_dyn_form")
+                .addColumn().name("db_name").alias("databaseName").comment("数据库名").jdbcType(java.sql.JDBCType.VARCHAR).length(128).commit()
+                .comment("动态表单").commit();
+        }
+    }
 ];
 var JDBCType = java.sql.JDBCType;
 function install(context) {

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/test/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormServiceTest.java

@@ -50,6 +50,7 @@ public class SimpleDynamicFormServiceTest extends SimpleWebApplicationTests {
     public void testDeploy() throws SQLException {
         DynamicFormEntity form = entityFactory.newInstance(DynamicFormEntity.class);
         form.setName("test");
+        form.setDatabaseName("PUBLIC");
         form.setDatabaseTableName("f_test");
         form.setTriggers("[" +
                 "{\"trigger\":\"select.wrapper.done\"" +//触发器 在每个查询结果被包装为对象时触发
@@ -94,7 +95,7 @@ public class SimpleDynamicFormServiceTest extends SimpleWebApplicationTests {
             }
         });
 
-        databaseRepository.getDefaultDatabase().getTable("s_dyn_form");
+        databaseRepository.getDefaultDatabase(form.getDatabaseName()).getTable("s_dyn_form");
 
         List<Object> objects = dynamicFormOperationService.select(form.getId(), new QueryParamEntity().includes("*", "form.*"));
 

hsweb-system/hsweb-system-file/hsweb-system-file-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/file/FileInfoMapper.xml

@@ -28,7 +28,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_file_info where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/client/OAuth2ServerConfigMapper.xml

@@ -46,7 +46,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_oauth2_server where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/client/OAuth2UserTokenMapper.xml

@@ -41,12 +41,13 @@
     </sql>
 
     <insert id="insert" parameterType="org.hswebframework.web.entity.oauth2.client.SimpleOAuth2UserTokenEntity">
-        <include refid="config"/>
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_oauth2_user_token where u_id =#{id}
+        <include refid="config"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2ClientMapper.xml

@@ -49,7 +49,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_oauth2_client where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2CodeMapper.xml

@@ -35,6 +35,7 @@
     <sql id="config">
         <bind name="resultMapId" value="'AuthorizationCodeResultMap'"/>
         <bind name="tableName" value="'s_oauth2_auth_code'"/>
+        <include refid="BasicMapper.switcher"/>
     </sql>
 
     <insert id="insert" parameterType="org.hswebframework.web.entity.oauth2.server.AuthorizationCodeEntity">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/DepartmentMapper.xml

@@ -43,7 +43,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_department where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/DistrictMapper.xml

@@ -29,7 +29,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_district where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/OrganizationalMapper.xml

@@ -45,7 +45,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_organization where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/PersonMapper.xml

@@ -43,7 +43,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_person where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/PersonPositionMapper.xml

@@ -36,11 +36,13 @@
     </insert>
 
     <delete id="deleteByPersonId" parameterType="String">
-        delete from s_person_position where person_id=#{personId}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where person_id=#{personId}
     </delete>
 
     <delete id="deleteByPositionId">
-        delete from s_person_position where position_id=#{positionId}
+        <include refid="config"/>
+        delete from ${_fullTableName} where position_id=#{positionId}
     </delete>
 
     <select id="query" parameterType="org.hswebframework.web.commons.entity.Entity" resultMap="PersonPositionResultMap">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/PositionMapper.xml

@@ -43,7 +43,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_position where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/RelationDefineMapper.xml

@@ -22,7 +22,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_relation_def where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/organizational/RelationInfoMapper.xml

@@ -25,7 +25,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_relation_info where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-schedule/hsweb-system-schedule-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/schedule/ScheduleJobMapper.xml

@@ -28,7 +28,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_schedule_job where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-script/hsweb-system-script-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/script/ScriptMapper.xml

@@ -26,7 +26,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_script where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-template/hsweb-system-template-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/template/TemplateMapper.xml

@@ -25,7 +25,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_template where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/workflow/ActivityConfigMapper.xml

@@ -31,7 +31,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_wf_act_conf where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/workflow/ProcessDefineConfigMapper.xml

@@ -31,7 +31,9 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_wf_proc_conf where u_id =#{id}
+        <include refid="config"/>
+        <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/workflow/ProcessHistoryMapper.xml

@@ -35,7 +35,8 @@
     </insert>
 
     <delete id="deleteByPk" parameterType="String">
-        delete from s_wf_proc_his where u_id =#{id}
+        <include refid="config"/> <include refid="BasicMapper.switcher"/>
+        delete from ${_fullTableName} where u_id =#{id}
     </delete>
 
     <delete id="delete" parameterType="org.hswebframework.web.commons.entity.Entity">