diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/FieldScopeDataAccessHandler.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/FieldScopeDataAccessHandler.java index ce6880e45..87988a0aa 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/FieldScopeDataAccessHandler.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/FieldScopeDataAccessHandler.java @@ -2,8 +2,8 @@ package org.hswebframework.web.authorization.basic.handler.access; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.PropertyUtilsBean; -import org.hsweb.ezorm.core.param.Term; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.access.DataAccessConfig; import org.hswebframework.web.authorization.access.DataAccessHandler; diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java index e557d1d01..8cf63fb2b 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/access/OwnCreatedDataAccessHandler.java @@ -1,6 +1,6 @@ package org.hswebframework.web.authorization.basic.handler.access; -import org.hsweb.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.Term; import org.hswebframework.utils.ClassUtils; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.access.DataAccessConfig; diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java index 759692233..7ac549a36 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java @@ -22,23 +22,23 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.PropertyUtilsBean; import org.apache.ibatis.mapping.ResultMap; import org.apache.ibatis.mapping.ResultMapping; -import org.hsweb.ezorm.core.param.InsertParam; -import org.hsweb.ezorm.core.param.QueryParam; -import org.hsweb.ezorm.core.param.Term; -import org.hsweb.ezorm.core.param.UpdateParam; -import org.hsweb.ezorm.rdb.meta.RDBColumnMetaData; -import org.hsweb.ezorm.rdb.meta.RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.meta.RDBTableMetaData; -import org.hsweb.ezorm.rdb.meta.converter.DateTimeConverter; -import org.hsweb.ezorm.rdb.meta.converter.NumberValueConverter; -import org.hsweb.ezorm.rdb.render.SqlAppender; -import org.hsweb.ezorm.rdb.render.SqlRender; -import org.hsweb.ezorm.rdb.render.dialect.Dialect; -import org.hsweb.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.dialect.MysqlRDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.dialect.OracleRDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.support.simple.CommonSqlRender; -import org.hsweb.ezorm.rdb.render.support.simple.SimpleWhereSqlBuilder; +import org.hswebframework.ezorm.core.param.InsertParam; +import org.hswebframework.ezorm.core.param.QueryParam; +import org.hswebframework.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.UpdateParam; +import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData; +import org.hswebframework.ezorm.rdb.meta.RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.meta.RDBTableMetaData; +import org.hswebframework.ezorm.rdb.meta.converter.DateTimeConverter; +import org.hswebframework.ezorm.rdb.meta.converter.NumberValueConverter; +import org.hswebframework.ezorm.rdb.render.SqlAppender; +import org.hswebframework.ezorm.rdb.render.SqlRender; +import org.hswebframework.ezorm.rdb.render.dialect.Dialect; +import org.hswebframework.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.dialect.MysqlRDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.dialect.OracleRDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.support.simple.CommonSqlRender; +import org.hswebframework.ezorm.rdb.render.support.simple.SimpleWhereSqlBuilder; import org.hswebframework.web.BusinessException; import org.hswebframework.web.dao.mybatis.plgins.pager.Pager; import org.hswebframework.web.dao.mybatis.utils.ResultMapsUtils; diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/InsertSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/InsertSqlBuilder.java index dd2c20bed..c2d5970a8 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/InsertSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/InsertSqlBuilder.java @@ -18,12 +18,12 @@ package org.hswebframework.web.dao.mybatis.builder; -import org.hsweb.ezorm.core.param.InsertParam; -import org.hsweb.ezorm.rdb.executor.SQL; -import org.hsweb.ezorm.rdb.meta.RDBColumnMetaData; -import org.hsweb.ezorm.rdb.meta.RDBTableMetaData; -import org.hsweb.ezorm.rdb.render.SqlAppender; -import org.hsweb.ezorm.rdb.render.support.simple.SimpleInsertSqlRender; +import org.hswebframework.ezorm.core.param.InsertParam; +import org.hswebframework.ezorm.rdb.executor.SQL; +import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData; +import org.hswebframework.ezorm.rdb.meta.RDBTableMetaData; +import org.hswebframework.ezorm.rdb.render.SqlAppender; +import org.hswebframework.ezorm.rdb.render.support.simple.SimpleInsertSqlRender; /** * @author zhouhao diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/UpdateSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/UpdateSqlBuilder.java index b74c6f642..ca776c1de 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/UpdateSqlBuilder.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/UpdateSqlBuilder.java @@ -18,13 +18,13 @@ package org.hswebframework.web.dao.mybatis.builder; -import org.hsweb.ezorm.core.param.UpdateParam; -import org.hsweb.ezorm.rdb.executor.SQL; -import org.hsweb.ezorm.rdb.meta.RDBColumnMetaData; -import org.hsweb.ezorm.rdb.meta.RDBTableMetaData; -import org.hsweb.ezorm.rdb.render.SqlAppender; -import org.hsweb.ezorm.rdb.render.dialect.Dialect; -import org.hsweb.ezorm.rdb.render.support.simple.SimpleUpdateSqlRender; +import org.hswebframework.ezorm.core.param.UpdateParam; +import org.hswebframework.ezorm.rdb.executor.SQL; +import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData; +import org.hswebframework.ezorm.rdb.meta.RDBTableMetaData; +import org.hswebframework.ezorm.rdb.render.SqlAppender; +import org.hswebframework.ezorm.rdb.render.dialect.Dialect; +import org.hswebframework.ezorm.rdb.render.support.simple.SimpleUpdateSqlRender; /** * @author zhouhao diff --git a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/DeleteParamEntity.java b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/DeleteParamEntity.java index e904e1936..94e471084 100644 --- a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/DeleteParamEntity.java +++ b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/DeleteParamEntity.java @@ -1,6 +1,6 @@ package org.hswebframework.web.commons.entity.param; -import org.hsweb.ezorm.core.param.Param; +import org.hswebframework.ezorm.core.param.Param; import org.hswebframework.web.commons.entity.Entity; /** diff --git a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/QueryParamEntity.java b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/QueryParamEntity.java index 283cdd469..3fb37c247 100644 --- a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/QueryParamEntity.java +++ b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/QueryParamEntity.java @@ -1,6 +1,6 @@ package org.hswebframework.web.commons.entity.param; -import org.hsweb.ezorm.core.param.QueryParam; +import org.hswebframework.ezorm.core.param.QueryParam; import org.hswebframework.web.commons.entity.Entity; /** diff --git a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/UpdateParamEntity.java b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/UpdateParamEntity.java index 0f8113f07..e4f6810fd 100644 --- a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/UpdateParamEntity.java +++ b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/param/UpdateParamEntity.java @@ -1,6 +1,6 @@ package org.hswebframework.web.commons.entity.param; -import org.hsweb.ezorm.core.param.UpdateParam; +import org.hswebframework.ezorm.core.param.UpdateParam; import org.hswebframework.web.commons.entity.Entity; /** diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLDeleteService.java b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLDeleteService.java index a57e83aa7..562293d75 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLDeleteService.java +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLDeleteService.java @@ -18,7 +18,7 @@ package org.hswebframework.web.service; -import org.hsweb.ezorm.core.dsl.Delete; +import org.hswebframework.ezorm.core.dsl.Delete; import org.hswebframework.web.commons.entity.param.DeleteParamEntity; import org.hswebframework.web.dao.dynamic.DeleteByEntityDao; diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLQueryService.java b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLQueryService.java index 927485c9f..143cf874d 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLQueryService.java +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLQueryService.java @@ -18,7 +18,7 @@ package org.hswebframework.web.service; -import org.hsweb.ezorm.core.dsl.Query; +import org.hswebframework.ezorm.core.dsl.Query; import org.hswebframework.web.commons.entity.param.QueryParamEntity; import org.hswebframework.web.dao.dynamic.QueryByEntityDao; @@ -46,7 +46,7 @@ public interface DefaultDSLQueryService * * @return {@link Query} * @see Query - * @see org.hsweb.ezorm.core.Conditional + * @see org.hswebframework.ezorm.core.Conditional * @since 3.0 */ default Query createQuery() { @@ -69,7 +69,7 @@ public interface DefaultDSLQueryService * @param PO泛型 * @return {@link Query} * @see Query - * @see org.hsweb.ezorm.core.Conditional + * @see org.hswebframework.ezorm.core.Conditional * @since 3.0 */ static Query createQuery(QueryByEntityDao dao) { diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLUpdateService.java b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLUpdateService.java index 15c194344..17f2c24fb 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLUpdateService.java +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultDSLUpdateService.java @@ -18,7 +18,7 @@ package org.hswebframework.web.service; -import org.hsweb.ezorm.core.dsl.Update; +import org.hswebframework.ezorm.core.dsl.Update; import org.hswebframework.web.dao.dynamic.UpdateByEntityDao; import org.hswebframework.web.commons.entity.param.UpdateParamEntity; diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java index 33bb84632..e4a7b4c94 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java @@ -18,7 +18,7 @@ package org.hswebframework.web.service; -import org.hsweb.ezorm.core.dsl.Query; +import org.hswebframework.ezorm.core.dsl.Query; import org.hswebframework.web.commons.entity.Entity; import org.hswebframework.web.commons.entity.PagerResult; import org.hswebframework.web.commons.entity.param.QueryParamEntity; diff --git a/hsweb-concurrent/hsweb-concurrent-async-job/src/test/java/org/hswebframework/web/async/TransactionSupportAsyncJobServiceTest.java b/hsweb-concurrent/hsweb-concurrent-async-job/src/test/java/org/hswebframework/web/async/TransactionSupportAsyncJobServiceTest.java index 277c26655..cbd23b5e3 100644 --- a/hsweb-concurrent/hsweb-concurrent-async-job/src/test/java/org/hswebframework/web/async/TransactionSupportAsyncJobServiceTest.java +++ b/hsweb-concurrent/hsweb-concurrent-async-job/src/test/java/org/hswebframework/web/async/TransactionSupportAsyncJobServiceTest.java @@ -1,6 +1,6 @@ package org.hswebframework.web.async; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.hswebframework.web.tests.SimpleWebApplicationTests; import org.junit.Assert; import org.junit.Test; diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java index 4153ce1dc..18f4030b2 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java @@ -1,7 +1,7 @@ package org.hswebframework.web.datasource; -import org.hsweb.ezorm.rdb.executor.AbstractJdbcSqlExecutor; -import org.hsweb.ezorm.rdb.executor.SQL; +import org.hswebframework.ezorm.rdb.executor.AbstractJdbcSqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SQL; import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceAutoConfiguration.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceAutoConfiguration.java index f223fb1c3..e5d38d07b 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceAutoConfiguration.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceAutoConfiguration.java @@ -1,6 +1,6 @@ package org.hswebframework.web.datasource; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.hswebframework.web.datasource.starter.AopDataSourceSwitcherAutoConfiguration; import org.hswebframework.web.datasource.switcher.DataSourceSwitcher; import org.springframework.beans.BeansException; diff --git a/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutor.java b/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutor.java index ccc7f7e27..70c17bee3 100644 --- a/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutor.java +++ b/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutor.java @@ -1,6 +1,6 @@ package org.hswebframework.web.datasource.jta; -import org.hsweb.ezorm.rdb.executor.SQL; +import org.hswebframework.ezorm.rdb.executor.SQL; import org.hswebframework.web.datasource.DefaultJdbcExecutor; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutorAutoConfiguration.java b/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutorAutoConfiguration.java index e2fd8c80e..24bcdb632 100644 --- a/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutorAutoConfiguration.java +++ b/hsweb-datasource/hsweb-datasource-jta/src/main/java/org/hswebframework/web/datasource/jta/JtaJdbcSqlExecutorAutoConfiguration.java @@ -1,6 +1,6 @@ package org.hswebframework.web.datasource.jta; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/hsweb-datasource/hsweb-datasource-jta/src/test/java/org/hswebframework/web/datasource/jta/SimpleAtomikosTests.java b/hsweb-datasource/hsweb-datasource-jta/src/test/java/org/hswebframework/web/datasource/jta/SimpleAtomikosTests.java index d2ebdfc4f..0d042e372 100644 --- a/hsweb-datasource/hsweb-datasource-jta/src/test/java/org/hswebframework/web/datasource/jta/SimpleAtomikosTests.java +++ b/hsweb-datasource/hsweb-datasource-jta/src/test/java/org/hswebframework/web/datasource/jta/SimpleAtomikosTests.java @@ -1,19 +1,19 @@ package org.hswebframework.web.datasource.jta; -import org.hsweb.ezorm.rdb.RDBDatabase; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; -import org.hsweb.ezorm.rdb.meta.RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.meta.RDBTableMetaData; -import org.hsweb.ezorm.rdb.meta.parser.H2TableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.MysqlTableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.OracleTableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.TableMetaParser; -import org.hsweb.ezorm.rdb.render.SqlRender; -import org.hsweb.ezorm.rdb.render.dialect.Dialect; -import org.hsweb.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.dialect.MysqlRDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.dialect.OracleRDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.simple.SimpleDatabase; +import org.hswebframework.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.meta.RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.meta.RDBTableMetaData; +import org.hswebframework.ezorm.rdb.meta.parser.H2TableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.MysqlTableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.OracleTableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.TableMetaParser; +import org.hswebframework.ezorm.rdb.render.SqlRender; +import org.hswebframework.ezorm.rdb.render.dialect.Dialect; +import org.hswebframework.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.dialect.MysqlRDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.dialect.OracleRDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.simple.SimpleDatabase; import org.hswebframework.web.datasource.DataSourceHolder; import org.hswebframework.web.datasource.DatabaseType; import org.junit.Assert; diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/HswebAutoConfiguration.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/HswebAutoConfiguration.java index 1dd5b058d..3effb59c2 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/HswebAutoConfiguration.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/HswebAutoConfiguration.java @@ -126,7 +126,7 @@ public class HswebAutoConfiguration { //fastjson.parser.autoTypeAccept ParserConfig.global.addAccept("org.hswebframework.web.entity."); - ParserConfig.global.addDeny("org.hsweb.ezorm.core.param.SqlTerm"); + ParserConfig.global.addDeny("org.hswebframework.ezorm.core.param.SqlTerm"); return converter; } diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/RestControllerExceptionTranslator.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/RestControllerExceptionTranslator.java index c588241e8..768dbac1c 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/RestControllerExceptionTranslator.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/RestControllerExceptionTranslator.java @@ -51,10 +51,10 @@ public class RestControllerExceptionTranslator { return ResponseMessage.error(400, exception.getMessage()); } - @ExceptionHandler(org.hsweb.ezorm.rdb.exception.ValidationException.class) + @ExceptionHandler(org.hswebframework.ezorm.rdb.exception.ValidationException.class) @ResponseStatus(HttpStatus.BAD_REQUEST) @ResponseBody - ResponseMessage handleException(org.hsweb.ezorm.rdb.exception.ValidationException exception) { + ResponseMessage handleException(org.hswebframework.ezorm.rdb.exception.ValidationException exception) { return ResponseMessage.error(400, exception.getMessage()).result(exception.getValidateResult()); } diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java index 1bcc7bf86..c1a2a4f10 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemInitializeAutoConfiguration.java @@ -18,15 +18,15 @@ package org.hswebframework.web.starter; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; -import org.hsweb.ezorm.rdb.meta.RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.meta.parser.H2TableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.MysqlTableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.OracleTableMetaParser; -import org.hsweb.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.dialect.MysqlRDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.dialect.OracleRDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.simple.SimpleDatabase; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.meta.RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.meta.parser.H2TableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.MysqlTableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.OracleTableMetaParser; +import org.hswebframework.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.dialect.MysqlRDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.dialect.OracleRDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.simple.SimpleDatabase; import org.hswebframework.expands.script.engine.DynamicScriptEngine; import org.hswebframework.expands.script.engine.DynamicScriptEngineFactory; import org.hswebframework.web.ScriptScope; diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/init/SystemInitialize.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/init/SystemInitialize.java index 8bbc43169..7ef3c1325 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/init/SystemInitialize.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/init/SystemInitialize.java @@ -1,11 +1,11 @@ package org.hswebframework.web.starter.init; -import org.hsweb.ezorm.rdb.RDBDatabase; -import org.hsweb.ezorm.rdb.RDBTable; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; -import org.hsweb.ezorm.rdb.meta.converter.ClobValueConverter; -import org.hsweb.ezorm.rdb.meta.converter.JSONValueConverter; -import org.hsweb.ezorm.rdb.simple.wrapper.BeanWrapper; +import org.hswebframework.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.RDBTable; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.meta.converter.ClobValueConverter; +import org.hswebframework.ezorm.rdb.meta.converter.JSONValueConverter; +import org.hswebframework.ezorm.rdb.simple.wrapper.BeanWrapper; import org.hswebframework.expands.script.engine.DynamicScriptEngine; import org.hswebframework.expands.script.engine.DynamicScriptEngineFactory; import org.hswebframework.web.starter.SystemVersion; diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/test/java/org/hswebframework/web/starter/InstallTests.java b/hsweb-starter/hsweb-spring-boot-starter/src/test/java/org/hswebframework/web/starter/InstallTests.java index 2ea2a70ca..ecadf1892 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/test/java/org/hswebframework/web/starter/InstallTests.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/test/java/org/hswebframework/web/starter/InstallTests.java @@ -18,12 +18,12 @@ package org.hswebframework.web.starter; -import org.hsweb.ezorm.rdb.RDBDatabase; -import org.hsweb.ezorm.rdb.executor.AbstractJdbcSqlExecutor; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; -import org.hsweb.ezorm.rdb.meta.RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; -import org.hsweb.ezorm.rdb.simple.SimpleDatabase; +import org.hswebframework.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.executor.AbstractJdbcSqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.meta.RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.render.dialect.H2RDBDatabaseMetaData; +import org.hswebframework.ezorm.rdb.simple.SimpleDatabase; import org.hswebframework.expands.script.engine.DynamicScriptEngine; import org.hswebframework.expands.script.engine.DynamicScriptEngineFactory; import org.hswebframework.web.starter.init.simple.SimpleDependencyInstaller; diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/PermissionTests.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/PermissionTests.java index 1a73e5997..d7d32eac1 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/PermissionTests.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/PermissionTests.java @@ -17,7 +17,7 @@ package org.hswebframework.web.starter.authorization; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.access.DataAccessConfig; import org.hswebframework.web.entity.authorization.ActionEntity; diff --git a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/src/test/java/org/hswebframework/web/starter/config/ConfigTests.java b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/src/test/java/org/hswebframework/web/starter/config/ConfigTests.java index de56f3409..f2825c180 100644 --- a/hsweb-system/hsweb-system-config/hsweb-system-config-starter/src/test/java/org/hswebframework/web/starter/config/ConfigTests.java +++ b/hsweb-system/hsweb-system-config/hsweb-system-config-starter/src/test/java/org/hswebframework/web/starter/config/ConfigTests.java @@ -2,7 +2,7 @@ package org.hswebframework.web.starter.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.hswebframework.web.entity.config.ConfigEntity; import org.hswebframework.web.entity.config.SimpleConfigEntity; import org.hswebframework.web.commons.entity.param.QueryParamEntity; diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/DatabaseRepository.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/DatabaseRepository.java index ca87c6f06..9715cfd32 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/DatabaseRepository.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/DatabaseRepository.java @@ -1,6 +1,6 @@ package org.hswebframework.web.service.form; -import org.hsweb.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.RDBDatabase; /** * 数据库仓库,用于获取默认数据库信息,指定数据源的信息以及当前激活的数据库信息 diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/OptionalConvertBuilder.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/OptionalConvertBuilder.java index 19e9c11bc..133a20a9a 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/OptionalConvertBuilder.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/OptionalConvertBuilder.java @@ -1,6 +1,6 @@ package org.hswebframework.web.service.form; -import org.hsweb.ezorm.core.OptionConverter; +import org.hswebframework.ezorm.core.OptionConverter; import org.hswebframework.web.entity.form.DynamicFormColumnEntity; /** diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/ColumnInitializeContext.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/ColumnInitializeContext.java index b81f0cbee..e6feecdf9 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/ColumnInitializeContext.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/ColumnInitializeContext.java @@ -1,6 +1,6 @@ package org.hswebframework.web.service.form.initialize; -import org.hsweb.ezorm.rdb.meta.RDBColumnMetaData; +import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData; import org.hswebframework.web.entity.form.DynamicFormColumnEntity; /** diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/TableInitializeContext.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/TableInitializeContext.java index 94e909a41..39a2793af 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/TableInitializeContext.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-api/src/main/java/org/hswebframework/web/service/form/initialize/TableInitializeContext.java @@ -1,7 +1,7 @@ package org.hswebframework.web.service.form.initialize; -import org.hsweb.ezorm.rdb.RDBDatabase; -import org.hsweb.ezorm.rdb.meta.RDBTableMetaData; +import org.hswebframework.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.meta.RDBTableMetaData; import org.hswebframework.web.entity.form.DynamicFormEntity; /** diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDatabaseRepository.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDatabaseRepository.java index 43af996ee..92fba0616 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDatabaseRepository.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDatabaseRepository.java @@ -1,13 +1,13 @@ package org.hswebframework.web.service.form.simple; -import org.hsweb.ezorm.rdb.RDBDatabase; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; -import org.hsweb.ezorm.rdb.meta.parser.H2TableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.MysqlTableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.OracleTableMetaParser; -import org.hsweb.ezorm.rdb.meta.parser.SqlServer2012TableMetaParser; -import org.hsweb.ezorm.rdb.render.dialect.*; -import org.hsweb.ezorm.rdb.simple.SimpleDatabase; +import org.hswebframework.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.meta.parser.H2TableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.MysqlTableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.OracleTableMetaParser; +import org.hswebframework.ezorm.rdb.meta.parser.SqlServer2012TableMetaParser; +import org.hswebframework.ezorm.rdb.render.dialect.*; +import org.hswebframework.ezorm.rdb.simple.SimpleDatabase; import org.hswebframework.web.datasource.DataSourceHolder; import org.hswebframework.web.datasource.DatabaseType; import org.hswebframework.web.datasource.DynamicDataSource; diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormOperationService.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormOperationService.java index a67795312..f52c17fac 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormOperationService.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormOperationService.java @@ -1,11 +1,11 @@ package org.hswebframework.web.service.form.simple; -import org.hsweb.ezorm.core.Delete; -import org.hsweb.ezorm.core.Insert; -import org.hsweb.ezorm.core.Update; -import org.hsweb.ezorm.rdb.RDBDatabase; -import org.hsweb.ezorm.rdb.RDBQuery; -import org.hsweb.ezorm.rdb.RDBTable; +import org.hswebframework.ezorm.core.Delete; +import org.hswebframework.ezorm.core.Insert; +import org.hswebframework.ezorm.core.Update; +import org.hswebframework.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.RDBQuery; +import org.hswebframework.ezorm.rdb.RDBTable; import org.hswebframework.web.NotFoundException; import org.hswebframework.web.commons.entity.PagerResult; import org.hswebframework.web.commons.entity.param.DeleteParamEntity; diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java index f390fc603..b2ca050a8 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java @@ -4,15 +4,15 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.digest.DigestUtils; -import org.hsweb.ezorm.core.Trigger; -import org.hsweb.ezorm.core.ValueConverter; -import org.hsweb.ezorm.rdb.RDBDatabase; -import org.hsweb.ezorm.rdb.meta.Correlation; -import org.hsweb.ezorm.rdb.meta.RDBColumnMetaData; -import org.hsweb.ezorm.rdb.meta.RDBTableMetaData; -import org.hsweb.ezorm.rdb.meta.converter.*; -import org.hsweb.ezorm.rdb.render.dialect.Dialect; -import org.hsweb.ezorm.rdb.simple.trigger.ScriptTraggerSupport; +import org.hswebframework.ezorm.core.Trigger; +import org.hswebframework.ezorm.core.ValueConverter; +import org.hswebframework.ezorm.rdb.RDBDatabase; +import org.hswebframework.ezorm.rdb.meta.Correlation; +import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData; +import org.hswebframework.ezorm.rdb.meta.RDBTableMetaData; +import org.hswebframework.ezorm.rdb.meta.converter.*; +import org.hswebframework.ezorm.rdb.render.dialect.Dialect; +import org.hswebframework.ezorm.rdb.simple.trigger.ScriptTraggerSupport; import org.hswebframework.expands.script.engine.DynamicScriptEngine; import org.hswebframework.expands.script.engine.DynamicScriptEngineFactory; import org.hswebframework.web.BusinessException; diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/test/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormServiceTest.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/test/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormServiceTest.java index 0900dd7e6..5e68243aa 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/test/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormServiceTest.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/test/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormServiceTest.java @@ -1,6 +1,6 @@ package org.hswebframework.web.service.form.simple; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.hswebframework.web.commons.entity.param.QueryParamEntity; import org.hswebframework.web.entity.form.DynamicFormColumnBindEntity; import org.hswebframework.web.entity.form.DynamicFormColumnEntity; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/AbstractScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/AbstractScopeDataAccessHandler.java index f61bce5f8..e9a5adbe9 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/AbstractScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/AbstractScopeDataAccessHandler.java @@ -1,6 +1,6 @@ package org.hswebframework.web.organizational.authorization.simple.handler; -import org.hsweb.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.Term; import org.hswebframework.utils.ClassUtils; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.access.DataAccessConfig; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java index 1ef05e47d..a35d77605 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java @@ -1,7 +1,7 @@ package org.hswebframework.web.organizational.authorization.simple.handler; -import org.hsweb.ezorm.core.param.Term; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.authorization.define.AuthorizingContext; import org.hswebframework.web.entity.organizational.DepartmentEntity; import org.hswebframework.web.entity.organizational.OrganizationalEntity; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java index efe9a01a0..15a0ef3fd 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java @@ -1,7 +1,7 @@ package org.hswebframework.web.organizational.authorization.simple.handler; -import org.hsweb.ezorm.core.param.Term; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.authorization.define.AuthorizingContext; import org.hswebframework.web.entity.organizational.authorization.DistrictAttachEntity; import org.hswebframework.web.organizational.authorization.PersonnelAuthorization; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java index c0dc47d5b..12229b0b8 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java @@ -1,7 +1,7 @@ package org.hswebframework.web.organizational.authorization.simple.handler; -import org.hsweb.ezorm.core.param.Term; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.authorization.define.AuthorizingContext; import org.hswebframework.web.entity.organizational.OrganizationalEntity; import org.hswebframework.web.entity.organizational.authorization.OrgAttachEntity; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java index 4d2ef3967..ed801f568 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java @@ -1,7 +1,7 @@ package org.hswebframework.web.organizational.authorization.simple.handler; -import org.hsweb.ezorm.core.param.Term; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.authorization.define.AuthorizingContext; import org.hswebframework.web.entity.organizational.authorization.PersonAttachEntity; import org.hswebframework.web.organizational.authorization.PersonnelAuthorization; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java index 18d363c32..ffc2cd638 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java @@ -1,7 +1,7 @@ package org.hswebframework.web.organizational.authorization.simple.handler; -import org.hsweb.ezorm.core.param.Term; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.param.Term; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.authorization.define.AuthorizingContext; import org.hswebframework.web.entity.organizational.PositionEntity; import org.hswebframework.web.entity.organizational.authorization.PositionAttachEntity; diff --git a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/src/main/java/org/hswebframework/web/schedule/configuration/AutoCreateTable.java b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/src/main/java/org/hswebframework/web/schedule/configuration/AutoCreateTable.java index f474c1609..06e7a20bb 100644 --- a/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/src/main/java/org/hswebframework/web/schedule/configuration/AutoCreateTable.java +++ b/hsweb-system/hsweb-system-schedule/hsweb-system-schedule-starter/src/main/java/org/hswebframework/web/schedule/configuration/AutoCreateTable.java @@ -1,6 +1,6 @@ package org.hswebframework.web.schedule.configuration; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.hswebframework.utils.file.FileUtils; import org.hswebframework.web.Sqls; import org.hswebframework.web.datasource.DataSourceHolder; diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableDeploymentController.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableDeploymentController.java index d1b5c9519..9547ae396 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableDeploymentController.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableDeploymentController.java @@ -14,9 +14,9 @@ import org.activiti.engine.repository.DeploymentBuilder; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.repository.ProcessDefinitionQuery; import org.apache.commons.io.FilenameUtils; -import org.hsweb.ezorm.core.PropertyWrapper; -import org.hsweb.ezorm.core.SimplePropertyWrapper; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.PropertyWrapper; +import org.hswebframework.ezorm.core.SimplePropertyWrapper; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.NotFoundException; import org.hswebframework.web.commons.entity.PagerResult; import org.hswebframework.web.commons.entity.param.QueryParamEntity; diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableModelManagerController.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableModelManagerController.java index 6bf9d08fc..84b57c388 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableModelManagerController.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/controller/FlowableModelManagerController.java @@ -12,9 +12,9 @@ import org.activiti.engine.repository.Deployment; import org.activiti.engine.repository.Model; import org.activiti.engine.repository.ModelQuery; import org.apache.commons.io.IOUtils; -import org.hsweb.ezorm.core.PropertyWrapper; -import org.hsweb.ezorm.core.SimplePropertyWrapper; -import org.hsweb.ezorm.core.param.TermType; +import org.hswebframework.ezorm.core.PropertyWrapper; +import org.hswebframework.ezorm.core.SimplePropertyWrapper; +import org.hswebframework.ezorm.core.param.TermType; import org.hswebframework.web.NotFoundException; import org.hswebframework.web.commons.entity.PagerResult; import org.hswebframework.web.commons.entity.param.QueryParamEntity; diff --git a/hsweb-tests/src/main/java/org/hswebframework/web/tests/SimpleWebApplicationTests.java b/hsweb-tests/src/main/java/org/hswebframework/web/tests/SimpleWebApplicationTests.java index b1f96dfb7..fbf1b9441 100644 --- a/hsweb-tests/src/main/java/org/hswebframework/web/tests/SimpleWebApplicationTests.java +++ b/hsweb-tests/src/main/java/org/hswebframework/web/tests/SimpleWebApplicationTests.java @@ -18,7 +18,7 @@ package org.hswebframework.web.tests; -import org.hsweb.ezorm.rdb.executor.SqlExecutor; +import org.hswebframework.ezorm.rdb.executor.SqlExecutor; import org.hswebframework.web.commons.entity.factory.EntityFactory; import org.junit.Before; import org.junit.runner.RunWith; diff --git a/pom.xml b/pom.xml index 0a700f592..9763bc10d 100644 --- a/pom.xml +++ b/pom.xml @@ -95,9 +95,9 @@ 1.6.12 5.1.1.Final - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT + 3.0.0 + 3.0.0 + 3.0.0 2.6.1