From 664ec2dad0656e371ccbbf05e35ca6aafce9bc7c Mon Sep 17 00:00:00 2001 From: zhouhao Date: Sun, 11 Sep 2016 22:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC2.0-SNAPSHO?= =?UTF-8?q?T,=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- README.md | 51 ++++-------- hsweb-web-bean/pom.xml | 2 +- .../hsweb-web-concurrent-cache/pom.xml | 2 +- .../hsweb-web-concurrent-lock/pom.xml | 2 +- hsweb-web-concurrent/pom.xml | 2 +- hsweb-web-controller/pom.xml | 4 +- hsweb-web-core/pom.xml | 2 +- hsweb-web-crawler/pom.xml | 49 ------------ .../org/hsweb/web/crawler/CrawlerResult.java | 70 ----------------- .../DefaultHtmlContentExtractor.java | 74 ------------------ .../extracter/HtmlContentExtractor.java | 9 --- .../extracter/JsoupHtmlContentExtractor.java | 32 -------- .../crawler/pipeline/AbstractPipeline.java | 49 ------------ .../web/crawler/pipeline/SolrPipeline.java | 41 ---------- .../processor/SimplePageProcessor.java | 50 ------------ .../src/main/resources/logback.xml | 13 --- .../org/hsweb/web/crawler/CrawlerTest.java | 51 ------------ .../src/test/resources/logback.xml | 13 --- .../hsweb-web-dao-api}/pom.xml | 6 +- .../java/org/hsweb/web/dao/GenericMapper.java | 0 .../web/dao/classified/ClassifiedMapper.java | 0 .../hsweb/web/dao/config/ConfigMapper.java | 0 .../web/dao/datasource/DataSourceMapper.java | 0 .../org/hsweb/web/dao/form/FormMapper.java | 0 .../hsweb/web/dao/history/HistoryMapper.java | 0 .../hsweb/web/dao/module/ModuleMapper.java | 0 .../web/dao/module/ModuleMetaMapper.java | 0 .../hsweb/web/dao/plan/QueryPlanMapper.java | 0 .../web/dao/profile/UserProfileMapper.java | 0 .../web/dao/resource/ResourcesMapper.java | 0 .../org/hsweb/web/dao/role/RoleMapper.java | 0 .../hsweb/web/dao/role/RoleModuleMapper.java | 0 .../hsweb/web/dao/role/UserRoleMapper.java | 0 .../web/dao/script/DynamicScriptMapper.java | 0 .../web/dao/template/TemplateMapper.java | 0 .../org/hsweb/web/dao/user/UserMapper.java | 0 .../hsweb-web-dao-mybatis}/README.md | 2 +- .../hsweb-web-dao-mybatis}/pom.xml | 8 +- .../mybatis/MybatisDaoAutoConfiguration.java | 0 .../builder/DefaultSqlParamBuilder.java | 0 .../mybatis/builder/MysqlParamBuilder.java | 0 .../web/mybatis/handler/JsonArrayHandler.java | 0 .../web/mybatis/handler/JsonMapHandler.java | 0 .../web/mybatis/plgins/pager/PagerHelper.java | 0 .../plgins/pager/PagerInterceptor.java | 0 .../plgins/pager/dialect/H2PagerHelper.java | 0 .../pager/dialect/MysqlPagerHelper.java | 0 .../pager/dialect/OraclePagerHelper.java | 0 .../web/mybatis/utils/ResultMapsUtils.java | 0 .../hsweb/web/mybatis/utils/SqlAppender.java | 0 .../main/resources/META-INF/spring.factories | 4 +- .../mapper/mysql/basic/BasicMapper.xml | 0 .../mapper/mysql/basic/BasicMapper.xml.old | 0 .../mysql/classified/ClassifiedMapper.xml | 0 .../mapper/mysql/config/ConfigMapper.xml | 0 .../mysql/datasource/DataSourceMapper.xml | 0 .../mybatis/mapper/mysql/form/FormMapper.xml | 0 .../mapper/mysql/history/HistoryMapper.xml | 0 .../mapper/mysql/module/ModuleMapper.xml | 0 .../mapper/mysql/module/ModuleMetaMapper.xml | 0 .../mapper/mysql/plan/QueryPlanMapper.xml | 0 .../mysql/profile/UserProfileMapper.xml | 0 .../mapper/mysql/resource/ResourcesMapper.xml | 0 .../mybatis/mapper/mysql/role/RoleMapper.xml | 0 .../mapper/mysql/role/RoleModuleMapper.xml | 0 .../mapper/mysql/role/UserRoleMapper.xml | 0 .../mysql/script/DynamicScriptMapper.xml | 0 .../mapper/mysql/template/TemplateMapper.xml | 0 .../mybatis/mapper/mysql/user/UserMapper.xml | 0 .../mapper/oracle/basic/BasicMapper.xml | 0 .../mapper/oracle/basic/BasicMapper.xml.old | 0 .../oracle/classified/ClassifiedMapper.xml | 0 .../mapper/oracle/config/ConfigMapper.xml | 0 .../oracle/datasource/DataSourceMapper.xml | 0 .../mybatis/mapper/oracle/form/FormMapper.xml | 0 .../mapper/oracle/history/HistoryMapper.xml | 0 .../mapper/oracle/module/ModuleMapper.xml | 0 .../mapper/oracle/module/ModuleMetaMapper.xml | 0 .../mapper/oracle/plan/QueryPlanMapper.xml | 0 .../oracle/profile/UserProfileMapper.xml | 0 .../oracle/resource/ResourcesMapper.xml | 0 .../mybatis/mapper/oracle/role/RoleMapper.xml | 0 .../mapper/oracle/role/RoleModuleMapper.xml | 0 .../mapper/oracle/role/UserRoleMapper.xml | 0 .../oracle/script/DynamicScriptMapper.xml | 0 .../mapper/oracle/template/TemplateMapper.xml | 0 .../mybatis/mapper/oracle/user/UserMapper.xml | 0 hsweb-web-dao/pom.xml | 36 +++++++++ hsweb-web-datasource/pom.xml | 4 +- .../hsweb-web-oauth2-controller/pom.xml | 2 +- .../hsweb-web-oauth2-core/pom.xml | 4 +- .../hsweb-web-oauth2-mybatis/pom.xml | 4 +- .../pom.xml | 6 +- .../service/OAuth2ClientServiceImpl.java | 0 .../web/oauth2/service/OAuth2ServiceImpl.java | 0 .../hsweb-web-oauth2-simple/pom.xml | 4 +- hsweb-web-oauth2/pom.xml | 4 +- .../DataBaseManagerServiceImplTest.java | 23 ------ .../src/test/resources/application.yml | 33 -------- .../hsweb-web-service-api}/pom.xml | 8 +- .../org/hsweb/web/service/GenericService.java | 0 .../service/classified/ClassifiedService.java | 0 .../web/service/config/ConfigService.java | 0 .../service/datasource/DataSourceService.java | 0 .../datasource/DynamicDataSourceService.java | 0 .../hsweb/web/service/draft/DraftService.java | 0 .../form/DynamicFormDataValidator.java | 0 .../web/service/form/DynamicFormService.java | 0 .../hsweb/web/service/form/FormParser.java | 0 .../hsweb/web/service/form/FormService.java | 0 .../web/service/history/HistoryService.java | 0 .../web/service/module/ModuleMetaService.java | 0 .../web/service/module/ModuleService.java | 0 .../web/service/plan/QueryPlanService.java | 0 .../service/profile/UserProfileService.java | 0 .../web/service/resource/FileService.java | 0 .../service/resource/ResourcesService.java | 0 .../hsweb/web/service/role/RoleService.java | 0 .../script/DynamicScriptExecuteService.java | 0 .../service/script/DynamicScriptService.java | 0 .../system/DataBaseManagerService.java | 0 .../web/service/system/SqlExecuteProcess.java | 0 .../web/service/template/TemplateService.java | 0 .../hsweb/web/service/user/UserService.java | 0 .../hsweb-web-service-simple}/pom.xml | 12 +-- .../web/service/impl/AbstractServiceImpl.java | 0 .../impl/DataBaseAutoConfiguration.java | 0 .../impl/DatabaseMetaDataFactoryBean.java | 0 .../impl/FormDeployContextLoaderListener.java | 0 .../HibernateValidatorAutoConfiguration.java | 0 .../impl/ServiceAutoConfiguration.java | 0 .../impl/basic/SqlExecutorService.java | 0 .../classified/ClassifiedServiceImpl.java | 0 .../impl/config/ConfigServiceImpl.java | 0 .../datasource/DataSourceServiceImpl.java | 0 .../service/impl/draft/CacheDraftService.java | 0 .../service/impl/form/DefaultFormParser.java | 0 .../impl/form/DynamicFormServiceImpl.java | 0 .../service/impl/form/FormServiceImpl.java | 0 .../validator/GroovyDycBeanValidator.java | 0 .../GroovyDycBeanValidatorFactory.java | 0 .../validator/java/JavaDycBeanValidator.java | 0 .../java/JavaDycBeanValidatorFactory.java | 0 .../impl/history/HistoryServiceImpl.java | 0 .../impl/module/ModuleMetaServiceImpl.java | 0 .../impl/module/ModuleServiceImpl.java | 0 .../impl/plan/QueryPlanServiceImpl.java | 0 .../impl/profile/UserProfileServiceImpl.java | 0 .../impl/resource/FileServiceImpl.java | 0 .../impl/resource/ResourcesServiceImpl.java | 0 .../service/impl/role/RoleServiceImpl.java | 0 .../DynamicScriptExecuteServiceImpl.java | 0 .../impl/script/DynamicScriptServiceImpl.java | 0 .../system/DataBaseManagerServiceImpl.java | 0 .../impl/template/TemplateServiceImpl.java | 0 .../service/impl/user/UserServiceImpl.java | 0 .../main/resources/META-INF/spring.factories | 4 +- .../web/service/impl/AbstractTestCase.java | 0 .../web/service/impl/SpringApplication.java | 0 .../web/service/impl/cache/CacheTest.java | 0 .../impl/datasource/DatasourceTests.java | 64 +++++++++++++++ .../service/impl/datasource/TestService.java | 50 ++++++++++++ .../impl/form/FormServiceImplTest.java | 0 .../DataBaseManagerServiceImplTest.java | 10 +++ .../template/TemplateServiceImplTest.java | 0 .../src/test/resources/application.yml | 53 +++++++++++++ .../src/test/resources/logback.xml | 2 + .../src/test/resources/mybatis-config.xml | 0 .../src/test/resources/test.xlsx | Bin .../test/resources/transactions.properties | 19 +++++ hsweb-web-service/pom.xml | 34 ++++++++ hsweb-web-websocket/pom.xml | 3 +- hsweb-web-workflow/pom.xml | 4 +- pom.xml | 19 ++--- 175 files changed, 338 insertions(+), 602 deletions(-) delete mode 100644 hsweb-web-crawler/pom.xml delete mode 100644 hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/CrawlerResult.java delete mode 100644 hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/DefaultHtmlContentExtractor.java delete mode 100644 hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/HtmlContentExtractor.java delete mode 100644 hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/JsoupHtmlContentExtractor.java delete mode 100644 hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/AbstractPipeline.java delete mode 100644 hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/SolrPipeline.java delete mode 100644 hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/processor/SimplePageProcessor.java delete mode 100644 hsweb-web-crawler/src/main/resources/logback.xml delete mode 100644 hsweb-web-crawler/src/test/java/org/hsweb/web/crawler/CrawlerTest.java delete mode 100644 hsweb-web-crawler/src/test/resources/logback.xml rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/pom.xml (79%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/GenericMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/classified/ClassifiedMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/config/ConfigMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/datasource/DataSourceMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/form/FormMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/history/HistoryMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/module/ModuleMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/module/ModuleMetaMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/plan/QueryPlanMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/profile/UserProfileMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/resource/ResourcesMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/role/RoleMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/role/RoleModuleMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/role/UserRoleMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/script/DynamicScriptMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/template/TemplateMapper.java (100%) rename {hsweb-web-dao-interface => hsweb-web-dao/hsweb-web-dao-api}/src/main/java/org/hsweb/web/dao/user/UserMapper.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/README.md (98%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/pom.xml (87%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/MybatisDaoAutoConfiguration.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/handler/JsonArrayHandler.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/handler/JsonMapHandler.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerHelper.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerInterceptor.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/H2PagerHelper.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/MysqlPagerHelper.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/OraclePagerHelper.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/utils/ResultMapsUtils.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/java/org/hsweb/web/mybatis/utils/SqlAppender.java (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/META-INF/spring.factories (98%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml.old (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/classified/ClassifiedMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/config/ConfigMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/datasource/DataSourceMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/history/HistoryMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMetaMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/plan/QueryPlanMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/profile/UserProfileMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/resource/ResourcesMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleModuleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/UserRoleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/script/DynamicScriptMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/template/TemplateMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/user/UserMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml.old (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/classified/ClassifiedMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/config/ConfigMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/datasource/DataSourceMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/form/FormMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/history/HistoryMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMetaMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/plan/QueryPlanMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/profile/UserProfileMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/resource/ResourcesMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleModuleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/UserRoleMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/script/DynamicScriptMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/template/TemplateMapper.xml (100%) rename {hsweb-web-dao-impl-mybatis => hsweb-web-dao/hsweb-web-dao-mybatis}/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/user/UserMapper.xml (100%) create mode 100644 hsweb-web-dao/pom.xml rename hsweb-web-oauth2/{hsweb-web-oauth2-service-common => hsweb-web-oauth2-service-simple}/pom.xml (88%) rename hsweb-web-oauth2/{hsweb-web-oauth2-service-common => hsweb-web-oauth2-service-simple}/src/main/java/org/hsweb/web/oauth2/service/OAuth2ClientServiceImpl.java (100%) rename hsweb-web-oauth2/{hsweb-web-oauth2-service-common => hsweb-web-oauth2-service-simple}/src/main/java/org/hsweb/web/oauth2/service/OAuth2ServiceImpl.java (100%) delete mode 100644 hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java delete mode 100644 hsweb-web-service-impl-common/src/test/resources/application.yml rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/pom.xml (70%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/GenericService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/classified/ClassifiedService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/config/ConfigService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/datasource/DataSourceService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/datasource/DynamicDataSourceService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/draft/DraftService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/form/DynamicFormDataValidator.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/form/DynamicFormService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/form/FormParser.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/form/FormService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/history/HistoryService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/module/ModuleMetaService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/module/ModuleService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/plan/QueryPlanService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/profile/UserProfileService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/resource/FileService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/resource/ResourcesService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/role/RoleService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/script/DynamicScriptExecuteService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/script/DynamicScriptService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/system/DataBaseManagerService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/system/SqlExecuteProcess.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/template/TemplateService.java (100%) rename {hsweb-web-service-interface => hsweb-web-service/hsweb-web-service-api}/src/main/java/org/hsweb/web/service/user/UserService.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/pom.xml (90%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/DataBaseAutoConfiguration.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/DatabaseMetaDataFactoryBean.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/FormDeployContextLoaderListener.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/HibernateValidatorAutoConfiguration.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/ServiceAutoConfiguration.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/basic/SqlExecutorService.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/classified/ClassifiedServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/config/ConfigServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/datasource/DataSourceServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/draft/CacheDraftService.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/form/DefaultFormParser.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/form/FormServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidator.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidatorFactory.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidator.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidatorFactory.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/history/HistoryServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/module/ModuleServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/profile/UserProfileServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/resource/FileServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/resource/ResourcesServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/role/RoleServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptExecuteServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/template/TemplateServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/main/resources/META-INF/spring.factories (98%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/java/org/hsweb/web/service/impl/AbstractTestCase.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/java/org/hsweb/web/service/impl/SpringApplication.java (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/java/org/hsweb/web/service/impl/cache/CacheTest.java (100%) create mode 100644 hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/DatasourceTests.java create mode 100644 hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/TestService.java rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java (100%) create mode 100644 hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/java/org/hsweb/web/service/impl/template/TemplateServiceImplTest.java (100%) create mode 100644 hsweb-web-service/hsweb-web-service-simple/src/test/resources/application.yml rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/resources/logback.xml (87%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/resources/mybatis-config.xml (100%) rename {hsweb-web-service-impl-common => hsweb-web-service/hsweb-web-service-simple}/src/test/resources/test.xlsx (100%) create mode 100644 hsweb-web-service/hsweb-web-service-simple/src/test/resources/transactions.properties create mode 100644 hsweb-web-service/pom.xml diff --git a/.gitignore b/.gitignore index 47347182b..82d387bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,4 @@ *.log # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -/hsweb-web-service-impl-common/data/ +/hsweb-web-service/hsweb-web-service-simple/data/ diff --git a/README.md b/README.md index dede28977..590a7e26a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,17 @@ -## 后台管理基础框架 [![Build Status](https://travis-ci.org/hs-web/hsweb-framework.svg?branch=master)](https://travis-ci.org/hs-web/hsweb-framework) -基于maven,spring-boot,mybatis +## 后台管理基础框架 + +[![Build Status](https://travis-ci.org/hs-web/hsweb-framework.svg?branch=master)](https://travis-ci.org/hs-web/hsweb-framework) +[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square)](https://www.apache.org/licenses/LICENSE-2.0.html) + ### 主要功能 1. 基础dao,service,controller类，增删改查直接继承即可. 2. 通用mybatis配置文件,支持多种条件查询自动生成,支持自动生成insert,update,delete语句 支持和查询相同的各种条件. 3. 实现用户,权限管理;基于aop,注解,精确到按钮的权限控制. 4. 动态表单功能,可在前端设计表单,动态生成数据库表,提供统一的增删改查接口. -5. 数据库支持 mysql,oracle,h2 +5. 在线代码生成器,可自定义模板 +6. 动态多数据源,支持数据源热加载,热切换,支持分布式事务 +7. 数据库支持 mysql,oracle,h2 +8. websocket支持 ### 其他组件 1. [hsweb-easy-orm](https://github.com/hs-web/hsweb-easy-orm) :为动态表单设计的orm框架 @@ -23,40 +29,13 @@ $ mvn install -DskiptTests ``` -# 使用 -1. 开发文档 -2. FAQ +# 此版本待完善功能 +1. 单元测试编写 +2. 增加定时调度,支持集群,任务采用脚本方式编写. +3. 完善数据库持续集成,版本更新时自动更新数据库结构. +4. 完善动态表单发布,表单发生变化后,自动重新发布(解决集群下,表单配置不一致). # 演示 1. 示例:[demo.hsweb.me](http://demo.hsweb.me) 2. 测试用户:test (test2,test3,test4....) 密码:123456 -3. 演示项目源码:[hsweb-platform](https://github.com/hs-web/hsweb-platform) - -# 许可 -[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square)](https://www.apache.org/licenses/LICENSE-2.0.html) - -# 加入hsweb - -hsweb.me515649185 - - -# 赞助 (支付宝) -赞助 - -# 鸣谢 -*按时间排序* - -| 组织&个人 | 方式 | -| ------------- |:-------------:| -| [jetbrains.com](https://www.jetbrains.com) |正版 [IDE](https://www.jetbrains.com/Toolbox/) 授权 | -| [@杭州-smart](https://github.com/JetBrainZP) |赞助: ￥150 (用于服务器升级) | -| [@北京-50%](https://github.com/longfeizheng) |赞助: ￥50 (用于服务器升级) | -| [@王乐](https://github.com/gmle) |赞助: ￥20 (用于服务器升级) | -| 匿名 |赞助: ￥100 (用于服务器升级) | -| [@西安-un](https://github.com/lw5826618) |赞助: ￥50 (用于服务器升级) | -| [@重庆-下下](https://github.com/web-xiaxia) |赞助: ￥250 (用于服务器升级) | -| [@天津-Mr.Chang](https://github.com/changdaye) |赞助: ￥100 (用于服务器升级) | -| [@北京-青春无罪](https://github.com/gxz04220427) |赞助: ￥100 (用于服务器升级) | -| [@kitkat](https://github.com/wy353208214) |赞助: ￥50 | - +3. 演示项目源码:[hsweb-platform](https://github.com/hs-web/hsweb-platform) \ No newline at end of file diff --git a/hsweb-web-bean/pom.xml b/hsweb-web-bean/pom.xml index 4ce91857d..079088b78 100644 --- a/hsweb-web-bean/pom.xml +++ b/hsweb-web-bean/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 hsweb-web-bean diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml b/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml index 35c75c532..44cf187d9 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml +++ b/hsweb-web-concurrent/hsweb-web-concurrent-cache/pom.xml @@ -5,7 +5,7 @@ hsweb-web-concurrent org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 hsweb-web-concurrent-cache diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml b/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml index 0dfb14829..f2d5e9c89 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml +++ b/hsweb-web-concurrent/hsweb-web-concurrent-lock/pom.xml @@ -5,7 +5,7 @@ hsweb-web-concurrent org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 hsweb-web-concurrent-lock diff --git a/hsweb-web-concurrent/pom.xml b/hsweb-web-concurrent/pom.xml index fa4ae562b..fd55f044c 100644 --- a/hsweb-web-concurrent/pom.xml +++ b/hsweb-web-concurrent/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 pom diff --git a/hsweb-web-controller/pom.xml b/hsweb-web-controller/pom.xml index ad4eea8ad..ed53dcbcf 100644 --- a/hsweb-web-controller/pom.xml +++ b/hsweb-web-controller/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 hsweb-web-controller @@ -23,7 +23,7 @@ org.hsweb - hsweb-web-service-interface + hsweb-web-service-api diff --git a/hsweb-web-core/pom.xml b/hsweb-web-core/pom.xml index 2e95413e6..df01e2712 100644 --- a/hsweb-web-core/pom.xml +++ b/hsweb-web-core/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 hsweb-web-core diff --git a/hsweb-web-crawler/pom.xml b/hsweb-web-crawler/pom.xml deleted file mode 100644 index 870778dab..000000000 --- a/hsweb-web-crawler/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - hsweb-framework - org.hsweb - 1.0.1-SNAPSHOT - - 4.0.0 - - hsweb-web-crawler - - - - org.hsweb - hsweb-web-core - - - - commons-lang - commons-lang - 2.6 - - - - org.apache.solr - solr-solrj - true - - - - us.codecraft - webmagic-core - 0.5.3 - - - org.slf4j - slf4j-log4j12 - - - - - us.codecraft - webmagic-extension - 0.5.3 - - - \ No newline at end of file diff --git a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/CrawlerResult.java b/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/CrawlerResult.java deleted file mode 100644 index 51a41f9fd..000000000 --- a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/CrawlerResult.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hsweb.web.crawler; - - -import java.util.Date; - -/** - * Created by zhouhao on 16-5-4. - */ -public class CrawlerResult { - private String domain; - - private String url; - - private String content; - - private String html; - - private Date crawlerTime; - - public String getDomain() { - return domain; - } - - public void setDomain(String domain) { - this.domain = domain; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getHtml() { - return html; - } - - public void setHtml(String html) { - this.html = html; - } - - public Date getCrawlerTime() { - return crawlerTime; - } - - public void setCrawlerTime(Date crawlerTime) { - this.crawlerTime = crawlerTime; - } - - @Override - public String toString() { - return "CrawlerResult{" + - "domain='" + domain + '\'' + - ", url='" + url + '\'' + - ", content='" + content + '\'' + - ", html='" + html + '\'' + - ", crawlerTime=" + crawlerTime + - '}'; - } -} diff --git a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/DefaultHtmlContentExtractor.java b/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/DefaultHtmlContentExtractor.java deleted file mode 100644 index 57e6b5f68..000000000 --- a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/DefaultHtmlContentExtractor.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hsweb.web.crawler.extracter; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class DefaultHtmlContentExtractor implements HtmlContentExtractor { - private static String clearLabel(String html) { - html = html.replaceAll("(?is)", ""); - html = html.replaceAll("(?is)", ""); // remove html comment - html = html.replaceAll("(?is).*?", ""); // remove javascript - html = html.replaceAll("(?is).*?", ""); // remove css - html = html.replaceAll("&.{2,5};|&#.{2,5};", " "); // remove special char - html = html.replaceAll("(?is)<.*?>", ""); - return html; - } - private int defaultThreshold=35; - public DefaultHtmlContentExtractor(){} - public DefaultHtmlContentExtractor(int threshold){ - this.defaultThreshold=threshold; - } - @Override - public String parse(String html) { - html = clearLabel(html); - final int blocksWidth = 3; - int start, end, threshold = defaultThreshold; - StringBuilder text = new StringBuilder(); - List indexDistribution = new ArrayList<>(); - List lines = Arrays.asList(html.split("\n")); - indexDistribution.clear(); - for (int i = 0; i < lines.size() - blocksWidth; i++) { - int wordsNum = 0; - for (int j = i; j < i + blocksWidth; j++) { - lines.set(j, lines.get(j).replaceAll("\\s+", "")); - wordsNum += lines.get(j).length(); - } - indexDistribution.add(wordsNum); - } - start = -1; - end = -1; - boolean boolStart = false, boolEnd = false; - text.setLength(0); - for (int i = 0, len = indexDistribution.size(); i < len - 1; i++) { - if (indexDistribution.get(i) > threshold && !boolStart) { - if (indexDistribution.get(i + 1).intValue() != 0 - || indexDistribution.get(i + 2).intValue() != 0 - || indexDistribution.get(i + 3).intValue() != 0) { - boolStart = true; - start = i; - continue; - } - } - if (boolStart) { - if (indexDistribution.get(i).intValue() == 0 - || indexDistribution.get(i + 1).intValue() == 0) { - end = i; - boolEnd = true; - } - } - if (boolEnd) { - StringBuilder tmp = new StringBuilder(); - for (int ii = start; ii <= end; ii++) { - if (lines.get(ii).length() < 5) continue; - tmp.append(lines.get(ii) + "\n"); - } - String str = tmp.toString(); - if (str.toLowerCase().contains("copyright") || str.contains("版权所有")) continue; - text.append(str); - boolStart = boolEnd = false; - } - } - return text.toString(); - } -} diff --git a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/HtmlContentExtractor.java b/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/HtmlContentExtractor.java deleted file mode 100644 index 48919f99e..000000000 --- a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/HtmlContentExtractor.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.hsweb.web.crawler.extracter; - -/** - * html正文提取器 - * Created by 浩 on 2015-09-07 0007. - */ -public interface HtmlContentExtractor { - String parse(String html); -} diff --git a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/JsoupHtmlContentExtractor.java b/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/JsoupHtmlContentExtractor.java deleted file mode 100644 index a443588be..000000000 --- a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/extracter/JsoupHtmlContentExtractor.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.hsweb.web.crawler.extracter; - -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; - -/** - * Created by 浩 on 2015-09-07 0007. - */ -public class JsoupHtmlContentExtractor implements HtmlContentExtractor { - - public JsoupHtmlContentExtractor(String select) { - this.select = select; - } - - private String select; - - @Override - public String parse(String html) { - Document document = Jsoup.parse(html); - if (select == null) - return document.text(); - return document.select(select).text(); - } - - public String getSelect() { - return select; - } - - public void setSelect(String select) { - this.select = select; - } -} diff --git a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/AbstractPipeline.java b/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/AbstractPipeline.java deleted file mode 100644 index fd005ce7a..000000000 --- a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/AbstractPipeline.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.hsweb.web.crawler.pipeline; - -import org.hsweb.web.crawler.CrawlerResult; -import org.hsweb.web.crawler.extracter.DefaultHtmlContentExtractor; -import org.hsweb.web.crawler.extracter.HtmlContentExtractor; -import org.hsweb.web.crawler.extracter.JsoupHtmlContentExtractor; -import us.codecraft.webmagic.Page; -import us.codecraft.webmagic.ResultItems; -import us.codecraft.webmagic.Task; -import us.codecraft.webmagic.pipeline.Pipeline; -import us.codecraft.webmagic.utils.UrlUtils; - -import java.util.Date; - -/** - * Created by zhouhao on 16-5-4. - */ -public abstract class AbstractPipeline implements Pipeline { - - - public HtmlContentExtractor extractor; - - public AbstractPipeline() { - this(new DefaultHtmlContentExtractor(35)); - } - - public AbstractPipeline(String selector) { - this(new JsoupHtmlContentExtractor(selector)); - } - - public AbstractPipeline(HtmlContentExtractor extractor) { - this.extractor = extractor; - } - - @Override - public void process(ResultItems resultItems, Task task) { - if (resultItems.isSkip()) return; - Page page = resultItems.get("page"); - CrawlerResult result = new CrawlerResult(); - result.setCrawlerTime(new Date()); - result.setUrl(page.getUrl().get()); - result.setDomain(UrlUtils.getDomain(result.getUrl())); - result.setHtml(page.getHtml().get()); - result.setContent(extractor.parse(result.getHtml())); - process(result); - } - - public abstract void process(CrawlerResult result); -} diff --git a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/SolrPipeline.java b/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/SolrPipeline.java deleted file mode 100644 index 79ac0a493..000000000 --- a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/pipeline/SolrPipeline.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.hsweb.web.crawler.pipeline; - -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.impl.HttpSolrServer; -import org.apache.solr.common.SolrInputDocument; -import org.hsweb.web.crawler.CrawlerResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Created by zhouhao on 16-5-4. - */ -public class SolrPipeline extends AbstractPipeline { - private SolrServer solrServer; - private String core = "hsweb-crawler"; - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - public SolrPipeline(String core) { - this.solrServer = new HttpSolrServer("http://127.0.0.1:8983/solr/" + core); - } - - public SolrPipeline(SolrServer solrServer) { - this.solrServer = solrServer; - } - - @Override - public void process(CrawlerResult result) { - try { - logger.debug("save CrawlerResult " + result.getUrl()); - SolrInputDocument document = new SolrInputDocument(); - document.addField("url", result.getUrl()); -// document.addField("html", result.getHtml()); - document.addField("content_text_cn", result.getContent()); - document.addField("domain", result.getDomain()); - solrServer.add(document, 1000); - } catch (Exception e) { - logger.error("save CrawlerResult error!", e); - } - - } -} diff --git a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/processor/SimplePageProcessor.java b/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/processor/SimplePageProcessor.java deleted file mode 100644 index 3126b82ef..000000000 --- a/hsweb-web-crawler/src/main/java/org/hsweb/web/crawler/processor/SimplePageProcessor.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.hsweb.web.crawler.processor; - -import us.codecraft.webmagic.Page; -import us.codecraft.webmagic.Site; -import us.codecraft.webmagic.processor.PageProcessor; -import us.codecraft.webmagic.utils.UrlUtils; - -import java.util.List; - -/** - * Created by zhouhao on 16-5-4. - */ -public class SimplePageProcessor implements PageProcessor { - private Site site; - /** - * 要抓取的页面 - */ - private String crawlerUrlPattern; - - /** - * 要保存的页面 - */ - private String saveUrlPattern; - - - public SimplePageProcessor(String crawlerUrlPattern, String saveUrlPattern) { - if (site == null) - this.site = Site.me().setSleepTime(1000).setRetryTimes(5).setUseGzip(true); - this.crawlerUrlPattern = "(" + crawlerUrlPattern.replace(".", "\\.").replace("*", "[^\"'#]*") + ")"; - this.saveUrlPattern = "(" + saveUrlPattern.replace(".", "\\.").replace("*", "[^\"'#]*") + ")"; - } - - @Override - public void process(Page page) { - List requests = page.getHtml().links().regex(crawlerUrlPattern).all(); - page.addTargetRequests(requests); - if (!page.getUrl().regex(saveUrlPattern).match()) - page.setSkip(true); - page.putField("page", page); - } - - @Override - public Site getSite() { - return site; - } - - public void setSite(Site site) { - this.site = site; - } -} diff --git a/hsweb-web-crawler/src/main/resources/logback.xml b/hsweb-web-crawler/src/main/resources/logback.xml deleted file mode 100644 index bc0fe96e7..000000000 --- a/hsweb-web-crawler/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} > %-5level %logger{35} - %m%n - - - - - - - \ No newline at end of file diff --git a/hsweb-web-crawler/src/test/java/org/hsweb/web/crawler/CrawlerTest.java b/hsweb-web-crawler/src/test/java/org/hsweb/web/crawler/CrawlerTest.java deleted file mode 100644 index b3789ce4c..000000000 --- a/hsweb-web-crawler/src/test/java/org/hsweb/web/crawler/CrawlerTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.hsweb.web.crawler; - -import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.impl.HttpSolrServer; -import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; -import org.apache.solr.common.util.SimpleOrderedMap; -import org.hsweb.web.crawler.pipeline.SolrPipeline; -import org.hsweb.web.crawler.processor.SimplePageProcessor; -import us.codecraft.webmagic.Spider; -import us.codecraft.webmagic.scheduler.QueueScheduler; - -/** - * Created by zhouhao on 16-5-4. - */ -public class CrawlerTest { - - public static void main(String[] args) throws SolrServerException { -// Spider.create(new SimplePageProcessor("http://www.yiliu88.com*", "http://www.yiliu88.com/*.html")) -// .addUrl("http://www.yiliu88.com") -// .setScheduler(new QueueScheduler()) -// .addPipeline(new SolrPipeline("test")) -// .thread(5) -// .run(); -// HttpSolrServer server = new HttpSolrServer("http://127.0.0.1:8983/solr/test"); -// SolrQuery query = new SolrQuery(); -// query.setQuery("content_txt_en:hello zhangsan"); -// //mlt在查询时，打开/关闭 MoreLikeThisComponent 的布尔值 -// query.setParam("mlt", "true"); -// //fl 需要返回的字段 -// query.setParam("fl", "content_txt_en,id"); -// //mtl.fl 根据哪些字段判断相似度 -// query.setParam("mlt.fl", "content_txt_en"); -// //mlt.mintf 最小分词频率，在单个文档中出现频率小于这个值的词将不用于相似判断 -// query.setParam("mlt.mintf", "1"); -// //mlt.mindf 最小文档频率，所在文档的个数小于这个值的词将不用于相似判断 -// query.setParam("mlt.mindf", "1"); -// query.setParam("hl", "true"); -// query.setParam("hl.fl","content_txt_en"); -// query.setParam("hl.simple.pre",""); -// query.setParam("hl.simple.post",""); -// -// QueryResponse response = server.query(query); -// response.getResponse().forEach(stringObjectEntry -> { -// System.out.println(stringObjectEntry); -// }); - - } -} diff --git a/hsweb-web-crawler/src/test/resources/logback.xml b/hsweb-web-crawler/src/test/resources/logback.xml deleted file mode 100644 index bc0fe96e7..000000000 --- a/hsweb-web-crawler/src/test/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} > %-5level %logger{35} - %m%n - - - - - - - \ No newline at end of file diff --git a/hsweb-web-dao-interface/pom.xml b/hsweb-web-dao/hsweb-web-dao-api/pom.xml similarity index 79% rename from hsweb-web-dao-interface/pom.xml rename to hsweb-web-dao/hsweb-web-dao-api/pom.xml index c2e19932e..361d02451 100644 --- a/hsweb-web-dao-interface/pom.xml +++ b/hsweb-web-dao/hsweb-web-dao-api/pom.xml @@ -3,12 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hsweb-framework + hsweb-web-dao org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 - hsweb-web-dao-interface + hsweb-web-dao-api diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/GenericMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/GenericMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/GenericMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/GenericMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/classified/ClassifiedMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/classified/ClassifiedMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/classified/ClassifiedMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/classified/ClassifiedMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/config/ConfigMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/config/ConfigMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/config/ConfigMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/config/ConfigMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/datasource/DataSourceMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/datasource/DataSourceMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/datasource/DataSourceMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/datasource/DataSourceMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/form/FormMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/form/FormMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/form/FormMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/form/FormMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/history/HistoryMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/history/HistoryMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/history/HistoryMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/history/HistoryMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/module/ModuleMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/module/ModuleMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/module/ModuleMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/module/ModuleMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/module/ModuleMetaMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/module/ModuleMetaMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/module/ModuleMetaMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/module/ModuleMetaMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/plan/QueryPlanMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/plan/QueryPlanMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/plan/QueryPlanMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/plan/QueryPlanMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/profile/UserProfileMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/profile/UserProfileMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/profile/UserProfileMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/profile/UserProfileMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/resource/ResourcesMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/resource/ResourcesMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/resource/ResourcesMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/resource/ResourcesMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/role/RoleMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/role/RoleMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/role/RoleMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/role/RoleMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/role/RoleModuleMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/role/RoleModuleMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/role/RoleModuleMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/role/RoleModuleMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/role/UserRoleMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/role/UserRoleMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/role/UserRoleMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/role/UserRoleMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/script/DynamicScriptMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/script/DynamicScriptMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/script/DynamicScriptMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/script/DynamicScriptMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/template/TemplateMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/template/TemplateMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/template/TemplateMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/template/TemplateMapper.java diff --git a/hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/user/UserMapper.java b/hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/user/UserMapper.java similarity index 100% rename from hsweb-web-dao-interface/src/main/java/org/hsweb/web/dao/user/UserMapper.java rename to hsweb-web-dao/hsweb-web-dao-api/src/main/java/org/hsweb/web/dao/user/UserMapper.java diff --git a/hsweb-web-dao-impl-mybatis/README.md b/hsweb-web-dao/hsweb-web-dao-mybatis/README.md similarity index 98% rename from hsweb-web-dao-impl-mybatis/README.md rename to hsweb-web-dao/hsweb-web-dao-mybatis/README.md index 1176bc28e..25ac81c51 100644 --- a/hsweb-web-dao-impl-mybatis/README.md +++ b/hsweb-web-dao/hsweb-web-dao-mybatis/README.md @@ -10,7 +10,7 @@ org.hsweb hsweb-web-dao-impl-mybatis - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT ``` diff --git a/hsweb-web-dao-impl-mybatis/pom.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml similarity index 87% rename from hsweb-web-dao-impl-mybatis/pom.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml index 0ec25a884..b5c2e1e15 100644 --- a/hsweb-web-dao-impl-mybatis/pom.xml +++ b/hsweb-web-dao/hsweb-web-dao-mybatis/pom.xml @@ -3,12 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hsweb-framework + hsweb-web-dao org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 - hsweb-web-dao-impl-mybatis + hsweb-web-dao-mybatis 3.3.2 @@ -19,7 +19,7 @@ org.hsweb - hsweb-web-dao-interface + hsweb-web-dao-api diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/MybatisDaoAutoConfiguration.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/MybatisDaoAutoConfiguration.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/MybatisDaoAutoConfiguration.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/MybatisDaoAutoConfiguration.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonArrayHandler.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonArrayHandler.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonArrayHandler.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonArrayHandler.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonMapHandler.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonMapHandler.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonMapHandler.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonMapHandler.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerHelper.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerHelper.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerHelper.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerHelper.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerInterceptor.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerInterceptor.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerInterceptor.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/PagerInterceptor.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/H2PagerHelper.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/H2PagerHelper.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/H2PagerHelper.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/H2PagerHelper.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/MysqlPagerHelper.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/MysqlPagerHelper.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/MysqlPagerHelper.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/MysqlPagerHelper.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/OraclePagerHelper.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/OraclePagerHelper.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/OraclePagerHelper.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/OraclePagerHelper.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/utils/ResultMapsUtils.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/utils/ResultMapsUtils.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/utils/ResultMapsUtils.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/utils/ResultMapsUtils.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/utils/SqlAppender.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/utils/SqlAppender.java similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/utils/SqlAppender.java rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/utils/SqlAppender.java diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/META-INF/spring.factories b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/META-INF/spring.factories similarity index 98% rename from hsweb-web-dao-impl-mybatis/src/main/resources/META-INF/spring.factories rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/META-INF/spring.factories index b366a9d48..21b5b13ab 100644 --- a/hsweb-web-dao-impl-mybatis/src/main/resources/META-INF/spring.factories +++ b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +# Auto Configure +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.hsweb.web.mybatis.MybatisDaoAutoConfiguration \ No newline at end of file diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml.old b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml.old similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml.old rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml.old diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/classified/ClassifiedMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/classified/ClassifiedMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/classified/ClassifiedMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/classified/ClassifiedMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/config/ConfigMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/config/ConfigMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/config/ConfigMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/config/ConfigMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/datasource/DataSourceMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/datasource/DataSourceMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/datasource/DataSourceMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/datasource/DataSourceMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/history/HistoryMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/history/HistoryMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/history/HistoryMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/history/HistoryMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMetaMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMetaMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMetaMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMetaMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/plan/QueryPlanMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/plan/QueryPlanMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/plan/QueryPlanMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/plan/QueryPlanMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/profile/UserProfileMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/profile/UserProfileMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/profile/UserProfileMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/profile/UserProfileMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/resource/ResourcesMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/resource/ResourcesMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/resource/ResourcesMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/resource/ResourcesMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleModuleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleModuleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleModuleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleModuleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/UserRoleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/UserRoleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/UserRoleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/UserRoleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/script/DynamicScriptMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/script/DynamicScriptMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/script/DynamicScriptMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/script/DynamicScriptMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/template/TemplateMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/template/TemplateMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/template/TemplateMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/template/TemplateMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/user/UserMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/user/UserMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/user/UserMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/user/UserMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml.old b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml.old similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml.old rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml.old diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/classified/ClassifiedMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/classified/ClassifiedMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/classified/ClassifiedMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/classified/ClassifiedMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/config/ConfigMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/config/ConfigMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/config/ConfigMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/config/ConfigMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/datasource/DataSourceMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/datasource/DataSourceMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/datasource/DataSourceMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/datasource/DataSourceMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/form/FormMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/form/FormMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/form/FormMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/form/FormMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/history/HistoryMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/history/HistoryMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/history/HistoryMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/history/HistoryMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMetaMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMetaMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMetaMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMetaMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/plan/QueryPlanMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/plan/QueryPlanMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/plan/QueryPlanMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/plan/QueryPlanMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/profile/UserProfileMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/profile/UserProfileMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/profile/UserProfileMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/profile/UserProfileMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/resource/ResourcesMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/resource/ResourcesMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/resource/ResourcesMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/resource/ResourcesMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleModuleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleModuleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleModuleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleModuleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/UserRoleMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/UserRoleMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/UserRoleMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/UserRoleMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/script/DynamicScriptMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/script/DynamicScriptMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/script/DynamicScriptMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/script/DynamicScriptMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/template/TemplateMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/template/TemplateMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/template/TemplateMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/template/TemplateMapper.xml diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/user/UserMapper.xml b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/user/UserMapper.xml similarity index 100% rename from hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/user/UserMapper.xml rename to hsweb-web-dao/hsweb-web-dao-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/user/UserMapper.xml diff --git a/hsweb-web-dao/pom.xml b/hsweb-web-dao/pom.xml new file mode 100644 index 000000000..7665e7dfc --- /dev/null +++ b/hsweb-web-dao/pom.xml @@ -0,0 +1,36 @@ + + + + + + hsweb-framework + org.hsweb + 2.0-SNAPSHOT + + 4.0.0 + pom + + hsweb-web-dao-api + hsweb-web-dao-mybatis + + hsweb-web-dao + + + + \ No newline at end of file diff --git a/hsweb-web-datasource/pom.xml b/hsweb-web-datasource/pom.xml index 2e478b913..b4935ff8f 100644 --- a/hsweb-web-datasource/pom.xml +++ b/hsweb-web-datasource/pom.xml @@ -21,7 +21,7 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 @@ -46,7 +46,7 @@ org.hsweb - hsweb-web-service-interface + hsweb-web-service-api diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml index 443d0bf2b..4733aed31 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-controller/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml index 36be45542..5c2a08e04 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-core/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ org.hsweb - hsweb-web-service-interface + hsweb-web-service-api \ No newline at end of file diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml index d2138e48f..752591764 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-mybatis/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ org.hsweb - hsweb-web-dao-impl-mybatis + hsweb-web-dao-mybatis \ No newline at end of file diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-service-common/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml similarity index 88% rename from hsweb-web-oauth2/hsweb-web-oauth2-service-common/pom.xml rename to hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml index 4e0f8170d..32f68e2c4 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-service-common/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/pom.xml @@ -21,11 +21,11 @@ hsweb-web-oauth2 org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 - hsweb-web-oauth2-service-common + hsweb-web-oauth2-service-simple @@ -34,7 +34,7 @@ org.hsweb - hsweb-web-service-impl-common + hsweb-web-service-simple \ No newline at end of file diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-service-common/src/main/java/org/hsweb/web/oauth2/service/OAuth2ClientServiceImpl.java b/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/src/main/java/org/hsweb/web/oauth2/service/OAuth2ClientServiceImpl.java similarity index 100% rename from hsweb-web-oauth2/hsweb-web-oauth2-service-common/src/main/java/org/hsweb/web/oauth2/service/OAuth2ClientServiceImpl.java rename to hsweb-web-oauth2/hsweb-web-oauth2-service-simple/src/main/java/org/hsweb/web/oauth2/service/OAuth2ClientServiceImpl.java diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-service-common/src/main/java/org/hsweb/web/oauth2/service/OAuth2ServiceImpl.java b/hsweb-web-oauth2/hsweb-web-oauth2-service-simple/src/main/java/org/hsweb/web/oauth2/service/OAuth2ServiceImpl.java similarity index 100% rename from hsweb-web-oauth2/hsweb-web-oauth2-service-common/src/main/java/org/hsweb/web/oauth2/service/OAuth2ServiceImpl.java rename to hsweb-web-oauth2/hsweb-web-oauth2-service-simple/src/main/java/org/hsweb/web/oauth2/service/OAuth2ServiceImpl.java diff --git a/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml b/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml index 64a558cb5..fe773aab2 100644 --- a/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml +++ b/hsweb-web-oauth2/hsweb-web-oauth2-simple/pom.xml @@ -21,7 +21,7 @@ hsweb-web-oauth2 org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 @@ -38,7 +38,7 @@ org.hsweb - hsweb-web-oauth2-service-common + hsweb-web-oauth2-service-simple org.hsweb diff --git a/hsweb-web-oauth2/pom.xml b/hsweb-web-oauth2/pom.xml index 09a1aabb2..f57e3d6b0 100644 --- a/hsweb-web-oauth2/pom.xml +++ b/hsweb-web-oauth2/pom.xml @@ -21,7 +21,7 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ hsweb-web-oauth2-mybatis hsweb-web-oauth2-controller - hsweb-web-oauth2-service-common + hsweb-web-oauth2-service-simple hsweb-web-oauth2-simple hsweb-web-oauth2-core diff --git a/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java b/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java deleted file mode 100644 index ff2a29a42..000000000 --- a/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.hsweb.web.service.impl.system; - -import org.hsweb.web.service.impl.AbstractTestCase; -import org.hsweb.web.service.system.DataBaseManagerService; -import org.junit.Test; - -import javax.annotation.Resource; - -/** - * Created by zhouhao on 16-4-21. - */ -public class DataBaseManagerServiceImplTest extends AbstractTestCase { - - @Resource - private DataBaseManagerService dataBaseManagerService; - - @Test - public void testGetFieldList() throws Exception { - dataBaseManagerService.getTableList(); - } - - -} \ No newline at end of file diff --git a/hsweb-web-service-impl-common/src/test/resources/application.yml b/hsweb-web-service-impl-common/src/test/resources/application.yml deleted file mode 100644 index fbeaea536..000000000 --- a/hsweb-web-service-impl-common/src/test/resources/application.yml +++ /dev/null @@ -1,33 +0,0 @@ -logging: - config: classpath:logback.xml -spring: - aop: - auto: true - redis: - host: 127.0.0.1 - port: 6389 - datasource: - name: core - url: jdbc:h2:mem:hsweb - driverClassName: org.h2.Driver - username: sa - password: - type: com.alibaba.druid.pool.DruidDataSource - filters: stat - maxActive: 20 - initialSize: 1 - maxWait: 60000 - minIdle: 1 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 -mybatis: - type-aliases-package: org.hsweb.web.bean.po - mapper-locations: classpath*:org/hsweb/web/dao/impl/mybatis/mapper/oracle/**/*.xml - config: classpath:mybatis-config.xml - typeHandlers-package: org.hsweb.web.mybatis.handler diff --git a/hsweb-web-service-interface/pom.xml b/hsweb-web-service/hsweb-web-service-api/pom.xml similarity index 70% rename from hsweb-web-service-interface/pom.xml rename to hsweb-web-service/hsweb-web-service-api/pom.xml index e60eee8a0..b691a97e8 100644 --- a/hsweb-web-service-interface/pom.xml +++ b/hsweb-web-service/hsweb-web-service-api/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hsweb-framework + hsweb-web-service org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 - hsweb-web-service-interface + hsweb-web-service-api org.hsweb - hsweb-web-dao-interface + hsweb-web-dao-api \ No newline at end of file diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/GenericService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/GenericService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/GenericService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/GenericService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/classified/ClassifiedService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/classified/ClassifiedService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/classified/ClassifiedService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/classified/ClassifiedService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/config/ConfigService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/config/ConfigService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/config/ConfigService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/config/ConfigService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/datasource/DataSourceService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/datasource/DataSourceService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/datasource/DataSourceService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/datasource/DataSourceService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/datasource/DynamicDataSourceService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/datasource/DynamicDataSourceService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/datasource/DynamicDataSourceService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/datasource/DynamicDataSourceService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/draft/DraftService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/draft/DraftService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/draft/DraftService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/draft/DraftService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/DynamicFormDataValidator.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/DynamicFormDataValidator.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/DynamicFormDataValidator.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/DynamicFormDataValidator.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/DynamicFormService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/DynamicFormService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/DynamicFormService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/DynamicFormService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/FormParser.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/FormParser.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/FormParser.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/FormParser.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/FormService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/FormService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/form/FormService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/form/FormService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/history/HistoryService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/history/HistoryService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/history/HistoryService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/history/HistoryService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/module/ModuleMetaService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/module/ModuleMetaService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/module/ModuleMetaService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/module/ModuleMetaService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/module/ModuleService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/module/ModuleService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/module/ModuleService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/module/ModuleService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/plan/QueryPlanService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/plan/QueryPlanService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/plan/QueryPlanService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/plan/QueryPlanService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/profile/UserProfileService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/profile/UserProfileService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/profile/UserProfileService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/profile/UserProfileService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/resource/FileService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/resource/FileService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/resource/FileService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/resource/FileService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/resource/ResourcesService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/resource/ResourcesService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/resource/ResourcesService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/resource/ResourcesService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/role/RoleService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/role/RoleService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/role/RoleService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/role/RoleService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/script/DynamicScriptExecuteService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/script/DynamicScriptExecuteService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/script/DynamicScriptExecuteService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/script/DynamicScriptExecuteService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/script/DynamicScriptService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/script/DynamicScriptService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/script/DynamicScriptService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/script/DynamicScriptService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/system/DataBaseManagerService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/system/DataBaseManagerService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/system/DataBaseManagerService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/system/DataBaseManagerService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/system/SqlExecuteProcess.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/system/SqlExecuteProcess.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/system/SqlExecuteProcess.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/system/SqlExecuteProcess.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/template/TemplateService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/template/TemplateService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/template/TemplateService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/template/TemplateService.java diff --git a/hsweb-web-service-interface/src/main/java/org/hsweb/web/service/user/UserService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/user/UserService.java similarity index 100% rename from hsweb-web-service-interface/src/main/java/org/hsweb/web/service/user/UserService.java rename to hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/user/UserService.java diff --git a/hsweb-web-service-impl-common/pom.xml b/hsweb-web-service/hsweb-web-service-simple/pom.xml similarity index 90% rename from hsweb-web-service-impl-common/pom.xml rename to hsweb-web-service/hsweb-web-service-simple/pom.xml index f5c0cde6c..a9b0a2e3b 100644 --- a/hsweb-web-service-impl-common/pom.xml +++ b/hsweb-web-service/hsweb-web-service-simple/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hsweb-framework + hsweb-web-service org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 - hsweb-web-service-impl-common + hsweb-web-service-simple @@ -27,7 +27,7 @@ org.hsweb - hsweb-web-dao-impl-mybatis + hsweb-web-dao-mybatis test @@ -96,12 +96,12 @@ org.hsweb - hsweb-web-dao-interface + hsweb-web-dao-api org.hsweb - hsweb-web-service-interface + hsweb-web-service-api diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/DataBaseAutoConfiguration.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/DataBaseAutoConfiguration.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/DataBaseAutoConfiguration.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/DataBaseAutoConfiguration.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/DatabaseMetaDataFactoryBean.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/DatabaseMetaDataFactoryBean.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/DatabaseMetaDataFactoryBean.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/DatabaseMetaDataFactoryBean.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/FormDeployContextLoaderListener.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/FormDeployContextLoaderListener.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/FormDeployContextLoaderListener.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/FormDeployContextLoaderListener.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/HibernateValidatorAutoConfiguration.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/HibernateValidatorAutoConfiguration.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/HibernateValidatorAutoConfiguration.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/HibernateValidatorAutoConfiguration.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/ServiceAutoConfiguration.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/ServiceAutoConfiguration.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/ServiceAutoConfiguration.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/ServiceAutoConfiguration.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/basic/SqlExecutorService.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/basic/SqlExecutorService.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/basic/SqlExecutorService.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/basic/SqlExecutorService.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/classified/ClassifiedServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/classified/ClassifiedServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/classified/ClassifiedServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/classified/ClassifiedServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/config/ConfigServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/config/ConfigServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/config/ConfigServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/config/ConfigServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/datasource/DataSourceServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/datasource/DataSourceServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/datasource/DataSourceServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/datasource/DataSourceServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/draft/CacheDraftService.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/draft/CacheDraftService.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/draft/CacheDraftService.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/draft/CacheDraftService.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/DefaultFormParser.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/DefaultFormParser.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/DefaultFormParser.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/DefaultFormParser.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/FormServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/FormServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/FormServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/FormServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidator.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidator.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidator.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidator.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidatorFactory.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidatorFactory.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidatorFactory.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidatorFactory.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidator.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidator.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidator.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidator.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidatorFactory.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidatorFactory.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidatorFactory.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidatorFactory.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/history/HistoryServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/history/HistoryServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/history/HistoryServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/history/HistoryServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/module/ModuleServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/module/ModuleServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/profile/UserProfileServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/profile/UserProfileServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/profile/UserProfileServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/profile/UserProfileServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/resource/FileServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/resource/FileServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/resource/FileServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/resource/FileServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/resource/ResourcesServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/resource/ResourcesServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/resource/ResourcesServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/resource/ResourcesServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/role/RoleServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/role/RoleServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/role/RoleServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/role/RoleServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptExecuteServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptExecuteServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptExecuteServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptExecuteServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/template/TemplateServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/template/TemplateServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/template/TemplateServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/template/TemplateServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java similarity index 100% rename from hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java rename to hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java diff --git a/hsweb-web-service-impl-common/src/main/resources/META-INF/spring.factories b/hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring.factories similarity index 98% rename from hsweb-web-service-impl-common/src/main/resources/META-INF/spring.factories rename to hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring.factories index 4ae62ab65..812d5482f 100644 --- a/hsweb-web-service-impl-common/src/main/resources/META-INF/spring.factories +++ b/hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +# Auto Configure +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.hsweb.web.service.impl.ServiceAutoConfiguration \ No newline at end of file diff --git a/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/AbstractTestCase.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/AbstractTestCase.java similarity index 100% rename from hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/AbstractTestCase.java rename to hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/AbstractTestCase.java diff --git a/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/SpringApplication.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/SpringApplication.java similarity index 100% rename from hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/SpringApplication.java rename to hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/SpringApplication.java diff --git a/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/cache/CacheTest.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/cache/CacheTest.java similarity index 100% rename from hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/cache/CacheTest.java rename to hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/cache/CacheTest.java diff --git a/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/DatasourceTests.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/DatasourceTests.java new file mode 100644 index 000000000..8417e164a --- /dev/null +++ b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/DatasourceTests.java @@ -0,0 +1,64 @@ +/* + * Copyright 2015-2016 http://hsweb.me + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.hsweb.web.service.impl.datasource; + +import org.hsweb.ezorm.executor.SqlExecutor; +import org.hsweb.web.bean.po.datasource.DataSource; +import org.hsweb.web.service.datasource.DataSourceService; +import org.hsweb.web.service.impl.AbstractTestCase; +import org.junit.Before; +import org.junit.Test; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.sql.SQLException; +import java.util.Date; + +public class DatasourceTests extends AbstractTestCase { + @Resource + private DataSourceService dataSourceService; + + @Resource + SqlExecutor sqlExecutor; + + @Resource + private TestService testService; + + @PostConstruct + public void init() { + testService.setSqlExecutor(sqlExecutor); + } + + @Before + public void setup() throws SQLException { + DataSource dataSource = new DataSource(); + dataSource.setId("test"); + dataSource.setName("test"); + dataSource.setDriver("org.h2.Driver"); + dataSource.setUsername("sa"); + dataSource.setPassword(""); + dataSource.setCreateDate(new Date()); + dataSource.setUrl("jdbc:h2:file:./data/h2db2;DB_CLOSE_ON_EXIT=FALSE"); + dataSourceService.insert(dataSource); + } + + @Test + public void testGetFieldList() throws Exception { + testService.test(); + } + +} diff --git a/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/TestService.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/TestService.java new file mode 100644 index 000000000..5c5a31c35 --- /dev/null +++ b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/TestService.java @@ -0,0 +1,50 @@ +/* + * Copyright 2015-2016 http://hsweb.me + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.hsweb.web.service.impl.datasource; + +import org.hsweb.ezorm.executor.SqlExecutor; +import org.hsweb.ezorm.meta.expand.SimpleMapWrapper; +import org.hsweb.ezorm.render.support.simple.SimpleSQL; +import org.hsweb.web.core.datasource.DynamicDataSource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.sql.SQLException; + +@Service +public class TestService { + + private SqlExecutor sqlExecutor; + + public void setSqlExecutor(SqlExecutor sqlExecutor) { + this.sqlExecutor = sqlExecutor; + } + + @Transactional + public void test() throws SQLException { + sqlExecutor.exec(new SimpleSQL("drop table if exists s_test")); + sqlExecutor.exec(new SimpleSQL("create table s_test(name varchar(32))")); + System.out.println(sqlExecutor.list(new SimpleSQL("select * from s_test"), new SimpleMapWrapper())); + System.out.println(sqlExecutor.insert(new SimpleSQL("insert into s_test values ('默认数据源')"))); + DynamicDataSource.use("test"); + sqlExecutor.exec(new SimpleSQL("drop table if exists s_test")); + sqlExecutor.exec(new SimpleSQL("create table s_test(name varchar(32))")); + System.out.println(sqlExecutor.list(new SimpleSQL("select * from s_test"), new SimpleMapWrapper())); + System.out.println(sqlExecutor.insert(new SimpleSQL("insert into s_test values ('测试1')"))); + DynamicDataSource.useDefault(); + } +} diff --git a/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java similarity index 100% rename from hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java rename to hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java diff --git a/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java new file mode 100644 index 000000000..9f2c1fc93 --- /dev/null +++ b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java @@ -0,0 +1,10 @@ +package org.hsweb.web.service.impl.system; + +import org.hsweb.web.service.impl.AbstractTestCase; + +/** + * Created by zhouhao on 16-4-21. + */ +public class DataBaseManagerServiceImplTest extends AbstractTestCase { + +} \ No newline at end of file diff --git a/hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/template/TemplateServiceImplTest.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/template/TemplateServiceImplTest.java similarity index 100% rename from hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/template/TemplateServiceImplTest.java rename to hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/template/TemplateServiceImplTest.java diff --git a/hsweb-web-service/hsweb-web-service-simple/src/test/resources/application.yml b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/application.yml new file mode 100644 index 000000000..1679b0411 --- /dev/null +++ b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/application.yml @@ -0,0 +1,53 @@ +logging: + config: classpath:logback.xml +spring: + aop: + auto: true + redis: + host: 127.0.0.1 + port: 6389 + datasource: + xa: + dataSourceClassName: com.alibaba.druid.pool.xa.DruidXADataSource + properties: + url: jdbc:h2:file:./data/h2db;DB_CLOSE_ON_EXIT=FALSE + driverClassName: org.h2.Driver + username: sa + password: +# filters: stat +# maxActive: 20 +# initialSize: 1 +# maxWait: 60000 +# minIdle: 1 +# timeBetweenEvictionRunsMillis: 60000 +# minEvictableIdleTimeMillis: 300000 +# validationQuery: select 'x' +# testWhileIdle: true +# testOnBorrow: false +# testOnReturn: false +# poolPreparedStatements: false +# maxOpenPreparedStatements: 20 + name: core + url: jdbc:h2:file:./data/h2db;DB_CLOSE_ON_EXIT=FALSE + driverClassName: org.h2.Driver + username: sa + password: + type: com.alibaba.druid.pool.xa.DruidXADataSource + filters: stat + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 +mybatis: + type-aliases-package: org.hsweb.web.bean.po + mapper-locations: classpath*:org/hsweb/web/dao/impl/mybatis/mapper/oracle/**/*.xml + config: classpath:mybatis-config.xml + typeHandlers-package: org.hsweb.web.mybatis.handler diff --git a/hsweb-web-service-impl-common/src/test/resources/logback.xml b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/logback.xml similarity index 87% rename from hsweb-web-service-impl-common/src/test/resources/logback.xml rename to hsweb-web-service/hsweb-web-service-simple/src/test/resources/logback.xml index b646f07cf..76a3c3e58 100644 --- a/hsweb-web-service-impl-common/src/test/resources/logback.xml +++ b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/logback.xml @@ -9,6 +9,8 @@ + + diff --git a/hsweb-web-service-impl-common/src/test/resources/mybatis-config.xml b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/mybatis-config.xml similarity index 100% rename from hsweb-web-service-impl-common/src/test/resources/mybatis-config.xml rename to hsweb-web-service/hsweb-web-service-simple/src/test/resources/mybatis-config.xml diff --git a/hsweb-web-service-impl-common/src/test/resources/test.xlsx b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/test.xlsx similarity index 100% rename from hsweb-web-service-impl-common/src/test/resources/test.xlsx rename to hsweb-web-service/hsweb-web-service-simple/src/test/resources/test.xlsx diff --git a/hsweb-web-service/hsweb-web-service-simple/src/test/resources/transactions.properties b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/transactions.properties new file mode 100644 index 000000000..225acd505 --- /dev/null +++ b/hsweb-web-service/hsweb-web-service-simple/src/test/resources/transactions.properties @@ -0,0 +1,19 @@ +# +# Copyright 2015-2016 http://hsweb.me +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +com.atomikos.icatch.serial_jta_transactions=false +com.atomikos.icatch.output_dir=./data/atomikos +com.atomikos.icatch.log_base_dir=./data/atomikos \ No newline at end of file diff --git a/hsweb-web-service/pom.xml b/hsweb-web-service/pom.xml new file mode 100644 index 000000000..ce5193f29 --- /dev/null +++ b/hsweb-web-service/pom.xml @@ -0,0 +1,34 @@ + + + + + + hsweb-framework + org.hsweb + 2.0-SNAPSHOT + + 4.0.0 + + hsweb-web-service-api + hsweb-web-service-simple + + hsweb-web-service + pom + + \ No newline at end of file diff --git a/hsweb-web-websocket/pom.xml b/hsweb-web-websocket/pom.xml index 98607cf8b..df3488510 100644 --- a/hsweb-web-websocket/pom.xml +++ b/hsweb-web-websocket/pom.xml @@ -5,12 +5,11 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 hsweb-web-websocket - ${project.parent.version} diff --git a/hsweb-web-workflow/pom.xml b/hsweb-web-workflow/pom.xml index b49835f58..0459f28fc 100644 --- a/hsweb-web-workflow/pom.xml +++ b/hsweb-web-workflow/pom.xml @@ -5,7 +5,7 @@ hsweb-framework org.hsweb - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT 4.0.0 @@ -27,7 +27,7 @@ org.hsweb - hsweb-web-service-interface + hsweb-web-service-api org.activiti diff --git a/pom.xml b/pom.xml index 9036a8205..b3ee6098f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,19 +6,16 @@ org.hsweb hsweb-framework pom - 1.0.1-SNAPSHOT + 2.0-SNAPSHOT - hsweb-web-dao-interface - hsweb-web-dao-impl-mybatis - hsweb-web-service-interface - hsweb-web-service-impl-common + hsweb-web-dao + hsweb-web-service hsweb-web-controller hsweb-web-bean hsweb-web-core hsweb-web-websocket hsweb-web-workflow hsweb-web-concurrent - hsweb-web-crawler hsweb-web-oauth2 hsweb-web-datasource @@ -184,7 +181,7 @@ org.hsweb - hsweb-web-oauth2-service-common + hsweb-web-oauth2-service-simple ${project.version} @@ -278,22 +275,22 @@ org.hsweb - hsweb-web-dao-interface + hsweb-web-dao-api ${project.version} org.hsweb - hsweb-web-dao-impl-mybatis + hsweb-web-dao-mybatis ${project.version} org.hsweb - hsweb-web-service-interface + hsweb-web-service-api ${project.version} org.hsweb - hsweb-web-service-impl-common + hsweb-web-service-simple ${project.version}