From 624a501c187e503a86ded957fba4ccc156b553c7 Mon Sep 17 00:00:00 2001 From: lhc Date: Mon, 4 Dec 2023 17:17:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9base-1.2.1-SNAPSHOT?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 21 + hcframe-parent/hcframe-activiti/pom.xml | 6 +- .../activiti/ActivitiApplication.java | 4 +- .../activiti/ServletInitializer.java | 2 +- .../activiti/activiti/ActivitiUtils.java | 10 +- .../activiti/CommonProcessDefinition.java | 2 +- .../activiti/activiti/CommonTask.java | 2 +- .../activiti/common/ShiroRealmConfig.java | 8 +- .../controller/ProcessController.java | 10 +- .../activiti/controller/TaskController.java | 10 +- .../activiti/dao/BackReasonDao.java | 6 +- .../activiti/dao/CandidateUserDao.java | 6 +- .../activiti/dao/DataTaskDao.java | 6 +- .../activiti/dao/DataTaskHisDao.java | 6 +- .../activiti/entity/BackReason.java | 2 +- .../activiti/entity/CandidateUser.java | 2 +- .../activiti/entity/DataTask.java | 2 +- .../activiti/entity/DataTaskHis.java | 2 +- .../activiti/service/ProcessService.java | 8 +- .../activiti/service/TaskSysService.java | 8 +- .../service/impl/ProcessServiceImpl.java | 16 +- .../service/impl/TaskSysServiceImpl.java | 32 +- .../activiti/servicetask/TaskServe.java | 2 +- .../activiti/utils/FileUtil.java | 2 +- .../main/resources/mapping/BackReasonDao.xml | 2 +- .../resources/mapping/CandidateUserDao.xml | 2 +- .../main/resources/mapping/DataTaskDao.xml | 2 +- .../main/resources/mapping/DataTaskHisDao.xml | 2 +- .../activiti/ActivitiApplicationTests.java | 2 +- .../activiti/TaskControllerTest.java | 12 +- .../activiti/TestClass.java | 2 +- hcframe-parent/hcframe-base/pom.xml | 4 +- .../base/common/config/WebMvcConfig.java | 9 - .../auth/service/AuthFunctionService.java | 5 - .../service/DatasourceTypeService.java | 9 - .../common/ControllerExceptionHandler.java | 2 +- .../base/common/Mapper.java | 2 +- .../RestControllerExceptionHandler.java | 2 +- .../base/common/ResultPageInfo.java | 2 +- .../base/common/ResultVO.java | 2 +- .../base/common/ServiceException.java | 2 +- .../base/common/WebPageInfo.java | 2 +- .../base/common/config/FrameConfig.java | 2 +- .../base/common/config/GetHttpSession.java | 2 +- .../base/common/config/SimpleCORSFilter.java | 2 +- .../base/common/config/SwaggerConfig.java | 2 +- .../base/common/config/SwaggerEntity.java | 2 +- .../base/common}/config/WebMvcConfig.java | 2 +- .../config/annotation/EnableHcFrame.java | 2 +- .../common/config/webSessionListener.java | 2 +- .../base/common/utils/DateUtil.java | 2 +- .../base/common/utils/EmptyCheckUtils.java | 4 +- .../base/common/utils/EncryptUtil.java | 2 +- .../base/common/utils/HttpClient.java | 2 +- .../base/common/utils/JudgeException.java | 4 +- .../base/common/utils/ListUtil.java | 4 +- .../base/common/utils/MD5Util.java | 2 +- .../base/common/utils/MailAuthenticator.java | 2 +- .../base/common/utils/MailBean.java | 2 +- .../base/common/utils/MailOperate.java | 2 +- .../base/common/utils/MyPageHelper.java | 4 +- .../base/common/utils/ObjectUtil.java | 10 +- .../base/common/utils/RandomUtil.java | 2 +- .../base/common/utils/RegexUtil.java | 2 +- .../base/common/utils/SpringContextUtil.java | 2 +- .../base/common/utils/StringUtils.java | 2 +- .../base/common/utils/TableNameUtil.java | 10 +- .../base/common/utils/TokenProccessor.java | 2 +- .../base/common/utils/UserInfoUtil.java | 6 +- .../base/common/utils/XssClass.java | 2 +- .../module/auth/constants/AuthConstants.java | 2 +- .../controller/AuthFunctionController.java | 10 +- .../auth/controller/FtUserController.java | 10 +- .../base/module/auth/dao/FtUserDao.java | 6 +- .../base/module/auth/dao/OsSysMenuDao.java | 6 +- .../base/module/auth/entity/FtUser.java | 2 +- .../base/module/auth/entity/OsSysMenu.java | 4 +- .../auth/service/AuthFunctionService.java | 5 + .../module/auth/service/FtUserService.java | 4 +- .../base/module/auth/service/MenuService.java | 6 +- .../service/impl/AuthFunctionServiceImpl.java | 4 +- .../auth/service/impl/FtUserServiceImpl.java | 22 +- .../auth/service/impl/MenuServiceImpl.java | 16 +- .../base/module/auth/vo/MetaVo.java | 2 +- .../base/module/auth/vo/RouterVo.java | 2 +- .../base/module/cache/CacheService.java | 4 +- .../base/module/cache/base/BaseCache.java | 2 +- .../module/cache/base/impl/BaseCacheImpl.java | 6 +- .../base/module/cache/emum/CacheType.java | 2 +- .../module/cache/impl/DatasourceCache.java | 6 +- .../base/module/cache/impl/TableCache.java | 22 +- .../module/data/annotation/DataIgnore.java | 2 +- .../module/data/constants/FieldConstants.java | 2 +- .../module/data/constants/QueryConstants.java | 2 +- .../data/controller/IndexController.java | 2 +- .../data/controller/TableController.java | 12 +- .../base/module/data/dao/TableMapper.java | 2 +- .../data/exception/BaseMapperException.java | 2 +- .../module/data/exception/SqlException.java | 6 +- .../base/module/data/module/BaseMapper.java | 6 +- .../module/data/module/BaseMapperImpl.java | 24 +- .../base/module/data/module/Condition.java | 8 +- .../base/module/data/module/DataMap.java | 8 +- .../module/data/module/JoinCondition.java | 2 +- .../module/data/module/SelectCondition.java | 6 +- .../base/module/data/module/WebCondition.java | 4 +- .../module/data/service/TableService.java | 10 +- .../data/service/impl/TableServiceImpl.java | 28 +- .../datasource/annotation/DatasourceAnno.java | 2 +- .../aop/DataSourceAnnoOperation.java | 10 +- .../module/datasource/aop/DataSourceAop.java | 10 +- .../config/DataSourceConfiguration.java | 6 +- .../controller/DataSourceController.java | 14 +- .../DatasourceConfigController.java | 10 +- .../controller/DatasourceTypeController.java | 10 +- .../datasource/dao/DatasourceConfigDao.java | 6 +- .../datasource/dao/DatasourceTokenDao.java | 6 +- .../datasource/dao/DatasourceTypeDao.java | 6 +- .../datasource/dynamic/DBContextHolder.java | 4 +- .../dynamic/MyDynamicDataSource.java | 4 +- .../datasource/entity/DatasourceConfig.java | 2 +- .../datasource/entity/DatasourceToken.java | 2 +- .../datasource/entity/DatasourceType.java | 2 +- .../datasource/service/DataSourceService.java | 8 +- .../service/DatasourceConfigService.java | 4 +- .../service/DatasourceTypeService.java | 9 + .../service/impl/DataSourceServiceImpl.java | 32 +- .../impl/DatasourceConfigServiceImpl.java | 22 +- .../impl/DatasourceTypeServiceImpl.java | 8 +- .../datasource/utils/DataSourceUtil.java | 24 +- .../module/datasource/utils/DataUnit.java | 2 +- .../base/module/druid/DruidAuth.java | 2 +- .../base/module/druid/DruidConfig.java | 2 +- .../base/module/log/RequestLogAspect.java | 8 +- .../base/module/log/annotation/LogAnno.java | 2 +- .../module/log/model/RequestErrorInfo.java | 2 +- .../base/module/log/model/RequestInfo.java | 2 +- .../base/module/shiro/AuthFilter.java | 2 +- .../base/module/shiro/AuthToken.java | 2 +- .../base/module/shiro/CustomRealm.java | 10 +- .../base/module/shiro/FtToken.java | 2 +- .../base/module/shiro/NoStateFilter.java | 2 +- .../base/module/shiro/ShiroConfig.java | 4 +- .../module/shiro/ShiroSessionManager.java | 2 +- .../shiro/StatelessDefaultSubjectFactory.java | 2 +- .../base/module/shiro/dao/FtTokenDao.java | 6 +- .../module/shiro/service/ShiroService.java | 6 +- .../shiro/service/ShiroServiceImpl.java | 16 +- .../base/module/shiro/service/ShiroType.java | 2 +- .../module/shiro/service/SystemRealm.java | 2 +- .../controller/TableConfigController.java | 14 +- .../controller/TableGenController.java | 14 +- .../module/tableconfig/dao/OsSysFieldDao.java | 6 +- .../tableconfig/dao/OsSysSelectDao.java | 6 +- .../tableconfig/dao/OsSysTableMapper.java | 6 +- .../tableconfig/dao/TableGenMapper.java | 6 +- .../module/tableconfig/entity/FieldInfo.java | 2 +- .../module/tableconfig/entity/OsSysField.java | 2 +- .../tableconfig/entity/OsSysSelect.java | 2 +- .../module/tableconfig/entity/OsSysTable.java | 2 +- .../module/tableconfig/entity/TableInfo.java | 2 +- .../service/TableConfigService.java | 12 +- .../tableconfig/service/TableGenService.java | 12 +- .../service/impl/TableConfigServiceImpl.java | 36 +- .../service/impl/TableGenServiceImpl.java | 30 +- .../module/tableconfig/sqlinfo/SqlInfo.java | 6 +- .../tableconfig/sqlinfo/SqlInfoFactory.java | 8 +- .../sqlinfo/impl/MysqlSqlInfo.java | 12 +- .../sqlinfo/impl/OracleSqlInfo.java | 12 +- .../resources/mapping/auth/OsSysMenuDao.xml | 4 +- .../resources/mapping/data/TableMapper.xml | 2 +- .../datasource/DatasourceConfigDao.xml | 4 +- .../mapping/datasource/DatasourceTokenDao.xml | 4 +- .../mapping/datasource/DatasourceTypeDao.xml | 4 +- .../resources/mapping/shiro/FtTokenDao.xml | 4 +- .../mapping/tableconfig/OsSysFieldMapper.xml | 6 +- .../mapping/tableconfig/OsSysSelectDao.xml | 4 +- .../mapping/tableconfig/OsSysTableMapper.xml | 6 +- .../mapping/tableconfig/TableGenMapper.xml | 6 +- hcframe-parent/hcframe-config/pom.xml | 8 +- .../config/ConfigApplication.java | 2 +- .../common/config/CommandLineRunnerImpl.java | 6 +- .../common/config/ShiroRealmConfig.java | 10 +- .../config/module/cloud/ManageService.java | 6 +- .../cloud/controller/CloudController.java | 7 +- .../config/module/cms/CasConrtroller.java | 8 +- .../module/controller/CasController.java | 6 +- .../module/controller/TestController.java | 6 +- hcframe-parent/hcframe-es/pom.xml | 6 +- .../es/EsApplication.java | 2 +- .../es/ServletInitializer.java | 2 +- .../es/annotation/LogAnno.java | 2 +- .../es/config/CommandLineRunnerImpl.java | 5 +- .../es/config/ShiroRealmConfig.java | 10 +- .../es/controller/SearchController.java | 6 +- .../es/entity/FtUser.java | 2 +- .../es/esmapper/EsMapper.java | 2 +- .../es/esmapper/impl/EsMapperImpl.java | 6 +- .../es/service/SearchService.java | 4 +- .../es/service/impl/SearchServiceImpl.java | 8 +- hcframe-parent/hcframe-gateway/pom.xml | 10 +- .../gateway/GatewayApplication.java | 6 +- .../gateway/config/CorsConfig.java | 2 +- .../gateway/config/MyDataStorage.java | 6 +- .../gateway/swagger/SwaggerHandler.java | 2 +- .../gateway/swagger/SwaggerProvider.java | 2 +- hcframe-parent/hcframe-spider/pom.xml | 2 +- .../spider/SpiderClass.java | 2 +- .../hcframe-boot-starter/pom.xml | 2 +- .../hcframe-cloud-starter/pom.xml | 2 +- .../hcframe-gateway-cas-starter/pom.xml | 2 +- .../annotate/EnableGatewayCas.java | 6 +- .../config/CasGatewayClientConfig.java | 2 +- .../config/GatewayCasConfig.java | 11 +- .../controller/GatewayController.java | 4 +- .../gateway_cas_stater/data/DataStorage.java | 2 +- .../data/DataStorageImpl.java | 2 +- .../filter/AuthGlobalFilter.java | 10 +- .../filter/CasValidGlobalFilter.java | 8 +- .../filter/SimpleCORSFilter.java | 2 +- .../gateway_cas_stater/util/EncryptUtil.java | 2 +- .../util/TokenProccessor.java | 2 +- .../gateway_cas_stater/util/Utils.java | 4 +- .../hcframe-redis-starter/pom.xml | 2 +- .../redis/RedisConfig.java | 2 +- .../redis/RedisUtil.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- hcframe-parent/hcframe-starter/pom.xml | 2 +- hcframe-parent/hcframe-test/pom.xml | 6 +- .../test/TestApplication.java | 2 +- .../test/config/ShiroRealmConfig.java | 8 +- .../test/controller/DataTestController.java | 10 +- hcframe-parent/hcframe-user/pom.xml | 8 +- .../manage/service/ManageDataService.java | 4 - .../user/ServletInitializer.java | 2 +- .../user/UserApplication.java | 5 +- .../common/config/CommandLineRunnerImpl.java | 5 +- .../user/common/config/ShiroRealmConfig.java | 12 +- .../user/common/log/OprateLog.java | 21 +- .../user/common/utils/MD5Utils.java | 2 +- .../user/common/utils/POIUtil.java | 2 +- .../user/common/utils/StringUtils.java | 2 +- .../auth/controller/AuthController.java | 12 +- .../auth/controller/MenuController.java | 11 +- .../auth/controller/RoleController.java | 8 +- .../auth/controller/RoleDeptController.java | 6 +- .../auth/controller/RoleGroupController.java | 8 +- .../auth/controller/RoleUserController.java | 6 +- .../user/module/auth/mapper/AuthDao.java | 4 +- .../user/module/auth/mapper/RoleDao.java | 2 +- .../module/auth/mapper/impl/AuthDaoImpl.java | 10 +- .../module/auth/mapper/impl/RoleDaoImpl.java | 8 +- .../user/module/auth/service/AuthService.java | 6 +- .../user/module/auth/service/MenuService.java | 6 +- .../module/auth/service/RoleDeptService.java | 4 +- .../module/auth/service/RoleGroupServie.java | 6 +- .../user/module/auth/service/RoleService.java | 6 +- .../module/auth/service/RoleUserService.java | 4 +- .../auth/service/impl/AuthServiceImpl.java | 22 +- .../auth/service/impl/MenuServiceImpl2.java | 16 +- .../service/impl/RoleDeptServiceImpl.java | 18 +- .../service/impl/RoleGroupServiceImpl.java | 22 +- .../auth/service/impl/RoleServiceImpl.java | 20 +- .../service/impl/RoleUserServiceImpl.java | 18 +- .../manage/controller/CasController.java | 146 +- .../manage/controller/ManageController.java | 8 +- .../controller/ManageDataController.java | 2 +- .../manage/controller/ManageGwController.java | 11 +- .../module/manage/mapper/ManageMapper.java | 2 +- .../manage/mapper/impl/ManageMapperImpl.java | 8 +- .../manage/service/ManageDataService.java | 4 + .../manage/service/ManageGwService.java | 6 +- .../module/manage/service/ManageService.java | 6 +- .../service/impl/ManageGwServiceImpl.java | 24 +- .../service/impl/ManageServiceDataImpl.java | 36 +- .../service/impl/ManageServiceImpl.java | 8 +- .../userinfo/controller/DeptController.java | 8 +- .../userinfo/controller/LogController.java | 76 +- .../userinfo/controller/OrgController.java | 8 +- .../userinfo/controller/OsController.java | 136 +- .../userinfo/controller/TitleController.java | 135 +- .../module/userinfo/service/DeptService.java | 6 +- .../module/userinfo/service/LogService.java | 22 +- .../module/userinfo/service/OrgService.java | 6 +- .../module/userinfo/service/OsService.java | 40 +- .../module/userinfo/service/TitleService.java | 40 +- .../service/impl/DeptServiceImpl.java | 18 +- .../userinfo/service/impl/LogServiceImpl.java | 88 +- .../userinfo/service/impl/OrgServiceImpl.java | 18 +- .../userinfo/service/impl/OsServiceImpl.java | 142 +- .../service/impl/TitleServiceImpl.java | 145 +- .../hcframe-user/src/main/resources/GBCAS.sql | 6223 ++++++++ hcframe-parent/pom.xml | 9 +- hcframe-parent/storage/pom.xml | 203 - .../storage/StorageApplication.java | 16 - .../storage/api/BucketController.java | 58 - .../storage/api/FileController.java | 187 - .../storage/api/RegionController.java | 58 - .../storage/config/SimpleCORSFilter.java | 57 - .../storage/config/Swagger2Configuration.java | 34 - .../sinoparasoft/storage/domain/Bucket.java | 182 - .../storage/domain/HistoryFile.java | 186 - .../storage/domain/LogicalFile.java | 230 - .../storage/domain/PhysicalFile.java | 205 - .../storage/domain/PhysicalTileFile.java | 250 - .../storage/domain/StorageRegion.java | 223 - .../storage/model/BucketQueryRequest.java | 23 - .../storage/model/DataTableQuery.java | 81 - .../storage/model/FileBlockCreateRequest.java | 105 - .../storage/model/FileCreateRequest.java | 39 - .../storage/model/FileCreateResponse.java | 41 - .../model/LogicalFileQueryRequest.java | 34 - .../sinoparasoft/storage/model/Metadata.java | 87 - .../sinoparasoft/storage/model/Response.java | 28 - .../model/StorageRegionQueryRequest.java | 23 - .../storage/model/UuidCreateResponse.java | 40 - .../storage/repository/BucketRepository.java | 72 - .../repository/HistoryFileRepository.java | 14 - .../repository/LogicalFileRepository.java | 64 - .../repository/PhysicalFileRepository.java | 53 - .../PhysicalTileFileRepository.java | 81 - .../repository/StorageRegionRepository.java | 99 - .../storage/service/BucketService.java | 274 - .../storage/service/FileService.java | 951 -- .../storage/service/LogicalFileService.java | 5 - .../storage/service/MetadataService.java | 71 - .../storage/service/PhysicalFileService.java | 214 - .../service/PhysicalTileFileService.java | 218 - .../storage/service/StorageRegionService.java | 420 - .../sinoparasoft/storage/utils/CasUtils.java | 242 - .../storage/utils/DigestUtils.java | 127 - .../storage/utils/HttpClientUtils.java | 294 - .../storage/utils/HttpsClientUtils.java | 140 - .../sinoparasoft/storage/utils/MD5Utils.java | 29 - .../storage/utils/StringUtils.java | 31 - .../storage/web/ModelAndViewController.java | 129 - .../src/main/resources/application-iscas.yml | 25 - .../src/main/resources/application.yml | 35 - .../storage/src/main/resources/create-db.sql | 3 - .../storage/src/main/resources/ehcache.xml | 11 - .../storage/src/main/resources/logback.xml | 31 - .../static/casAssets/images/casBack.png | Bin 263934 -> 0 bytes .../static/casAssets/images/casBackBody.png | Bin 523233 -> 0 bytes .../static/casAssets/images/casBackNav.png | Bin 26948 -> 0 bytes .../static/casAssets/images/casLogo.png | Bin 4569 -> 0 bytes .../static/casAssets/images/casTitle.png | Bin 7837 -> 0 bytes .../bootstrap-table/css/bootstrap-table.css | 342 - .../css/bootstrap-table.min.css | 1 - .../bootstrap-table/css/bootstrap.min.css | 6 - .../bootstrap-table/css/bootstrap_bak.min.css | 5 - .../plugins/bootstrap-table/data/data1.json | 108 - .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../glyphicons-halflings-regular.eot | Bin 20335 -> 0 bytes .../glyphicons-halflings-regular.svg | 229 - .../glyphicons-halflings-regular.ttf | Bin 41280 -> 0 bytes .../glyphicons-halflings-regular.woff | Bin 23320 -> 0 bytes .../js/bootstrap-table-export.js | 81 - .../js/bootstrap-table-zh-CN.js | 46 - .../bootstrap-table/js/bootstrap-table.js | 3067 ---- .../js/bootstrap-table_scroll.js | 3196 ---- .../bootstrap-table/js/bootstrap.min.js | 6 - .../bootstrap-table/js/jquery.base64.js | 190 - .../plugins/bootstrap-table/js/jquery.min.js | 4 - .../plugins/bootstrap-table/js/tableExport.js | 359 - .../plugins/bootstrap/css/bootstrap-theme.css | 587 - .../bootstrap/css/bootstrap-theme.css.map | 1 - .../bootstrap/css/bootstrap-theme.min.css | 6 - .../bootstrap/css/bootstrap-theme.min.css.map | 1 - .../plugins/bootstrap/css/bootstrap.css | 6757 -------- .../plugins/bootstrap/css/bootstrap.css.map | 1 - .../plugins/bootstrap/css/bootstrap.min.css | 6 - .../bootstrap/css/bootstrap.min.css.map | 1 - .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../plugins/bootstrap/js/bootstrap.js | 2396 --- .../plugins/bootstrap/js/bootstrap.min.js | 7 - .../casAssets/plugins/bootstrap/js/npm.js | 13 - .../plugins/jquery/jquery-3.1.0.min.js | 4 - .../jquery.mCustomScrollbar.concat.min.js | 5 - .../scrollbar/jquery.mCustomScrollbar.css | 1268 -- .../plugins/scrollbar/mCSB_buttons.png | Bin 2998 -> 0 bytes .../casAssets/plugins/scrollbar/style.css | 845 - .../main/resources/static/css/adminlte.css | 13055 ---------------- .../resources/static/css/adminlte.css.map | 252 - .../resources/static/css/adminlte.min.css | 11 - .../src/main/resources/static/css/common.css | 1 - .../main/resources/static/fragments/aside.css | 34 - .../main/resources/static/fragments/aside.js | 10 - .../resources/static/fragments/breadcrumb.css | 13 - .../resources/static/fragments/breadcrumb.js | 39 - .../resources/static/fragments/hamburger.css | 15 - .../resources/static/fragments/hamburger.js | 16 - .../static/icomoon/fonts/icomoon.eot | Bin 210828 -> 0 bytes .../static/icomoon/fonts/icomoon.svg | 1346 -- .../static/icomoon/fonts/icomoon.ttf | Bin 210664 -> 0 bytes .../static/icomoon/fonts/icomoon.woff | Bin 210740 -> 0 bytes .../main/resources/static/icomoon/style.css | 4035 ----- .../resources/static/img/AdminLTELogo.png | Bin 10380 -> 0 bytes .../src/main/resources/static/img/avatar.png | Bin 8543 -> 0 bytes .../main/resources/static/img/avatar04.png | Bin 14037 -> 0 bytes .../src/main/resources/static/img/avatar2.png | Bin 8836 -> 0 bytes .../src/main/resources/static/img/avatar3.png | Bin 9780 -> 0 bytes .../src/main/resources/static/img/avatar5.png | Bin 8007 -> 0 bytes .../main/resources/static/img/boxed-bg.jpg | Bin 123770 -> 0 bytes .../main/resources/static/img/boxed-bg.png | Bin 43694 -> 0 bytes .../src/main/resources/static/img/casBack.png | Bin 263934 -> 0 bytes .../src/main/resources/static/img/casLogo.png | Bin 4569 -> 0 bytes .../main/resources/static/img/casTitle.png | Bin 7837 -> 0 bytes .../main/resources/static/img/castscsLogo.png | Bin 11874 -> 0 bytes .../static/img/credit/american-express.png | Bin 2205 -> 0 bytes .../resources/static/img/credit/cirrus.png | Bin 1593 -> 0 bytes .../static/img/credit/mastercard.png | Bin 1593 -> 0 bytes .../resources/static/img/credit/mestro.png | Bin 1588 -> 0 bytes .../resources/static/img/credit/paypal.png | Bin 2046 -> 0 bytes .../resources/static/img/credit/paypal2.png | Bin 1372 -> 0 bytes .../main/resources/static/img/credit/visa.png | Bin 1137 -> 0 bytes .../resources/static/img/default-150x150.png | Bin 373 -> 0 bytes .../src/main/resources/static/img/icons.png | Bin 1154 -> 0 bytes .../src/main/resources/static/img/photo1.png | Bin 673900 -> 0 bytes .../src/main/resources/static/img/photo2.png | Bin 424395 -> 0 bytes .../src/main/resources/static/img/photo3.jpg | Bin 392079 -> 0 bytes .../src/main/resources/static/img/photo4.jpg | Bin 1179224 -> 0 bytes .../resources/static/img/user1-128x128.jpg | Bin 2879 -> 0 bytes .../resources/static/img/user2-160x160.jpg | Bin 7070 -> 0 bytes .../resources/static/img/user3-128x128.jpg | Bin 3511 -> 0 bytes .../resources/static/img/user4-128x128.jpg | Bin 3477 -> 0 bytes .../resources/static/img/user5-128x128.jpg | Bin 6446 -> 0 bytes .../resources/static/img/user6-128x128.jpg | Bin 4342 -> 0 bytes .../resources/static/img/user7-128x128.jpg | Bin 6434 -> 0 bytes .../resources/static/img/user8-128x128.jpg | Bin 5060 -> 0 bytes .../resources/static/intro/css/bootstrap.css | 6757 -------- .../static/intro/css/fancybox.custom.css | 227 - .../static/intro/css/font-awesome.css | 2337 --- .../resources/static/intro/css/icomoon.css | 506 - .../static/intro/css/owl.carousel.css | 71 - .../static/intro/css/owl.carousel.min.css | 13 - .../static/intro/css/owl.transitions.css | 163 - .../resources/static/intro/css/shortcodes.css | 3839 ----- .../main/resources/static/intro/css/style.css | 179 - .../main/resources/static/intro/favicon.ico | Bin 1150 -> 0 bytes .../intro/fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes .../resources/static/intro/fonts/icomoon.eot | Bin 37196 -> 0 bytes .../resources/static/intro/fonts/icomoon.svg | 170 - .../resources/static/intro/fonts/icomoon.ttf | Bin 37032 -> 0 bytes .../resources/static/intro/fonts/icomoon.woff | Bin 24512 -> 0 bytes .../static/intro/images/about-bg.jpg | Bin 53998 -> 0 bytes .../resources/static/intro/images/about.jpg | Bin 150764 -> 0 bytes .../static/intro/images/ajaxloader.gif | Bin 1517 -> 0 bytes .../resources/static/intro/images/blank.gif | Bin 43 -> 0 bytes .../resources/static/intro/images/contact.jpg | Bin 79144 -> 0 bytes .../static/intro/images/fancybox.png | Bin 14497 -> 0 bytes .../resources/static/intro/images/grab.cur | Bin 326 -> 0 bytes .../static/intro/images/grey-texture.png | Bin 10039 -> 0 bytes .../static/intro/images/intro-slide01.jpg | Bin 100767 -> 0 bytes .../static/intro/images/intro-slide02.jpg | Bin 55727 -> 0 bytes .../static/intro/images/intro-slide03.jpg | Bin 34390 -> 0 bytes .../static/intro/images/intro-slide04.jpg | Bin 63526 -> 0 bytes .../static/intro/images/news-single.jpg | Bin 41638 -> 0 bytes .../resources/static/intro/images/news.jpg | Bin 86525 -> 0 bytes .../static/intro/images/portfolio-bg.jpg | Bin 14840 -> 0 bytes .../static/intro/images/process-bg.jpg | Bin 16188 -> 0 bytes .../static/intro/images/swipe-icon.png | Bin 838 -> 0 bytes .../static/intro/images/twitter-bg.jpg | Bin 12428 -> 0 bytes .../static/intro/images/work-504-big.jpg | Bin 63526 -> 0 bytes .../intro/images/work-confirmation-big.jpg | Bin 56959 -> 0 bytes .../static/intro/images/work-flat-ui-big.jpg | Bin 31369 -> 0 bytes .../intro/images/work-super-desk-big.jpg | Bin 45555 -> 0 bytes .../intro/images/work-super-wii-big.jpg | Bin 27968 -> 0 bytes .../intro/images/work-super-wii-big2.jpg | Bin 30530 -> 0 bytes .../static/intro/images/work-symbols-big.jpg | Bin 34390 -> 0 bytes .../static/intro/images/work-vinyl-big.jpg | Bin 29447 -> 0 bytes .../static/intro/images/work-workouts-big.jpg | Bin 42104 -> 0 bytes .../static/intro/js/bootstrap.min.js | 7 - .../main/resources/static/intro/js/custom.js | 38 - .../static/intro/js/jquery.easing-1.3.min.js | 38 - .../intro/js/jquery.fancybox-1.3.4.pack.js | 76 - .../static/intro/js/jquery.gmap.min.js | 35 - .../resources/static/intro/js/jquery.min.js | 4 - .../intro/js/jquery.queryloader2.min.js | 15 - .../static/intro/js/jquery.scrollto.min.js | 7 - .../static/intro/js/jquery.small.plugins.js | 66 - .../static/intro/js/jquery.transit.min.js | 1 - .../static/intro/js/modernizr.custom.js | 4 - .../static/intro/js/owl.carousel.min.js | 7 - .../resources/static/intro/js/smoothscroll.js | 9 - .../static/intro/js/waypoints.min.js | 8 - .../static/intro/picture/about-slide01.jpg | Bin 41669 -> 0 bytes .../static/intro/picture/about-slide02.jpg | Bin 14490 -> 0 bytes .../static/intro/picture/business1.png | Bin 30913 -> 0 bytes .../static/intro/picture/business2.png | Bin 80599 -> 0 bytes .../static/intro/picture/business3.png | Bin 109920 -> 0 bytes .../static/intro/picture/business4.png | Bin 102705 -> 0 bytes .../static/intro/picture/business5.png | Bin 75687 -> 0 bytes .../static/intro/picture/business6.png | Bin 79368 -> 0 bytes .../static/intro/picture/business7.png | Bin 56071 -> 0 bytes .../static/intro/picture/business8.png | Bin 101226 -> 0 bytes .../static/intro/picture/business9.png | Bin 66715 -> 0 bytes .../resources/static/intro/picture/cas1.jpg | Bin 82293 -> 0 bytes .../resources/static/intro/picture/cas1.png | Bin 34975 -> 0 bytes .../resources/static/intro/picture/cas2.jpg | Bin 133708 -> 0 bytes .../resources/static/intro/picture/cas2.png | Bin 126686 -> 0 bytes .../static/intro/picture/casLogo.png | Bin 4569 -> 0 bytes .../static/intro/picture/casLogo_white.png | Bin 2024 -> 0 bytes .../static/intro/picture/dataAll.png | Bin 1697014 -> 0 bytes .../static/intro/picture/dataOne.png | Bin 169655 -> 0 bytes .../static/intro/picture/interconnect1.png | Bin 34854 -> 0 bytes .../static/intro/picture/interconnect2.png | Bin 42359 -> 0 bytes .../static/intro/picture/logo-3docean.png | Bin 2856 -> 0 bytes .../static/intro/picture/logo-audiojungle.png | Bin 3267 -> 0 bytes .../static/intro/picture/logo-codecanyon.png | Bin 2830 -> 0 bytes .../intro/picture/logo-graphicriver.png | Bin 3035 -> 0 bytes .../static/intro/picture/logo-photodune.png | Bin 3224 -> 0 bytes .../static/intro/picture/logo-themeforest.png | Bin 2986 -> 0 bytes .../resources/static/intro/picture/logo.png | Bin 1344 -> 0 bytes .../static/intro/picture/member01.jpg | Bin 5065 -> 0 bytes .../static/intro/picture/member02.jpg | Bin 6487 -> 0 bytes .../static/intro/picture/member03.jpg | Bin 5543 -> 0 bytes .../static/intro/picture/member04.jpg | Bin 5415 -> 0 bytes .../static/intro/picture/mobile1.jpg | Bin 19378 -> 0 bytes .../static/intro/picture/mobile2.png | Bin 31207 -> 0 bytes .../static/intro/picture/mobile3.png | Bin 156507 -> 0 bytes .../resources/static/intro/picture/netAd1.png | Bin 336886 -> 0 bytes .../resources/static/intro/picture/netAd2.jpg | Bin 19246 -> 0 bytes .../static/intro/picture/news-image02.jpg | Bin 15664 -> 0 bytes .../static/intro/picture/news-single02.jpg | Bin 19314 -> 0 bytes .../static/intro/picture/process-graph.png | Bin 15399 -> 0 bytes .../static/intro/picture/spectra-logo.png | Bin 1216 -> 0 bytes .../static/intro/picture/work-504.jpg | Bin 15445 -> 0 bytes .../intro/picture/work-confirmation.jpg | Bin 16516 -> 0 bytes .../static/intro/picture/work-flat-ui.jpg | Bin 12967 -> 0 bytes .../static/intro/picture/work-super-desk.jpg | Bin 10274 -> 0 bytes .../static/intro/picture/work-super-wii.jpg | Bin 9094 -> 0 bytes .../static/intro/picture/work-symbols.jpg | Bin 8256 -> 0 bytes .../static/intro/picture/work-vinyl.jpg | Bin 15531 -> 0 bytes .../static/intro/picture/work-workouts.jpg | Bin 16968 -> 0 bytes .../static/intro/picture/xhhyfwxt.png | Bin 1081461 -> 0 bytes .../static/intro/picture/xmsbglxt.png | Bin 874444 -> 0 bytes .../static/intro/picture/zxxtbgxt.png | Bin 727125 -> 0 bytes .../static/intro/picture/电子书首页.png | Bin 279610 -> 0 bytes .../main/resources/static/intro/service.ico | Bin 1150 -> 0 bytes .../src/main/resources/static/js/adminlte.js | 823 - .../main/resources/static/js/adminlte.js.map | 1 - .../main/resources/static/js/adminlte.min.js | 7 - .../resources/static/js/adminlte.min.js.map | 1 - .../resources/static/js/applications/index.js | 263 - .../main/resources/static/js/buckets/index.js | 143 - .../src/main/resources/static/js/demo.js | 199 - .../resources/static/js/files/elupload.js | 49 - .../main/resources/static/js/files/index.js | 145 - .../main/resources/static/js/files/upload.js | 35 - .../main/resources/static/js/flavors/index.js | 165 - .../resources/static/js/identities/index.js | 173 - .../static/js/microservices/index.js | 133 - .../resources/static/js/openstacks/index.js | 127 - .../static/js/organizations/index.js | 284 - .../main/resources/static/js/regions/index.js | 146 - .../main/resources/static/js/roles/index.js | 129 - .../main/resources/static/js/users/index.js | 227 - .../resources/static/js/users/register.js | 39 - .../main/resources/static/js/vue-uploader.js | 2 - .../src/main/resources/templates/about.html | 555 - .../templates/applications/index.html | 220 - .../templates/applications/loginCXQD.html | 21 - .../templates/applications/loginGRHY.html | 20 - .../templates/applications/loginKJQK.html | 33 - .../templates/applications/loginKJST.html | 21 - .../templates/applications/loginNJBC.html | 21 - .../templates/applications/loginNJSW.html | 21 - .../resources/templates/buckets/index.html | 147 - .../src/main/resources/templates/data.html | 314 - .../resources/templates/files/elupload.html | 147 - .../main/resources/templates/files/index.html | 148 - .../resources/templates/files/plupload.html | 147 - .../resources/templates/files/upload.html | 156 - .../resources/templates/flavors/index.html | 156 - .../resources/templates/fragments/aside.html | 71 - .../templates/fragments/breadcrumb.html | 43 - .../templates/fragments/content.html | 66 - .../resources/templates/fragments/footer.html | 25 - .../templates/fragments/hamburger.html | 33 - .../resources/templates/fragments/header.html | 10 - .../resources/templates/fragments/navbar.html | 50 - .../templates/fragments/sidebar.html | 78 - .../resources/templates/identities/index.html | 156 - .../src/main/resources/templates/index.html | 75 - .../main/resources/templates/introduce.html | 153 - .../src/main/resources/templates/layout.html | 52 - .../resources/templates/main-20200319.html | 209 - .../resources/templates/main-20200324.html | 209 - .../src/main/resources/templates/main.html | 137 - .../templates/microservices/index.html | 150 - .../resources/templates/openstacks/index.html | 134 - .../templates/organizations/index.html | 202 - .../resources/templates/regions/index.html | 149 - .../main/resources/templates/roles/index.html | 138 - .../src/main/resources/templates/test.html | 80 - .../main/resources/templates/users/index.html | 159 - .../main/resources/templates/users/login.html | 81 - .../resources/templates/users/register.html | 90 - 606 files changed, 7609 insertions(+), 68716 deletions(-) create mode 100644 LICENSE rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/ActivitiApplication.java (92%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/ServletInitializer.java (92%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/activiti/ActivitiUtils.java (98%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/activiti/CommonProcessDefinition.java (96%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/activiti/CommonTask.java (97%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/common/ShiroRealmConfig.java (90%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/controller/ProcessController.java (94%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/controller/TaskController.java (94%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/dao/BackReasonDao.java (54%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/dao/CandidateUserDao.java (55%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/dao/DataTaskDao.java (54%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/dao/DataTaskHisDao.java (54%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/entity/BackReason.java (92%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/entity/CandidateUser.java (93%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/entity/DataTask.java (95%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/entity/DataTaskHis.java (95%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/service/ProcessService.java (78%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/service/TaskSysService.java (80%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/service/impl/ProcessServiceImpl.java (94%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/service/impl/TaskSysServiceImpl.java (89%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/servicetask/TaskServe.java (86%) rename hcframe-parent/hcframe-activiti/src/main/java/com/{hcframe => taixingyiji}/activiti/utils/FileUtil.java (98%) rename hcframe-parent/hcframe-activiti/src/test/java/com/{hcframe => taixingyiji}/activiti/ActivitiApplicationTests.java (85%) rename hcframe-parent/hcframe-activiti/src/test/java/com/{hcframe => taixingyiji}/activiti/TaskControllerTest.java (88%) rename hcframe-parent/hcframe-activiti/src/test/java/com/{hcframe => taixingyiji}/activiti/TestClass.java (99%) delete mode 100644 hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/WebMvcConfig.java delete mode 100644 hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/AuthFunctionService.java delete mode 100644 hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceTypeService.java rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/ControllerExceptionHandler.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/Mapper.java (88%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/RestControllerExceptionHandler.java (94%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/ResultPageInfo.java (88%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/ResultVO.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/ServiceException.java (94%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/WebPageInfo.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/config/FrameConfig.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/config/GetHttpSession.java (93%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/config/SimpleCORSFilter.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/config/SwaggerConfig.java (99%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/config/SwaggerEntity.java (88%) rename hcframe-parent/{storage/src/main/java/com/sinoparasoft/storage => hcframe-base/src/main/java/com/taixingyiji/base/common}/config/WebMvcConfig.java (80%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/config/annotation/EnableHcFrame.java (85%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/config/webSessionListener.java (93%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/DateUtil.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/EmptyCheckUtils.java (75%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/EncryptUtil.java (99%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/HttpClient.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/JudgeException.java (74%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/ListUtil.java (85%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/MD5Util.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/MailAuthenticator.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/MailBean.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/MailOperate.java (99%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/MyPageHelper.java (81%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/ObjectUtil.java (95%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/RandomUtil.java (88%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/RegexUtil.java (83%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/SpringContextUtil.java (95%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/StringUtils.java (99%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/TableNameUtil.java (83%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/TokenProccessor.java (94%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/UserInfoUtil.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/common/utils/XssClass.java (95%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/constants/AuthConstants.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/controller/AuthFunctionController.java (77%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/controller/FtUserController.java (85%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/dao/FtUserDao.java (50%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/dao/OsSysMenuDao.java (76%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/entity/FtUser.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/entity/OsSysMenu.java (95%) create mode 100644 hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/AuthFunctionService.java rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/service/FtUserService.java (72%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/service/MenuService.java (54%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/service/impl/AuthFunctionServiceImpl.java (51%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/service/impl/FtUserServiceImpl.java (78%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/service/impl/MenuServiceImpl.java (93%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/vo/MetaVo.java (96%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/auth/vo/RouterVo.java (95%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/cache/CacheService.java (80%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/cache/base/BaseCache.java (90%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/cache/base/impl/BaseCacheImpl.java (90%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/cache/emum/CacheType.java (83%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/cache/impl/DatasourceCache.java (88%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/cache/impl/TableCache.java (86%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/annotation/DataIgnore.java (86%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/constants/FieldConstants.java (59%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/constants/QueryConstants.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/controller/IndexController.java (81%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/controller/TableController.java (94%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/dao/TableMapper.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/exception/BaseMapperException.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/exception/SqlException.java (86%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/module/BaseMapper.java (96%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/module/BaseMapperImpl.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/module/Condition.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/module/DataMap.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/module/JoinCondition.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/module/SelectCondition.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/module/WebCondition.java (96%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/service/TableService.java (84%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/data/service/impl/TableServiceImpl.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/annotation/DatasourceAnno.java (88%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/aop/DataSourceAnnoOperation.java (77%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/aop/DataSourceAop.java (87%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/config/DataSourceConfiguration.java (95%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/controller/DataSourceController.java (88%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/controller/DatasourceConfigController.java (77%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/controller/DatasourceTypeController.java (70%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/dao/DatasourceConfigDao.java (54%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/dao/DatasourceTokenDao.java (51%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/dao/DatasourceTypeDao.java (51%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/dynamic/DBContextHolder.java (86%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/dynamic/MyDynamicDataSource.java (87%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/entity/DatasourceConfig.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/entity/DatasourceToken.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/entity/DatasourceType.java (95%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/service/DataSourceService.java (74%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/service/DatasourceConfigService.java (67%) create mode 100644 hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DatasourceTypeService.java rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/service/impl/DataSourceServiceImpl.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/service/impl/DatasourceConfigServiceImpl.java (80%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/service/impl/DatasourceTypeServiceImpl.java (58%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/utils/DataSourceUtil.java (90%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/datasource/utils/DataUnit.java (90%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/druid/DruidAuth.java (81%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/druid/DruidConfig.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/log/RequestLogAspect.java (95%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/log/annotation/LogAnno.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/log/model/RequestErrorInfo.java (89%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/log/model/RequestInfo.java (89%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/AuthFilter.java (99%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/AuthToken.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/CustomRealm.java (94%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/FtToken.java (94%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/NoStateFilter.java (98%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/ShiroConfig.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/ShiroSessionManager.java (97%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/StatelessDefaultSubjectFactory.java (93%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/dao/FtTokenDao.java (51%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/service/ShiroService.java (66%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/service/ShiroServiceImpl.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/service/ShiroType.java (70%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/shiro/service/SystemRealm.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/controller/TableConfigController.java (89%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/controller/TableGenController.java (83%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/dao/OsSysFieldDao.java (63%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/dao/OsSysSelectDao.java (50%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/dao/OsSysTableMapper.java (52%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/dao/TableGenMapper.java (90%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/entity/FieldInfo.java (94%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/entity/OsSysField.java (96%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/entity/OsSysSelect.java (93%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/entity/OsSysTable.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/entity/TableInfo.java (92%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/service/TableConfigService.java (70%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/service/TableGenService.java (58%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/service/impl/TableConfigServiceImpl.java (91%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/service/impl/TableGenServiceImpl.java (81%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/sqlinfo/SqlInfo.java (66%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/sqlinfo/SqlInfoFactory.java (81%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/sqlinfo/impl/MysqlSqlInfo.java (73%) rename hcframe-parent/hcframe-base/src/main/java/com/{hcframe => taixingyiji}/base/module/tableconfig/sqlinfo/impl/OracleSqlInfo.java (72%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/ConfigApplication.java (97%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/common/config/CommandLineRunnerImpl.java (83%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/common/config/ShiroRealmConfig.java (89%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/module/cloud/ManageService.java (54%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/module/cloud/controller/CloudController.java (56%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/module/cms/CasConrtroller.java (77%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/module/controller/CasController.java (94%) rename hcframe-parent/hcframe-config/src/main/java/com/{hcframe => taixingyiji}/config/module/controller/TestController.java (96%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/EsApplication.java (97%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/ServletInitializer.java (93%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/annotation/LogAnno.java (93%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/config/CommandLineRunnerImpl.java (85%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/config/ShiroRealmConfig.java (89%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/controller/SearchController.java (93%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/entity/FtUser.java (97%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/esmapper/EsMapper.java (91%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/esmapper/impl/EsMapperImpl.java (95%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/service/SearchService.java (80%) rename hcframe-parent/hcframe-es/src/main/java/com/{hcframe => taixingyiji}/es/service/impl/SearchServiceImpl.java (95%) rename hcframe-parent/hcframe-gateway/src/main/java/com/{hcframe => taixingyiji}/gateway/GatewayApplication.java (77%) rename hcframe-parent/hcframe-gateway/src/main/java/com/{hcframe => taixingyiji}/gateway/config/CorsConfig.java (96%) rename hcframe-parent/hcframe-gateway/src/main/java/com/{hcframe => taixingyiji}/gateway/config/MyDataStorage.java (90%) rename hcframe-parent/hcframe-gateway/src/main/java/com/{hcframe => taixingyiji}/gateway/swagger/SwaggerHandler.java (97%) rename hcframe-parent/hcframe-gateway/src/main/java/com/{hcframe => taixingyiji}/gateway/swagger/SwaggerProvider.java (98%) rename hcframe-parent/hcframe-spider/src/main/java/com/{hcframe => taixingyiji}/spider/SpiderClass.java (99%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/annotate/EnableGatewayCas.java (67%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/config/CasGatewayClientConfig.java (94%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/config/GatewayCasConfig.java (78%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/controller/GatewayController.java (90%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/data/DataStorage.java (74%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/data/DataStorageImpl.java (95%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/filter/AuthGlobalFilter.java (94%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/filter/CasValidGlobalFilter.java (93%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/filter/SimpleCORSFilter.java (97%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/util/EncryptUtil.java (99%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/util/TokenProccessor.java (93%) rename hcframe-parent/hcframe-starter/hcframe-gateway-cas-starter/src/main/java/com/{hcframe => taixingyiji}/gateway_cas_stater/util/Utils.java (97%) rename hcframe-parent/hcframe-starter/hcframe-redis-starter/src/main/java/com/{hcframe => taixingyiji}/redis/RedisConfig.java (97%) rename hcframe-parent/hcframe-starter/hcframe-redis-starter/src/main/java/com/{hcframe => taixingyiji}/redis/RedisUtil.java (99%) rename hcframe-parent/hcframe-test/src/main/java/com/{hcframe => taixingyiji}/test/TestApplication.java (96%) rename hcframe-parent/hcframe-test/src/main/java/com/{hcframe => taixingyiji}/test/config/ShiroRealmConfig.java (91%) rename hcframe-parent/hcframe-test/src/main/java/com/{hcframe => taixingyiji}/test/controller/DataTestController.java (68%) delete mode 100644 hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/service/ManageDataService.java rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/ServletInitializer.java (93%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/UserApplication.java (87%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/common/config/CommandLineRunnerImpl.java (84%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/common/config/ShiroRealmConfig.java (89%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/common/log/OprateLog.java (85%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/common/utils/MD5Utils.java (93%) mode change 100755 => 100644 rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/common/utils/POIUtil.java (99%) mode change 100755 => 100644 rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/common/utils/StringUtils.java (93%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/controller/AuthController.java (85%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/controller/MenuController.java (92%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/controller/RoleController.java (90%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/controller/RoleDeptController.java (89%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/controller/RoleGroupController.java (92%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/controller/RoleUserController.java (88%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/mapper/AuthDao.java (71%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/mapper/RoleDao.java (83%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/mapper/impl/AuthDaoImpl.java (90%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/mapper/impl/RoleDaoImpl.java (74%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/AuthService.java (82%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/MenuService.java (83%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/RoleDeptService.java (81%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/RoleGroupServie.java (82%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/RoleService.java (81%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/RoleUserService.java (81%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/impl/AuthServiceImpl.java (96%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/impl/MenuServiceImpl2.java (93%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/impl/RoleDeptServiceImpl.java (86%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/impl/RoleGroupServiceImpl.java (84%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/impl/RoleServiceImpl.java (81%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/auth/service/impl/RoleUserServiceImpl.java (86%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/controller/CasController.java (92%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/controller/ManageController.java (92%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/controller/ManageDataController.java (85%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/controller/ManageGwController.java (89%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/mapper/ManageMapper.java (85%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/mapper/impl/ManageMapperImpl.java (80%) create mode 100644 hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/service/ManageDataService.java rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/service/ManageGwService.java (82%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/service/ManageService.java (81%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/service/impl/ManageGwServiceImpl.java (89%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/service/impl/ManageServiceDataImpl.java (89%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/manage/service/impl/ManageServiceImpl.java (69%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/controller/DeptController.java (88%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/controller/LogController.java (52%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/controller/OrgController.java (86%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/controller/OsController.java (84%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/controller/TitleController.java (86%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/DeptService.java (75%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/LogService.java (55%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/OrgService.java (71%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/OsService.java (72%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/TitleService.java (74%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/impl/DeptServiceImpl.java (91%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/impl/LogServiceImpl.java (62%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/impl/OrgServiceImpl.java (79%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/impl/OsServiceImpl.java (74%) rename hcframe-parent/hcframe-user/src/main/java/com/{hcframe => taixingyiji}/user/module/userinfo/service/impl/TitleServiceImpl.java (75%) create mode 100644 hcframe-parent/hcframe-user/src/main/resources/GBCAS.sql delete mode 100644 hcframe-parent/storage/pom.xml delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/StorageApplication.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/api/BucketController.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/api/FileController.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/api/RegionController.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/config/SimpleCORSFilter.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/config/Swagger2Configuration.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/domain/Bucket.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/domain/HistoryFile.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/domain/LogicalFile.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/domain/PhysicalFile.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/domain/PhysicalTileFile.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/domain/StorageRegion.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/BucketQueryRequest.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/DataTableQuery.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/FileBlockCreateRequest.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/FileCreateRequest.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/FileCreateResponse.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/LogicalFileQueryRequest.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/Metadata.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/Response.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/StorageRegionQueryRequest.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/model/UuidCreateResponse.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/repository/BucketRepository.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/repository/HistoryFileRepository.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/repository/LogicalFileRepository.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/repository/PhysicalFileRepository.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/repository/PhysicalTileFileRepository.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/repository/StorageRegionRepository.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/service/BucketService.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/service/FileService.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/service/LogicalFileService.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/service/MetadataService.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/service/PhysicalFileService.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/service/PhysicalTileFileService.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/service/StorageRegionService.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/utils/CasUtils.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/utils/DigestUtils.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/utils/HttpClientUtils.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/utils/HttpsClientUtils.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/utils/MD5Utils.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/utils/StringUtils.java delete mode 100644 hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/web/ModelAndViewController.java delete mode 100644 hcframe-parent/storage/src/main/resources/application-iscas.yml delete mode 100644 hcframe-parent/storage/src/main/resources/application.yml delete mode 100644 hcframe-parent/storage/src/main/resources/create-db.sql delete mode 100644 hcframe-parent/storage/src/main/resources/ehcache.xml delete mode 100644 hcframe-parent/storage/src/main/resources/logback.xml delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/images/casBack.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/images/casBackBody.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/images/casBackNav.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/images/casLogo.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/images/casTitle.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/css/bootstrap-table.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/css/bootstrap-table.min.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/css/bootstrap.min.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/css/bootstrap_bak.min.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/data/data1.json delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts/glyphicons-halflings-regular.eot delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts/glyphicons-halflings-regular.svg delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts/glyphicons-halflings-regular.ttf delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts/glyphicons-halflings-regular.woff delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts_bak/glyphicons-halflings-regular.eot delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts_bak/glyphicons-halflings-regular.svg delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts_bak/glyphicons-halflings-regular.ttf delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/fonts_bak/glyphicons-halflings-regular.woff delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap-table-export.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap-table-zh-CN.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap-table.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap-table_scroll.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/jquery.base64.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/jquery.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/tableExport.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap-theme.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap-theme.css.map delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap-theme.min.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap-theme.min.css.map delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap.css.map delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap.min.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/css/bootstrap.min.css.map delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/js/bootstrap.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/js/bootstrap.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap/js/npm.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/jquery/jquery-3.1.0.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/scrollbar/jquery.mCustomScrollbar.concat.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/scrollbar/jquery.mCustomScrollbar.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/scrollbar/mCSB_buttons.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/casAssets/plugins/scrollbar/style.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/css/adminlte.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/css/adminlte.css.map delete mode 100644 hcframe-parent/storage/src/main/resources/static/css/adminlte.min.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/css/common.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/fragments/aside.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/fragments/aside.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/fragments/breadcrumb.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/fragments/breadcrumb.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/fragments/hamburger.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/fragments/hamburger.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/icomoon/fonts/icomoon.eot delete mode 100644 hcframe-parent/storage/src/main/resources/static/icomoon/fonts/icomoon.svg delete mode 100644 hcframe-parent/storage/src/main/resources/static/icomoon/fonts/icomoon.ttf delete mode 100644 hcframe-parent/storage/src/main/resources/static/icomoon/fonts/icomoon.woff delete mode 100644 hcframe-parent/storage/src/main/resources/static/icomoon/style.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/AdminLTELogo.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/avatar.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/avatar04.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/avatar2.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/avatar3.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/avatar5.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/boxed-bg.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/boxed-bg.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/casBack.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/casLogo.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/casTitle.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/castscsLogo.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/credit/american-express.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/credit/cirrus.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/credit/mastercard.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/credit/mestro.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/credit/paypal.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/credit/paypal2.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/credit/visa.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/default-150x150.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/icons.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/photo1.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/photo2.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/photo3.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/photo4.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user1-128x128.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user2-160x160.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user3-128x128.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user4-128x128.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user5-128x128.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user6-128x128.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user7-128x128.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/img/user8-128x128.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/bootstrap.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/fancybox.custom.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/font-awesome.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/icomoon.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/owl.carousel.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/owl.carousel.min.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/owl.transitions.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/shortcodes.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/css/style.css delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/favicon.ico delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/fonts/fontawesome-webfont.woff2 delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/fonts/icomoon.eot delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/fonts/icomoon.svg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/fonts/icomoon.ttf delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/fonts/icomoon.woff delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/about-bg.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/about.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/ajaxloader.gif delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/blank.gif delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/contact.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/fancybox.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/grab.cur delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/grey-texture.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/intro-slide01.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/intro-slide02.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/intro-slide03.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/intro-slide04.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/news-single.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/news.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/portfolio-bg.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/process-bg.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/swipe-icon.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/twitter-bg.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-504-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-confirmation-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-flat-ui-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-super-desk-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-super-wii-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-super-wii-big2.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-symbols-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-vinyl-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/images/work-workouts-big.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/bootstrap.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/custom.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.easing-1.3.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.fancybox-1.3.4.pack.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.gmap.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.queryloader2.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.scrollto.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.small.plugins.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/jquery.transit.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/modernizr.custom.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/owl.carousel.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/smoothscroll.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/js/waypoints.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/about-slide01.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/about-slide02.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business1.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business2.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business3.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business4.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business5.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business6.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business7.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business8.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/business9.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/cas1.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/cas1.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/cas2.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/cas2.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/casLogo.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/casLogo_white.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/dataAll.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/dataOne.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/interconnect1.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/interconnect2.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/logo-3docean.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/logo-audiojungle.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/logo-codecanyon.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/logo-graphicriver.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/logo-photodune.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/logo-themeforest.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/logo.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/member01.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/member02.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/member03.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/member04.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/mobile1.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/mobile2.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/mobile3.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/netAd1.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/netAd2.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/news-image02.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/news-single02.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/process-graph.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/spectra-logo.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-504.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-confirmation.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-flat-ui.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-super-desk.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-super-wii.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-symbols.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-vinyl.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/work-workouts.jpg delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/xhhyfwxt.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/xmsbglxt.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/zxxtbgxt.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/picture/电子书首页.png delete mode 100644 hcframe-parent/storage/src/main/resources/static/intro/service.ico delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/adminlte.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/adminlte.js.map delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/adminlte.min.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/adminlte.min.js.map delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/applications/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/buckets/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/demo.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/files/elupload.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/files/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/files/upload.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/flavors/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/identities/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/microservices/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/openstacks/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/organizations/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/regions/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/roles/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/users/index.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/users/register.js delete mode 100644 hcframe-parent/storage/src/main/resources/static/js/vue-uploader.js delete mode 100644 hcframe-parent/storage/src/main/resources/templates/about.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/applications/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/applications/loginCXQD.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/applications/loginGRHY.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/applications/loginKJQK.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/applications/loginKJST.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/applications/loginNJBC.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/applications/loginNJSW.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/buckets/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/data.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/files/elupload.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/files/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/files/plupload.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/files/upload.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/flavors/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/aside.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/breadcrumb.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/content.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/footer.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/hamburger.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/header.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/navbar.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/fragments/sidebar.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/identities/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/introduce.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/layout.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/main-20200319.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/main-20200324.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/main.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/microservices/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/openstacks/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/organizations/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/regions/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/roles/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/test.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/users/index.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/users/login.html delete mode 100644 hcframe-parent/storage/src/main/resources/templates/users/register.html diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f12eb1a --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 taixingyiji + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/hcframe-parent/hcframe-activiti/pom.xml b/hcframe-parent/hcframe-activiti/pom.xml index 89b8e26..43d35a7 100644 --- a/hcframe-parent/hcframe-activiti/pom.xml +++ b/hcframe-parent/hcframe-activiti/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent - com.hcframe + com.taixingyiji 1.0-SNAPSHOT 4.0.0 @@ -17,12 +17,12 @@ - com.hcframe + com.taixingyiji hcframe-boot-starter 1.0-SNAPSHOT - com.hcframe + com.taixingyiji hcframe-base 1.2.1-SNAPSHOT diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/ActivitiApplication.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java similarity index 92% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/ActivitiApplication.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java index 29245f7..b875cda 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/ActivitiApplication.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java @@ -1,6 +1,6 @@ -package com.hcframe.activiti; +package com.taixingyiji.activiti; -import com.hcframe.base.module.datasource.config.DataSourceConfiguration; +import com.taixingyiji.base.module.datasource.config.DataSourceConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/ServletInitializer.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ServletInitializer.java similarity index 92% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/ServletInitializer.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ServletInitializer.java index 780ba7c..4d8c718 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/ServletInitializer.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ServletInitializer.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti; +package com.taixingyiji.activiti; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/ActivitiUtils.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/ActivitiUtils.java similarity index 98% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/ActivitiUtils.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/ActivitiUtils.java index 66af3cb..ab9565b 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/ActivitiUtils.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/ActivitiUtils.java @@ -1,9 +1,9 @@ -package com.hcframe.activiti.activiti; +package com.taixingyiji.activiti.activiti; -import com.hcframe.base.common.ResultPageInfo; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.EmptyCheckUtils; +import com.taixingyiji.base.common.ResultPageInfo; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.EmptyCheckUtils; import org.activiti.engine.*; import org.activiti.engine.impl.ProcessInstanceQueryProperty; import org.activiti.engine.impl.TaskQueryProperty; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/CommonProcessDefinition.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonProcessDefinition.java similarity index 96% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/CommonProcessDefinition.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonProcessDefinition.java index ea07432..62d9a30 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/CommonProcessDefinition.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonProcessDefinition.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.activiti; +package com.taixingyiji.activiti.activiti; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/CommonTask.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonTask.java similarity index 97% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/CommonTask.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonTask.java index 72d8898..b4b1b9f 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/activiti/CommonTask.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonTask.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.activiti; +package com.taixingyiji.activiti.activiti; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/common/ShiroRealmConfig.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/common/ShiroRealmConfig.java similarity index 90% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/common/ShiroRealmConfig.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/common/ShiroRealmConfig.java index c313e33..c2e6409 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/common/ShiroRealmConfig.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/common/ShiroRealmConfig.java @@ -1,8 +1,8 @@ -package com.hcframe.activiti.common; +package com.taixingyiji.activiti.common; -import com.hcframe.base.module.auth.dao.FtUserDao; -import com.hcframe.base.module.shiro.service.ShiroType; -import com.hcframe.base.module.shiro.service.SystemRealm; +import com.taixingyiji.base.module.auth.dao.FtUserDao; +import com.taixingyiji.base.module.shiro.service.ShiroType; +import com.taixingyiji.base.module.shiro.service.SystemRealm; import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.springframework.stereotype.Component; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/controller/ProcessController.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/ProcessController.java similarity index 94% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/controller/ProcessController.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/ProcessController.java index ce42de7..23b52d7 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/controller/ProcessController.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/ProcessController.java @@ -1,9 +1,9 @@ -package com.hcframe.activiti.controller; +package com.taixingyiji.activiti.controller; -import com.hcframe.activiti.activiti.CommonProcessDefinition; -import com.hcframe.activiti.service.ProcessService; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; +import com.taixingyiji.activiti.activiti.CommonProcessDefinition; +import com.taixingyiji.activiti.service.ProcessService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; import io.lettuce.core.dynamic.annotation.Param; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/controller/TaskController.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/TaskController.java similarity index 94% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/controller/TaskController.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/TaskController.java index 506447c..6915397 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/controller/TaskController.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/TaskController.java @@ -1,10 +1,10 @@ -package com.hcframe.activiti.controller; +package com.taixingyiji.activiti.controller; import com.alibaba.fastjson.JSON; -import com.hcframe.activiti.activiti.CommonTask; -import com.hcframe.activiti.service.TaskSysService; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; +import com.taixingyiji.activiti.activiti.CommonTask; +import com.taixingyiji.activiti.service.TaskSysService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/BackReasonDao.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/BackReasonDao.java similarity index 54% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/BackReasonDao.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/BackReasonDao.java index a91f12a..541faf2 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/BackReasonDao.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/BackReasonDao.java @@ -1,7 +1,7 @@ -package com.hcframe.activiti.dao; +package com.taixingyiji.activiti.dao; -import com.hcframe.activiti.entity.BackReason; -import com.hcframe.base.common.Mapper; +import com.taixingyiji.activiti.entity.BackReason; +import com.taixingyiji.base.common.Mapper; /** * (BackReason)表数据库访问层 diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/CandidateUserDao.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/CandidateUserDao.java similarity index 55% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/CandidateUserDao.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/CandidateUserDao.java index 517e59e..5c9fb0f 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/CandidateUserDao.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/CandidateUserDao.java @@ -1,8 +1,8 @@ -package com.hcframe.activiti.dao; +package com.taixingyiji.activiti.dao; -import com.hcframe.activiti.entity.CandidateUser; -import com.hcframe.base.common.Mapper; +import com.taixingyiji.activiti.entity.CandidateUser; +import com.taixingyiji.base.common.Mapper; /** * (CandidateUser)表数据库访问层 diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/DataTaskDao.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskDao.java similarity index 54% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/DataTaskDao.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskDao.java index 5d6fd9f..e6fef92 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/DataTaskDao.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskDao.java @@ -1,8 +1,8 @@ -package com.hcframe.activiti.dao; +package com.taixingyiji.activiti.dao; -import com.hcframe.activiti.entity.DataTask; -import com.hcframe.base.common.Mapper; +import com.taixingyiji.activiti.entity.DataTask; +import com.taixingyiji.base.common.Mapper; /** * (DataTask)表数据库访问层 diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/DataTaskHisDao.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskHisDao.java similarity index 54% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/DataTaskHisDao.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskHisDao.java index d497e1c..d6abb0b 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/dao/DataTaskHisDao.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskHisDao.java @@ -1,7 +1,7 @@ -package com.hcframe.activiti.dao; +package com.taixingyiji.activiti.dao; -import com.hcframe.activiti.entity.DataTaskHis; -import com.hcframe.base.common.Mapper; +import com.taixingyiji.activiti.entity.DataTaskHis; +import com.taixingyiji.base.common.Mapper; /** * (DataTaskHis)表数据库访问层 diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/BackReason.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/BackReason.java similarity index 92% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/BackReason.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/BackReason.java index 0902a38..db1f6ba 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/BackReason.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/BackReason.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.entity; +package com.taixingyiji.activiti.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/CandidateUser.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/CandidateUser.java similarity index 93% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/CandidateUser.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/CandidateUser.java index e9a0aca..c4504e0 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/CandidateUser.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/CandidateUser.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.entity; +package com.taixingyiji.activiti.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/DataTask.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTask.java similarity index 95% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/DataTask.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTask.java index 1ffde84..02df128 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/DataTask.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTask.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.entity; +package com.taixingyiji.activiti.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/DataTaskHis.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTaskHis.java similarity index 95% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/DataTaskHis.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTaskHis.java index c98d6fd..c5dd3a8 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/entity/DataTaskHis.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTaskHis.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.entity; +package com.taixingyiji.activiti.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/ProcessService.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/ProcessService.java similarity index 78% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/ProcessService.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/ProcessService.java index 2ba0eda..a76f23c 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/ProcessService.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/ProcessService.java @@ -1,8 +1,8 @@ -package com.hcframe.activiti.service; +package com.taixingyiji.activiti.service; -import com.hcframe.activiti.activiti.CommonProcessDefinition; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; +import com.taixingyiji.activiti.activiti.CommonProcessDefinition; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/TaskSysService.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/TaskSysService.java similarity index 80% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/TaskSysService.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/TaskSysService.java index cc7d5fe..f891f49 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/TaskSysService.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/TaskSysService.java @@ -1,8 +1,8 @@ -package com.hcframe.activiti.service; +package com.taixingyiji.activiti.service; -import com.hcframe.activiti.activiti.CommonTask; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; +import com.taixingyiji.activiti.activiti.CommonTask; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; import java.util.Map; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/impl/ProcessServiceImpl.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/ProcessServiceImpl.java similarity index 94% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/impl/ProcessServiceImpl.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/ProcessServiceImpl.java index 8d3fcab..7a6c270 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/impl/ProcessServiceImpl.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/ProcessServiceImpl.java @@ -1,12 +1,12 @@ -package com.hcframe.activiti.service.impl; +package com.taixingyiji.activiti.service.impl; -import com.hcframe.activiti.activiti.ActivitiUtils; -import com.hcframe.activiti.activiti.CommonProcessDefinition; -import com.hcframe.activiti.service.ProcessService; -import com.hcframe.activiti.utils.FileUtil; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.WebPageInfo; +import com.taixingyiji.activiti.activiti.ActivitiUtils; +import com.taixingyiji.activiti.activiti.CommonProcessDefinition; +import com.taixingyiji.activiti.service.ProcessService; +import com.taixingyiji.activiti.utils.FileUtil; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.WebPageInfo; import org.activiti.engine.RepositoryService; import org.activiti.engine.repository.Deployment; import org.slf4j.Logger; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/impl/TaskSysServiceImpl.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/TaskSysServiceImpl.java similarity index 89% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/impl/TaskSysServiceImpl.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/TaskSysServiceImpl.java index 7ec0c14..145ca57 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/service/impl/TaskSysServiceImpl.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/TaskSysServiceImpl.java @@ -1,21 +1,21 @@ -package com.hcframe.activiti.service.impl; +package com.taixingyiji.activiti.service.impl; import com.alibaba.fastjson.JSONObject; -import com.hcframe.activiti.activiti.ActivitiUtils; -import com.hcframe.activiti.activiti.CommonTask; -import com.hcframe.activiti.dao.BackReasonDao; -import com.hcframe.activiti.dao.CandidateUserDao; -import com.hcframe.activiti.dao.DataTaskDao; -import com.hcframe.activiti.dao.DataTaskHisDao; -import com.hcframe.activiti.entity.BackReason; -import com.hcframe.activiti.entity.CandidateUser; -import com.hcframe.activiti.entity.DataTask; -import com.hcframe.activiti.entity.DataTaskHis; -import com.hcframe.activiti.service.TaskSysService; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.EmptyCheckUtils; +import com.taixingyiji.activiti.activiti.ActivitiUtils; +import com.taixingyiji.activiti.activiti.CommonTask; +import com.taixingyiji.activiti.dao.BackReasonDao; +import com.taixingyiji.activiti.dao.CandidateUserDao; +import com.taixingyiji.activiti.dao.DataTaskDao; +import com.taixingyiji.activiti.dao.DataTaskHisDao; +import com.taixingyiji.activiti.entity.BackReason; +import com.taixingyiji.activiti.entity.CandidateUser; +import com.taixingyiji.activiti.entity.DataTask; +import com.taixingyiji.activiti.entity.DataTaskHis; +import com.taixingyiji.activiti.service.TaskSysService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.EmptyCheckUtils; import org.activiti.engine.*; import org.activiti.engine.task.Task; import org.springframework.beans.BeanUtils; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/servicetask/TaskServe.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/servicetask/TaskServe.java similarity index 86% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/servicetask/TaskServe.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/servicetask/TaskServe.java index cdc6f2b..de5c974 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/servicetask/TaskServe.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/servicetask/TaskServe.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.servicetask; +package com.taixingyiji.activiti.servicetask; diff --git a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/utils/FileUtil.java b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/utils/FileUtil.java similarity index 98% rename from hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/utils/FileUtil.java rename to hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/utils/FileUtil.java index 02063ab..7d9fe90 100644 --- a/hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/utils/FileUtil.java +++ b/hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/utils/FileUtil.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti.utils; +package com.taixingyiji.activiti.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/BackReasonDao.xml b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/BackReasonDao.xml index 653f9ce..c05b2cc 100644 --- a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/BackReasonDao.xml +++ b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/BackReasonDao.xml @@ -1,6 +1,6 @@ - + diff --git a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/CandidateUserDao.xml b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/CandidateUserDao.xml index f982368..0d74e56 100644 --- a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/CandidateUserDao.xml +++ b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/CandidateUserDao.xml @@ -1,6 +1,6 @@ - + diff --git a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskDao.xml b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskDao.xml index 2d06f60..ecf4076 100644 --- a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskDao.xml +++ b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskDao.xml @@ -1,6 +1,6 @@ - + diff --git a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskHisDao.xml b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskHisDao.xml index f348388..187e9da 100644 --- a/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskHisDao.xml +++ b/hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskHisDao.xml @@ -1,6 +1,6 @@ - + diff --git a/hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/ActivitiApplicationTests.java b/hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/ActivitiApplicationTests.java similarity index 85% rename from hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/ActivitiApplicationTests.java rename to hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/ActivitiApplicationTests.java index 6805c30..3ddeda6 100644 --- a/hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/ActivitiApplicationTests.java +++ b/hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/ActivitiApplicationTests.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti; +package com.taixingyiji.activiti; import org.junit.jupiter.api.Test; diff --git a/hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/TaskControllerTest.java b/hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TaskControllerTest.java similarity index 88% rename from hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/TaskControllerTest.java rename to hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TaskControllerTest.java index b1e1077..9c732bd 100644 --- a/hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/TaskControllerTest.java +++ b/hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TaskControllerTest.java @@ -1,11 +1,11 @@ -package com.hcframe.activiti; +package com.taixingyiji.activiti; import com.alibaba.fastjson.JSONObject; -import com.hcframe.activiti.activiti.ActivitiUtils; -import com.hcframe.activiti.activiti.CommonTask; -import com.hcframe.activiti.controller.TaskController; -import com.hcframe.base.common.ResultPageInfo; -import com.hcframe.base.common.WebPageInfo; +import com.taixingyiji.activiti.activiti.ActivitiUtils; +import com.taixingyiji.activiti.activiti.CommonTask; +import com.taixingyiji.activiti.controller.TaskController; +import com.taixingyiji.base.common.ResultPageInfo; +import com.taixingyiji.base.common.WebPageInfo; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/TestClass.java b/hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TestClass.java similarity index 99% rename from hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/TestClass.java rename to hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TestClass.java index ac68da0..2c26e56 100644 --- a/hcframe-parent/hcframe-activiti/src/test/java/com/hcframe/activiti/TestClass.java +++ b/hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TestClass.java @@ -1,4 +1,4 @@ -package com.hcframe.activiti; +package com.taixingyiji.activiti; import org.activiti.engine.HistoryService; import org.activiti.engine.RepositoryService; diff --git a/hcframe-parent/hcframe-base/pom.xml b/hcframe-parent/hcframe-base/pom.xml index 56da938..54a3dd9 100644 --- a/hcframe-parent/hcframe-base/pom.xml +++ b/hcframe-parent/hcframe-base/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent - com.hcframe + com.taixingyiji 1.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ - com.hcframe + com.taixingyiji hcframe-redis-starter 1.0-SNAPSHOT diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/WebMvcConfig.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/WebMvcConfig.java deleted file mode 100644 index a2ba0bd..0000000 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/WebMvcConfig.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hcframe.base.common.config; - -import org.springframework.stereotype.Component; -import org.springframework.web.filter.FormContentFilter; - -@Component -public class WebMvcConfig extends FormContentFilter { - -} diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/AuthFunctionService.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/AuthFunctionService.java deleted file mode 100644 index 88a9c06..0000000 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/AuthFunctionService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.hcframe.base.module.auth.service; - -public interface AuthFunctionService { - -} diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceTypeService.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceTypeService.java deleted file mode 100644 index 83fd284..0000000 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceTypeService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hcframe.base.module.datasource.service; - -import com.hcframe.base.module.datasource.entity.DatasourceType; - -import java.util.List; - -public interface DatasourceTypeService { - List getAllInfo(); -} diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ControllerExceptionHandler.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ControllerExceptionHandler.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ControllerExceptionHandler.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ControllerExceptionHandler.java index a9839e4..ef19865 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ControllerExceptionHandler.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ControllerExceptionHandler.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common; +package com.taixingyiji.base.common; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authz.AuthorizationException; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/Mapper.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/Mapper.java similarity index 88% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/Mapper.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/Mapper.java index b26d356..3b0534e 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/Mapper.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/Mapper.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common; +package com.taixingyiji.base.common; import tk.mybatis.mapper.common.*; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/RestControllerExceptionHandler.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/RestControllerExceptionHandler.java similarity index 94% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/RestControllerExceptionHandler.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/RestControllerExceptionHandler.java index 92aeceb..9140932 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/RestControllerExceptionHandler.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/RestControllerExceptionHandler.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common; +package com.taixingyiji.base.common; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ResultPageInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultPageInfo.java similarity index 88% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ResultPageInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultPageInfo.java index 7bc0fe1..b4338a9 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ResultPageInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultPageInfo.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common; +package com.taixingyiji.base.common; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ResultVO.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultVO.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ResultVO.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultVO.java index c28a110..ca11141 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ResultVO.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultVO.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common; +package com.taixingyiji.base.common; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ServiceException.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ServiceException.java similarity index 94% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ServiceException.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ServiceException.java index 0da6eea..2743e1b 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/ServiceException.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ServiceException.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common; +package com.taixingyiji.base.common; /*** * @description 自定义异常类 diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/WebPageInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/WebPageInfo.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/WebPageInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/WebPageInfo.java index 4f49c72..d03a9dc 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/WebPageInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/WebPageInfo.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common; +package com.taixingyiji.base.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/FrameConfig.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/FrameConfig.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/FrameConfig.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/FrameConfig.java index 3d8c185..d7dc53f 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/FrameConfig.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/FrameConfig.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.config; +package com.taixingyiji.base.common.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/GetHttpSession.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/GetHttpSession.java similarity index 93% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/GetHttpSession.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/GetHttpSession.java index 667d0eb..00f6ead 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/GetHttpSession.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/GetHttpSession.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.config; +package com.taixingyiji.base.common.config; import javax.servlet.http.HttpSession; import javax.websocket.HandshakeResponse; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SimpleCORSFilter.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SimpleCORSFilter.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SimpleCORSFilter.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SimpleCORSFilter.java index 914e893..dd41b37 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SimpleCORSFilter.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SimpleCORSFilter.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.config; +package com.taixingyiji.base.common.config; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SwaggerConfig.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerConfig.java similarity index 99% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SwaggerConfig.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerConfig.java index 428b04a..de2353d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SwaggerConfig.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.config; +package com.taixingyiji.base.common.config; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import com.github.xiaoymin.knife4j.spring.filter.SecurityBasicAuthFilter; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SwaggerEntity.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerEntity.java similarity index 88% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SwaggerEntity.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerEntity.java index 4c75cdb..a8e88c1 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SwaggerEntity.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerEntity.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.config; +package com.taixingyiji.base.common.config; import lombok.Data; diff --git a/hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/config/WebMvcConfig.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/WebMvcConfig.java similarity index 80% rename from hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/config/WebMvcConfig.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/WebMvcConfig.java index 7ad9057..a467898 100644 --- a/hcframe-parent/storage/src/main/java/com/sinoparasoft/storage/config/WebMvcConfig.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/WebMvcConfig.java @@ -1,4 +1,4 @@ -package com.sinoparasoft.storage.config; +package com.taixingyiji.base.common.config; import org.springframework.stereotype.Component; import org.springframework.web.filter.FormContentFilter; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/annotation/EnableHcFrame.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/annotation/EnableHcFrame.java similarity index 85% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/annotation/EnableHcFrame.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/annotation/EnableHcFrame.java index faa64ae..189cf16 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/annotation/EnableHcFrame.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/annotation/EnableHcFrame.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.config.annotation; +package com.taixingyiji.base.common.config.annotation; import org.springframework.context.annotation.Import; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/webSessionListener.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/webSessionListener.java similarity index 93% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/webSessionListener.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/webSessionListener.java index 78c55ff..78df134 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/webSessionListener.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/webSessionListener.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.config; +package com.taixingyiji.base.common.config; import javax.servlet.ServletRequestEvent; import javax.servlet.ServletRequestListener; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/DateUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/DateUtil.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/DateUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/DateUtil.java index 1e020ff..1acaf2c 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/DateUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/DateUtil.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/EmptyCheckUtils.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EmptyCheckUtils.java similarity index 75% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/EmptyCheckUtils.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EmptyCheckUtils.java index 0d6df88..55abe05 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/EmptyCheckUtils.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EmptyCheckUtils.java @@ -1,6 +1,6 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; -import com.hcframe.base.common.ServiceException; +import com.taixingyiji.base.common.ServiceException; import org.springframework.util.StringUtils; public class EmptyCheckUtils { diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/EncryptUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EncryptUtil.java similarity index 99% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/EncryptUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EncryptUtil.java index 7e1fa0a..fe5823a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/EncryptUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EncryptUtil.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import org.apache.shiro.codec.Base64; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/HttpClient.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/HttpClient.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/HttpClient.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/HttpClient.java index f5edf75..101b551 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/HttpClient.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/HttpClient.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/JudgeException.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/JudgeException.java similarity index 74% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/JudgeException.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/JudgeException.java index 8472213..5ac17ab 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/JudgeException.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/JudgeException.java @@ -1,6 +1,6 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; -import com.hcframe.base.common.ServiceException; +import com.taixingyiji.base.common.ServiceException; import java.util.Objects; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/ListUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ListUtil.java similarity index 85% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/ListUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ListUtil.java index bf16301..c780d7a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/ListUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ListUtil.java @@ -1,7 +1,7 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; -import com.hcframe.base.common.ServiceException; +import com.taixingyiji.base.common.ServiceException; import java.util.List; import java.util.Map; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MD5Util.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MD5Util.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MD5Util.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MD5Util.java index b92adba..e129cc7 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MD5Util.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MD5Util.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import org.springframework.util.DigestUtils; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailAuthenticator.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailAuthenticator.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailAuthenticator.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailAuthenticator.java index dfd8fde..c879134 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailAuthenticator.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailAuthenticator.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import javax.mail.Authenticator; import javax.mail.PasswordAuthentication; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailBean.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailBean.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailBean.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailBean.java index d60bf25..46842a0 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailBean.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailBean.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import java.util.List; import java.util.Properties; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailOperate.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailOperate.java similarity index 99% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailOperate.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailOperate.java index 674244e..baa5e56 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MailOperate.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailOperate.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import javax.activation.DataHandler; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MyPageHelper.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MyPageHelper.java similarity index 81% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MyPageHelper.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MyPageHelper.java index 9005bf4..418e597 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MyPageHelper.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MyPageHelper.java @@ -1,6 +1,6 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; -import com.hcframe.base.common.WebPageInfo; +import com.taixingyiji.base.common.WebPageInfo; import com.github.pagehelper.PageHelper; public class MyPageHelper { diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/ObjectUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ObjectUtil.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/ObjectUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ObjectUtil.java index ee65c5f..20688d7 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/ObjectUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ObjectUtil.java @@ -1,10 +1,10 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.module.data.annotation.DataIgnore; -import com.hcframe.base.module.data.exception.BaseMapperException; -import com.hcframe.base.module.data.module.DataMap; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.module.data.annotation.DataIgnore; +import com.taixingyiji.base.module.data.exception.BaseMapperException; +import com.taixingyiji.base.module.data.module.DataMap; import javax.persistence.Id; import javax.persistence.Table; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/RandomUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RandomUtil.java similarity index 88% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/RandomUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RandomUtil.java index 2637785..f8bbba7 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/RandomUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RandomUtil.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import java.util.Random; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/RegexUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RegexUtil.java similarity index 83% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/RegexUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RegexUtil.java index bf35e6f..198115e 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/RegexUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RegexUtil.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import java.util.regex.Pattern; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/SpringContextUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/SpringContextUtil.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/SpringContextUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/SpringContextUtil.java index 892bad1..896971a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/SpringContextUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/SpringContextUtil.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/StringUtils.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/StringUtils.java similarity index 99% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/StringUtils.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/StringUtils.java index f50521d..894e8ec 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/StringUtils.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import java.util.*; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/TableNameUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TableNameUtil.java similarity index 83% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/TableNameUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TableNameUtil.java index 7bc3abb..26608d2 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/TableNameUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TableNameUtil.java @@ -1,9 +1,9 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; -import com.hcframe.base.module.cache.emum.CacheType; -import com.hcframe.base.module.cache.impl.TableCache; -import com.hcframe.base.module.tableconfig.dao.OsSysTableMapper; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.module.cache.emum.CacheType; +import com.taixingyiji.base.module.cache.impl.TableCache; +import com.taixingyiji.base.module.tableconfig.dao.OsSysTableMapper; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import lombok.val; import org.springframework.stereotype.Component; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/TokenProccessor.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TokenProccessor.java similarity index 94% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/TokenProccessor.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TokenProccessor.java index 354ef6f..7ea82eb 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/TokenProccessor.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TokenProccessor.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import java.util.UUID; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/UserInfoUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/UserInfoUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java index 348ece6..1705776 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/UserInfoUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java @@ -1,7 +1,7 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; -import com.hcframe.base.module.shiro.FtToken; -import com.hcframe.base.module.shiro.service.ShiroService; +import com.taixingyiji.base.module.shiro.FtToken; +import com.taixingyiji.base.module.shiro.service.ShiroService; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/XssClass.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/XssClass.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/XssClass.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/XssClass.java index 167abda..7360159 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/XssClass.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/XssClass.java @@ -1,4 +1,4 @@ -package com.hcframe.base.common.utils; +package com.taixingyiji.base.common.utils; import static org.thymeleaf.util.StringUtils.split; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/constants/AuthConstants.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/constants/AuthConstants.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/constants/AuthConstants.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/constants/AuthConstants.java index 28bc42b..ad9e2af 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/constants/AuthConstants.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/constants/AuthConstants.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.auth.constants; +package com.taixingyiji.base.module.auth.constants; /** * @author lhc diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/controller/AuthFunctionController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/AuthFunctionController.java similarity index 77% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/controller/AuthFunctionController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/AuthFunctionController.java index fe7f688..6cbcc5c 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/controller/AuthFunctionController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/AuthFunctionController.java @@ -1,9 +1,9 @@ -package com.hcframe.base.module.auth.controller; +package com.taixingyiji.base.module.auth.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.module.auth.entity.OsSysMenu; -import com.hcframe.base.module.auth.service.AuthFunctionService; -import com.hcframe.base.module.auth.service.MenuService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.module.auth.entity.OsSysMenu; +import com.taixingyiji.base.module.auth.service.AuthFunctionService; +import com.taixingyiji.base.module.auth.service.MenuService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/controller/FtUserController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/FtUserController.java similarity index 85% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/controller/FtUserController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/FtUserController.java index 3d63fe7..ad1b4d6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/controller/FtUserController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/FtUserController.java @@ -1,9 +1,9 @@ -package com.hcframe.base.module.auth.controller; +package com.taixingyiji.base.module.auth.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.module.auth.service.FtUserService; -import com.hcframe.base.module.log.annotation.LogAnno; -import com.hcframe.base.module.shiro.service.ShiroService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.module.auth.service.FtUserService; +import com.taixingyiji.base.module.log.annotation.LogAnno; +import com.taixingyiji.base.module.shiro.service.ShiroService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/FtUserDao.java similarity index 50% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/FtUserDao.java index 0526721..6924c52 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/FtUserDao.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.auth.dao; +package com.taixingyiji.base.module.auth.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.auth.entity.FtUser; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.auth.entity.FtUser; /** * (FtUser)表数据库访问层 diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/OsSysMenuDao.java similarity index 76% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/OsSysMenuDao.java index 68e4dfa..aebfecd 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/OsSysMenuDao.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.auth.dao; +package com.taixingyiji.base.module.auth.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.auth.entity.OsSysMenu; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.auth.entity.OsSysMenu; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/entity/FtUser.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/FtUser.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/entity/FtUser.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/FtUser.java index a8cd13a..ba5cf9a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/entity/FtUser.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/FtUser.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.auth.entity; +package com.taixingyiji.base.module.auth.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/entity/OsSysMenu.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/OsSysMenu.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/entity/OsSysMenu.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/OsSysMenu.java index 52d5cd2..c4b08ee 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/entity/OsSysMenu.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/OsSysMenu.java @@ -1,6 +1,6 @@ -package com.hcframe.base.module.auth.entity; +package com.taixingyiji.base.module.auth.entity; -import com.hcframe.base.module.data.annotation.DataIgnore; +import com.taixingyiji.base.module.data.annotation.DataIgnore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/AuthFunctionService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/AuthFunctionService.java new file mode 100644 index 0000000..9238597 --- /dev/null +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/AuthFunctionService.java @@ -0,0 +1,5 @@ +package com.taixingyiji.base.module.auth.service; + +public interface AuthFunctionService { + +} diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/FtUserService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/FtUserService.java similarity index 72% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/FtUserService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/FtUserService.java index 1129554..612e4f1 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/FtUserService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/FtUserService.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.auth.service; +package com.taixingyiji.base.module.auth.service; -import com.hcframe.base.common.ResultVO; +import com.taixingyiji.base.common.ResultVO; import javax.servlet.http.HttpServletRequest; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/MenuService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/MenuService.java similarity index 54% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/MenuService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/MenuService.java index 33c5cd8..7b0dd8c 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/MenuService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/MenuService.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.auth.service; +package com.taixingyiji.base.module.auth.service; -import com.hcframe.base.module.auth.entity.OsSysMenu; -import com.hcframe.base.module.auth.vo.RouterVo; +import com.taixingyiji.base.module.auth.entity.OsSysMenu; +import com.taixingyiji.base.module.auth.vo.RouterVo; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/AuthFunctionServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/AuthFunctionServiceImpl.java similarity index 51% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/AuthFunctionServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/AuthFunctionServiceImpl.java index f75e666..1935e8a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/AuthFunctionServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/AuthFunctionServiceImpl.java @@ -1,6 +1,6 @@ -package com.hcframe.base.module.auth.service.impl; +package com.taixingyiji.base.module.auth.service.impl; -import com.hcframe.base.module.auth.service.AuthFunctionService; +import com.taixingyiji.base.module.auth.service.AuthFunctionService; import org.springframework.stereotype.Service; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/FtUserServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/FtUserServiceImpl.java similarity index 78% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/FtUserServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/FtUserServiceImpl.java index cfceec3..211d3e3 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/FtUserServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/FtUserServiceImpl.java @@ -1,15 +1,15 @@ -package com.hcframe.base.module.auth.service.impl; +package com.taixingyiji.base.module.auth.service.impl; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.config.FrameConfig; -import com.hcframe.base.common.utils.MD5Util; -import com.hcframe.base.common.utils.TokenProccessor; -import com.hcframe.base.module.auth.dao.FtUserDao; -import com.hcframe.base.module.auth.entity.FtUser; -import com.hcframe.base.module.auth.service.FtUserService; -import com.hcframe.base.module.shiro.dao.FtTokenDao; -import com.hcframe.base.module.shiro.service.ShiroService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.config.FrameConfig; +import com.taixingyiji.base.common.utils.MD5Util; +import com.taixingyiji.base.common.utils.TokenProccessor; +import com.taixingyiji.base.module.auth.dao.FtUserDao; +import com.taixingyiji.base.module.auth.entity.FtUser; +import com.taixingyiji.base.module.auth.service.FtUserService; +import com.taixingyiji.base.module.shiro.dao.FtTokenDao; +import com.taixingyiji.base.module.shiro.service.ShiroService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/MenuServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/MenuServiceImpl.java similarity index 93% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/MenuServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/MenuServiceImpl.java index a3fa855..faff4a1 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/impl/MenuServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/MenuServiceImpl.java @@ -1,12 +1,12 @@ -package com.hcframe.base.module.auth.service.impl; +package com.taixingyiji.base.module.auth.service.impl; -import com.hcframe.base.common.utils.StringUtils; -import com.hcframe.base.module.auth.constants.AuthConstants; -import com.hcframe.base.module.auth.dao.OsSysMenuDao; -import com.hcframe.base.module.auth.entity.OsSysMenu; -import com.hcframe.base.module.auth.service.MenuService; -import com.hcframe.base.module.auth.vo.MetaVo; -import com.hcframe.base.module.auth.vo.RouterVo; +import com.taixingyiji.base.common.utils.StringUtils; +import com.taixingyiji.base.module.auth.constants.AuthConstants; +import com.taixingyiji.base.module.auth.dao.OsSysMenuDao; +import com.taixingyiji.base.module.auth.entity.OsSysMenu; +import com.taixingyiji.base.module.auth.service.MenuService; +import com.taixingyiji.base.module.auth.vo.MetaVo; +import com.taixingyiji.base.module.auth.vo.RouterVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/vo/MetaVo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/MetaVo.java similarity index 96% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/vo/MetaVo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/MetaVo.java index d72b159..8226430 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/vo/MetaVo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/MetaVo.java @@ -1,5 +1,5 @@ /**/ -package com.hcframe.base.module.auth.vo; +package com.taixingyiji.base.module.auth.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/vo/RouterVo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/RouterVo.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/vo/RouterVo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/RouterVo.java index 3ba9cda..962a2d2 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/vo/RouterVo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.auth.vo; +package com.taixingyiji.base.module.auth.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/CacheService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/CacheService.java similarity index 80% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/CacheService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/CacheService.java index 68752f6..23c81af 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/CacheService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/CacheService.java @@ -1,6 +1,6 @@ -package com.hcframe.base.module.cache; +package com.taixingyiji.base.module.cache; -import com.hcframe.base.module.cache.emum.CacheType; +import com.taixingyiji.base.module.cache.emum.CacheType; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/base/BaseCache.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/BaseCache.java similarity index 90% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/base/BaseCache.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/BaseCache.java index e1c1d9c..9ee81dd 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/base/BaseCache.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/BaseCache.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.cache.base; +package com.taixingyiji.base.module.cache.base; import org.springframework.cache.Cache; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/base/impl/BaseCacheImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/impl/BaseCacheImpl.java similarity index 90% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/base/impl/BaseCacheImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/impl/BaseCacheImpl.java index 724e658..d084022 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/base/impl/BaseCacheImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/impl/BaseCacheImpl.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.cache.base.impl; +package com.taixingyiji.base.module.cache.base.impl; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.module.cache.base.BaseCache; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.module.cache.base.BaseCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/emum/CacheType.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/emum/CacheType.java similarity index 83% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/emum/CacheType.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/emum/CacheType.java index 2752133..55330d3 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/emum/CacheType.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/emum/CacheType.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.cache.emum; +package com.taixingyiji.base.module.cache.emum; /** * @author lhc diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/impl/DatasourceCache.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/impl/DatasourceCache.java similarity index 88% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/impl/DatasourceCache.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/impl/DatasourceCache.java index 5ae0ec7..80aa16c 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/impl/DatasourceCache.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/impl/DatasourceCache.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.cache.impl; +package com.taixingyiji.base.module.cache.impl; -import com.hcframe.base.module.cache.CacheService; -import com.hcframe.base.module.cache.emum.CacheType; +import com.taixingyiji.base.module.cache.CacheService; +import com.taixingyiji.base.module.cache.emum.CacheType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/impl/TableCache.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/impl/TableCache.java similarity index 86% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/impl/TableCache.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/impl/TableCache.java index fb88726..fd37f46 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/cache/impl/TableCache.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/impl/TableCache.java @@ -1,15 +1,15 @@ -package com.hcframe.base.module.cache.impl; +package com.taixingyiji.base.module.cache.impl; -import com.hcframe.base.common.utils.JudgeException; -import com.hcframe.base.module.cache.CacheService; -import com.hcframe.base.module.cache.base.BaseCache; -import com.hcframe.base.module.cache.emum.CacheType; -import com.hcframe.base.module.data.controller.TableController; -import com.hcframe.base.module.data.module.BaseMapper; -import com.hcframe.base.module.data.module.BaseMapperImpl; -import com.hcframe.base.module.data.module.Condition; -import com.hcframe.base.module.tableconfig.dao.OsSysTableMapper; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.utils.JudgeException; +import com.taixingyiji.base.module.cache.CacheService; +import com.taixingyiji.base.module.cache.base.BaseCache; +import com.taixingyiji.base.module.cache.emum.CacheType; +import com.taixingyiji.base.module.data.controller.TableController; +import com.taixingyiji.base.module.data.module.BaseMapper; +import com.taixingyiji.base.module.data.module.BaseMapperImpl; +import com.taixingyiji.base.module.data.module.Condition; +import com.taixingyiji.base.module.tableconfig.dao.OsSysTableMapper; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/annotation/DataIgnore.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/annotation/DataIgnore.java similarity index 86% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/annotation/DataIgnore.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/annotation/DataIgnore.java index ab13332..79ea0f0 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/annotation/DataIgnore.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/annotation/DataIgnore.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.data.annotation; +package com.taixingyiji.base.module.data.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/constants/FieldConstants.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/constants/FieldConstants.java similarity index 59% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/constants/FieldConstants.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/constants/FieldConstants.java index 94d8601..637e325 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/constants/FieldConstants.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/constants/FieldConstants.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.data.constants; +package com.taixingyiji.base.module.data.constants; public enum FieldConstants { DELETED,VERSION,UPDATE_TIME,CREATE_TIME diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/constants/QueryConstants.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/constants/QueryConstants.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/constants/QueryConstants.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/constants/QueryConstants.java index f54e84f..21a38a3 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/constants/QueryConstants.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/constants/QueryConstants.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.data.constants; +package com.taixingyiji.base.module.data.constants; /** * @author lhc diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/IndexController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/controller/IndexController.java similarity index 81% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/IndexController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/controller/IndexController.java index eb95f25..20dd4e5 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/IndexController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/controller/IndexController.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.data.controller; +package com.taixingyiji.base.module.data.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/TableController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/controller/TableController.java similarity index 94% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/TableController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/controller/TableController.java index 24ceb70..5208d23 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/TableController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/controller/TableController.java @@ -1,10 +1,10 @@ -package com.hcframe.base.module.data.controller; +package com.taixingyiji.base.module.data.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.TableNameUtil; -import com.hcframe.base.module.data.service.TableService; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.TableNameUtil; +import com.taixingyiji.base.module.data.service.TableService; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/dao/TableMapper.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/dao/TableMapper.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/dao/TableMapper.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/dao/TableMapper.java index 09a7c7a..4779669 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/dao/TableMapper.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/dao/TableMapper.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.data.dao; +package com.taixingyiji.base.module.data.dao; import org.apache.ibatis.annotations.Param; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/exception/BaseMapperException.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/exception/BaseMapperException.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/exception/BaseMapperException.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/exception/BaseMapperException.java index 6645edc..03bbe73 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/exception/BaseMapperException.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/exception/BaseMapperException.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.data.exception; +package com.taixingyiji.base.module.data.exception; public class BaseMapperException extends RuntimeException{ private static final long serialVersionUID = -3691286451456700443L; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/exception/SqlException.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/exception/SqlException.java similarity index 86% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/exception/SqlException.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/exception/SqlException.java index 8369510..f58b78d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/exception/SqlException.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/exception/SqlException.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.data.exception; +package com.taixingyiji.base.module.data.exception; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.utils.StringUtils; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.utils.StringUtils; public class SqlException { diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapper.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapper.java similarity index 96% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapper.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapper.java index f630ef1..ebe4e75 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapper.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapper.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.data.module; +package com.taixingyiji.base.module.data.module; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import com.github.pagehelper.PageInfo; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapperImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapperImpl.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapperImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapperImpl.java index a4e3ccc..e40c088 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapperImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapperImpl.java @@ -1,16 +1,16 @@ -package com.hcframe.base.module.data.module; +package com.taixingyiji.base.module.data.module; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.MyPageHelper; -import com.hcframe.base.common.utils.StringUtils; -import com.hcframe.base.module.data.dao.TableMapper; -import com.hcframe.base.module.data.exception.BaseMapperException; -import com.hcframe.base.module.data.exception.SqlException; -import com.hcframe.base.module.datasource.dynamic.DBContextHolder; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.datasource.utils.DataSourceUtil; -import com.hcframe.base.module.datasource.utils.DataUnit; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.MyPageHelper; +import com.taixingyiji.base.common.utils.StringUtils; +import com.taixingyiji.base.module.data.dao.TableMapper; +import com.taixingyiji.base.module.data.exception.BaseMapperException; +import com.taixingyiji.base.module.data.exception.SqlException; +import com.taixingyiji.base.module.datasource.dynamic.DBContextHolder; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.datasource.utils.DataSourceUtil; +import com.taixingyiji.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/Condition.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/Condition.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/Condition.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/Condition.java index e396490..7286939 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/Condition.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/Condition.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.data.module; +package com.taixingyiji.base.module.data.module; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.utils.XssClass; -import com.hcframe.base.common.utils.StringUtils; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.utils.XssClass; +import com.taixingyiji.base.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.Serializable; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/DataMap.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/DataMap.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/DataMap.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/DataMap.java index a50a2da..815e930 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/DataMap.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/DataMap.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.data.module; +package com.taixingyiji.base.module.data.module; -import com.hcframe.base.common.utils.ObjectUtil; -import com.hcframe.base.module.shiro.FtToken; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.utils.ObjectUtil; +import com.taixingyiji.base.module.shiro.FtToken; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import java.io.Serializable; import java.util.Arrays; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/JoinCondition.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/JoinCondition.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/JoinCondition.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/JoinCondition.java index 5c629e4..e513bd4 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/JoinCondition.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/JoinCondition.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.data.module; +package com.taixingyiji.base.module.data.module; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/SelectCondition.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/SelectCondition.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/SelectCondition.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/SelectCondition.java index 12d6dd9..9badd81 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/SelectCondition.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/SelectCondition.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.data.module; +package com.taixingyiji.base.module.data.module; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.utils.StringUtils; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/WebCondition.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/WebCondition.java similarity index 96% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/WebCondition.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/WebCondition.java index f68abf3..69711a6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/WebCondition.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/WebCondition.java @@ -1,6 +1,6 @@ -package com.hcframe.base.module.data.module; +package com.taixingyiji.base.module.data.module; -import com.hcframe.base.module.data.constants.QueryConstants; +import com.taixingyiji.base.module.data.constants.QueryConstants; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/service/TableService.java similarity index 84% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/service/TableService.java index 30302b9..ba5d02d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/service/TableService.java @@ -1,10 +1,10 @@ -package com.hcframe.base.module.data.service; +package com.taixingyiji.base.module.data.service; import com.alibaba.fastjson.JSONArray; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.data.module.Condition; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.data.module.Condition; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import com.github.pagehelper.PageInfo; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/service/impl/TableServiceImpl.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/service/impl/TableServiceImpl.java index ae6e9ef..edf4e49 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/service/impl/TableServiceImpl.java @@ -1,22 +1,22 @@ -package com.hcframe.base.module.data.service.impl; +package com.taixingyiji.base.module.data.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.JudgeException; -import com.hcframe.base.common.utils.TableNameUtil; -import com.hcframe.base.module.data.constants.FieldConstants; -import com.hcframe.base.module.data.constants.QueryConstants; -import com.hcframe.base.module.data.dao.TableMapper; -import com.hcframe.base.module.data.module.*; -import com.hcframe.base.module.data.service.TableService; -import com.hcframe.base.module.data.exception.SqlException; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; -import com.hcframe.base.module.cache.impl.TableCache; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.JudgeException; +import com.taixingyiji.base.common.utils.TableNameUtil; +import com.taixingyiji.base.module.data.constants.FieldConstants; +import com.taixingyiji.base.module.data.constants.QueryConstants; +import com.taixingyiji.base.module.data.dao.TableMapper; +import com.taixingyiji.base.module.data.service.TableService; +import com.taixingyiji.base.module.data.exception.SqlException; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.module.cache.impl.TableCache; import com.github.pagehelper.PageInfo; +import com.taixingyiji.base.module.data.module.*; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/annotation/DatasourceAnno.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/annotation/DatasourceAnno.java similarity index 88% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/annotation/DatasourceAnno.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/annotation/DatasourceAnno.java index 5aaa14d..9bc7fd8 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/annotation/DatasourceAnno.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/annotation/DatasourceAnno.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.datasource.annotation; +package com.taixingyiji.base.module.datasource.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/aop/DataSourceAnnoOperation.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/aop/DataSourceAnnoOperation.java similarity index 77% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/aop/DataSourceAnnoOperation.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/aop/DataSourceAnnoOperation.java index d279027..1d190b3 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/aop/DataSourceAnnoOperation.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/aop/DataSourceAnnoOperation.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.datasource.aop; +package com.taixingyiji.base.module.datasource.aop; -import com.hcframe.base.module.datasource.annotation.DatasourceAnno; -import com.hcframe.base.module.datasource.dynamic.DBContextHolder; -import com.hcframe.base.module.shiro.dao.FtTokenDao; +import com.taixingyiji.base.module.datasource.annotation.DatasourceAnno; +import com.taixingyiji.base.module.datasource.dynamic.DBContextHolder; +import com.taixingyiji.base.module.shiro.dao.FtTokenDao; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -26,7 +26,7 @@ public class DataSourceAnnoOperation { @Autowired FtTokenDao osTokenMapper; - @Around("@annotation(com.hcframe.base.module.datasource.annotation.DatasourceAnno)") + @Around("@annotation(com.taixingyiji.base.module.datasource.annotation.DatasourceAnno)") public Object aroundAdvice(ProceedingJoinPoint pjp) throws Throwable { // 获取方法签名 MethodSignature methodSignature = (MethodSignature) pjp.getSignature(); diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/aop/DataSourceAop.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/aop/DataSourceAop.java similarity index 87% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/aop/DataSourceAop.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/aop/DataSourceAop.java index b20447e..3d46fde 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/aop/DataSourceAop.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/aop/DataSourceAop.java @@ -1,9 +1,9 @@ -package com.hcframe.base.module.datasource.aop; +package com.taixingyiji.base.module.datasource.aop; -import com.hcframe.base.common.config.FrameConfig; -import com.hcframe.base.module.datasource.dao.DatasourceConfigDao; -import com.hcframe.base.module.datasource.dynamic.DBContextHolder; -import com.hcframe.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.common.config.FrameConfig; +import com.taixingyiji.base.module.datasource.dao.DatasourceConfigDao; +import com.taixingyiji.base.module.datasource.dynamic.DBContextHolder; +import com.taixingyiji.base.module.datasource.utils.DataUnit; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.After; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java index db96d7f..2b11b9b 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.datasource.config; +package com.taixingyiji.base.module.datasource.config; import com.alibaba.druid.pool.DruidDataSource; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.datasource.dynamic.MyDynamicDataSource; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.datasource.dynamic.MyDynamicDataSource; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.boot.autoconfigure.MybatisProperties; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DataSourceController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DataSourceController.java similarity index 88% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DataSourceController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DataSourceController.java index 3198227..7e1ccec 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DataSourceController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DataSourceController.java @@ -1,11 +1,11 @@ -package com.hcframe.base.module.datasource.controller; +package com.taixingyiji.base.module.datasource.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.datasource.annotation.DatasourceAnno; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.datasource.service.DataSourceService; -import com.hcframe.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.datasource.annotation.DatasourceAnno; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.datasource.service.DataSourceService; +import com.taixingyiji.base.module.datasource.utils.DataUnit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DatasourceConfigController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DatasourceConfigController.java similarity index 77% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DatasourceConfigController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DatasourceConfigController.java index 50406e7..27adf23 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DatasourceConfigController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DatasourceConfigController.java @@ -1,9 +1,9 @@ -package com.hcframe.base.module.datasource.controller; +package com.taixingyiji.base.module.datasource.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.module.datasource.annotation.DatasourceAnno; -import com.hcframe.base.module.datasource.service.DatasourceConfigService; -import com.hcframe.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.module.datasource.annotation.DatasourceAnno; +import com.taixingyiji.base.module.datasource.service.DatasourceConfigService; +import com.taixingyiji.base.module.datasource.utils.DataUnit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DatasourceTypeController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DatasourceTypeController.java similarity index 70% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DatasourceTypeController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DatasourceTypeController.java index 39562ea..752c83c 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/controller/DatasourceTypeController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/controller/DatasourceTypeController.java @@ -1,9 +1,9 @@ -package com.hcframe.base.module.datasource.controller; +package com.taixingyiji.base.module.datasource.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.module.datasource.annotation.DatasourceAnno; -import com.hcframe.base.module.datasource.service.DatasourceTypeService; -import com.hcframe.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.module.datasource.annotation.DatasourceAnno; +import com.taixingyiji.base.module.datasource.service.DatasourceTypeService; +import com.taixingyiji.base.module.datasource.utils.DataUnit; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceConfigDao.java similarity index 54% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceConfigDao.java index ce00ec1..8da1cc6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceConfigDao.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.datasource.dao; +package com.taixingyiji.base.module.datasource.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; /** * (DatasourceConfig)表数据库访问层 diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceTokenDao.java similarity index 51% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceTokenDao.java index 4b47492..5669c95 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceTokenDao.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.datasource.dao; +package com.taixingyiji.base.module.datasource.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.datasource.entity.DatasourceToken; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.datasource.entity.DatasourceToken; /** * (DatasourceToken)表数据库访问层 diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceTypeDao.java similarity index 51% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceTypeDao.java index 110447f..f26e384 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dao/DatasourceTypeDao.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.datasource.dao; +package com.taixingyiji.base.module.datasource.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.datasource.entity.DatasourceType; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.datasource.entity.DatasourceType; /** * (DatasourceType)表数据库访问层 diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dynamic/DBContextHolder.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dynamic/DBContextHolder.java similarity index 86% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dynamic/DBContextHolder.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dynamic/DBContextHolder.java index 6bf05c0..738a537 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dynamic/DBContextHolder.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dynamic/DBContextHolder.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.datasource.dynamic; +package com.taixingyiji.base.module.datasource.dynamic; -import com.hcframe.base.module.datasource.utils.DataSourceUtil; +import com.taixingyiji.base.module.datasource.utils.DataSourceUtil; /** * @author lhc diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dynamic/MyDynamicDataSource.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dynamic/MyDynamicDataSource.java similarity index 87% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dynamic/MyDynamicDataSource.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dynamic/MyDynamicDataSource.java index de84d9b..e0129a2 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dynamic/MyDynamicDataSource.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dynamic/MyDynamicDataSource.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.datasource.dynamic; +package com.taixingyiji.base.module.datasource.dynamic; import com.alibaba.druid.util.StringUtils; -import com.hcframe.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.module.datasource.utils.DataUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceConfig.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceConfig.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceConfig.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceConfig.java index 9920ee4..2d1ad8a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceConfig.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceConfig.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.datasource.entity; +package com.taixingyiji.base.module.datasource.entity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceToken.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceToken.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceToken.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceToken.java index 6456dc8..7fcb1b6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceToken.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceToken.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.datasource.entity; +package com.taixingyiji.base.module.datasource.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceType.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceType.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceType.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceType.java index e5d5c4a..5d327a9 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/entity/DatasourceType.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/entity/DatasourceType.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.datasource.entity; +package com.taixingyiji.base.module.datasource.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DataSourceService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DataSourceService.java similarity index 74% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DataSourceService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DataSourceService.java index eb3ef07..0f5f2b2 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DataSourceService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DataSourceService.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.datasource.service; +package com.taixingyiji.base.module.datasource.service; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; import com.github.pagehelper.PageInfo; /** diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceConfigService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DatasourceConfigService.java similarity index 67% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceConfigService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DatasourceConfigService.java index 36a84c8..a066540 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceConfigService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DatasourceConfigService.java @@ -1,6 +1,6 @@ -package com.hcframe.base.module.datasource.service; +package com.taixingyiji.base.module.datasource.service; -import com.hcframe.base.common.ResultVO; +import com.taixingyiji.base.common.ResultVO; /** * @author lhc diff --git a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DatasourceTypeService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DatasourceTypeService.java new file mode 100644 index 0000000..9701938 --- /dev/null +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/DatasourceTypeService.java @@ -0,0 +1,9 @@ +package com.taixingyiji.base.module.datasource.service; + +import com.taixingyiji.base.module.datasource.entity.DatasourceType; + +import java.util.List; + +public interface DatasourceTypeService { + List getAllInfo(); +} diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DataSourceServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DataSourceServiceImpl.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DataSourceServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DataSourceServiceImpl.java index ca407fc..459e2f9 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DataSourceServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DataSourceServiceImpl.java @@ -1,21 +1,21 @@ -package com.hcframe.base.module.datasource.service.impl; +package com.taixingyiji.base.module.datasource.service.impl; import com.alibaba.druid.pool.DruidDataSource; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.MyPageHelper; -import com.hcframe.base.module.data.dao.TableMapper; -import com.hcframe.base.module.datasource.dao.DatasourceConfigDao; -import com.hcframe.base.module.datasource.dao.DatasourceTokenDao; -import com.hcframe.base.module.datasource.dao.DatasourceTypeDao; -import com.hcframe.base.module.datasource.dynamic.DBContextHolder; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.datasource.entity.DatasourceToken; -import com.hcframe.base.module.datasource.entity.DatasourceType; -import com.hcframe.base.module.datasource.service.DataSourceService; -import com.hcframe.base.module.datasource.utils.DataSourceUtil; -import com.hcframe.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.MyPageHelper; +import com.taixingyiji.base.module.data.dao.TableMapper; +import com.taixingyiji.base.module.datasource.dao.DatasourceConfigDao; +import com.taixingyiji.base.module.datasource.dao.DatasourceTokenDao; +import com.taixingyiji.base.module.datasource.dao.DatasourceTypeDao; +import com.taixingyiji.base.module.datasource.dynamic.DBContextHolder; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.datasource.entity.DatasourceToken; +import com.taixingyiji.base.module.datasource.entity.DatasourceType; +import com.taixingyiji.base.module.datasource.service.DataSourceService; +import com.taixingyiji.base.module.datasource.utils.DataSourceUtil; +import com.taixingyiji.base.module.datasource.utils.DataUnit; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DatasourceConfigServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DatasourceConfigServiceImpl.java similarity index 80% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DatasourceConfigServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DatasourceConfigServiceImpl.java index e04e66e..c9c9815 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DatasourceConfigServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DatasourceConfigServiceImpl.java @@ -1,16 +1,16 @@ -package com.hcframe.base.module.datasource.service.impl; +package com.taixingyiji.base.module.datasource.service.impl; import com.alibaba.druid.pool.DruidDataSource; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.utils.ObjectUtil; -import com.hcframe.base.module.datasource.dao.DatasourceConfigDao; -import com.hcframe.base.module.datasource.dao.DatasourceTypeDao; -import com.hcframe.base.module.datasource.dynamic.DBContextHolder; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.datasource.service.DataSourceService; -import com.hcframe.base.module.datasource.service.DatasourceConfigService; -import com.hcframe.base.module.datasource.utils.DataSourceUtil; -import com.hcframe.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.utils.ObjectUtil; +import com.taixingyiji.base.module.datasource.dao.DatasourceConfigDao; +import com.taixingyiji.base.module.datasource.dao.DatasourceTypeDao; +import com.taixingyiji.base.module.datasource.dynamic.DBContextHolder; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.datasource.service.DataSourceService; +import com.taixingyiji.base.module.datasource.service.DatasourceConfigService; +import com.taixingyiji.base.module.datasource.utils.DataSourceUtil; +import com.taixingyiji.base.module.datasource.utils.DataUnit; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DatasourceTypeServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DatasourceTypeServiceImpl.java similarity index 58% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DatasourceTypeServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DatasourceTypeServiceImpl.java index 9d43fee..11aeff2 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/impl/DatasourceTypeServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/service/impl/DatasourceTypeServiceImpl.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.datasource.service.impl; +package com.taixingyiji.base.module.datasource.service.impl; -import com.hcframe.base.module.datasource.dao.DatasourceTypeDao; -import com.hcframe.base.module.datasource.entity.DatasourceType; -import com.hcframe.base.module.datasource.service.DatasourceTypeService; +import com.taixingyiji.base.module.datasource.dao.DatasourceTypeDao; +import com.taixingyiji.base.module.datasource.entity.DatasourceType; +import com.taixingyiji.base.module.datasource.service.DatasourceTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/utils/DataSourceUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/utils/DataSourceUtil.java similarity index 90% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/utils/DataSourceUtil.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/utils/DataSourceUtil.java index 3558715..95e8aa4 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/utils/DataSourceUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/utils/DataSourceUtil.java @@ -1,17 +1,17 @@ -package com.hcframe.base.module.datasource.utils; +package com.taixingyiji.base.module.datasource.utils; import com.alibaba.druid.pool.DruidDataSource; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.utils.SpringContextUtil; -import com.hcframe.base.common.utils.TokenProccessor; -import com.hcframe.base.module.datasource.dao.DatasourceConfigDao; -import com.hcframe.base.module.datasource.dao.DatasourceTokenDao; -import com.hcframe.base.module.datasource.dao.DatasourceTypeDao; -import com.hcframe.base.module.datasource.dynamic.DBContextHolder; -import com.hcframe.base.module.datasource.dynamic.MyDynamicDataSource; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.datasource.entity.DatasourceToken; -import com.hcframe.base.module.datasource.entity.DatasourceType; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.utils.SpringContextUtil; +import com.taixingyiji.base.common.utils.TokenProccessor; +import com.taixingyiji.base.module.datasource.dao.DatasourceConfigDao; +import com.taixingyiji.base.module.datasource.dao.DatasourceTokenDao; +import com.taixingyiji.base.module.datasource.dao.DatasourceTypeDao; +import com.taixingyiji.base.module.datasource.dynamic.DBContextHolder; +import com.taixingyiji.base.module.datasource.dynamic.MyDynamicDataSource; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.datasource.entity.DatasourceToken; +import com.taixingyiji.base.module.datasource.entity.DatasourceType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/utils/DataUnit.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/utils/DataUnit.java similarity index 90% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/utils/DataUnit.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/utils/DataUnit.java index cf2f58c..43f28a1 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/utils/DataUnit.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/utils/DataUnit.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.datasource.utils; +package com.taixingyiji.base.module.datasource.utils; /** * @author lhc diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/druid/DruidAuth.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/druid/DruidAuth.java similarity index 81% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/druid/DruidAuth.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/druid/DruidAuth.java index 2a4c68b..5f2a92b 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/druid/DruidAuth.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/druid/DruidAuth.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.druid; +package com.taixingyiji.base.module.druid; import lombok.Data; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/druid/DruidConfig.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/druid/DruidConfig.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/druid/DruidConfig.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/druid/DruidConfig.java index d42bd57..8afabe3 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/druid/DruidConfig.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/druid/DruidConfig.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.druid; +package com.taixingyiji.base.module.druid; import com.alibaba.druid.support.http.StatViewServlet; import com.alibaba.druid.support.http.WebStatFilter; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/RequestLogAspect.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/RequestLogAspect.java similarity index 95% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/RequestLogAspect.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/RequestLogAspect.java index 7bef579..fff4a6a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/RequestLogAspect.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/RequestLogAspect.java @@ -1,9 +1,9 @@ -package com.hcframe.base.module.log; +package com.taixingyiji.base.module.log; import com.alibaba.fastjson.JSON; -import com.hcframe.base.common.config.FrameConfig; -import com.hcframe.base.module.log.model.RequestErrorInfo; -import com.hcframe.base.module.log.model.RequestInfo; +import com.taixingyiji.base.common.config.FrameConfig; +import com.taixingyiji.base.module.log.model.RequestErrorInfo; +import com.taixingyiji.base.module.log.model.RequestInfo; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.AfterThrowing; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/annotation/LogAnno.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/annotation/LogAnno.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/annotation/LogAnno.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/annotation/LogAnno.java index 9f674b8..d390c34 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/annotation/LogAnno.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/annotation/LogAnno.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.log.annotation; +package com.taixingyiji.base.module.log.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/model/RequestErrorInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/model/RequestErrorInfo.java similarity index 89% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/model/RequestErrorInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/model/RequestErrorInfo.java index ac11c8b..da9acc7 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/model/RequestErrorInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/model/RequestErrorInfo.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.log.model; +package com.taixingyiji.base.module.log.model; import lombok.Data; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/model/RequestInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/model/RequestInfo.java similarity index 89% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/model/RequestInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/model/RequestInfo.java index 6c5f83b..6b7ea1d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/log/model/RequestInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/log/model/RequestInfo.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.log.model; +package com.taixingyiji.base.module.log.model; import lombok.Data; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/AuthFilter.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/AuthFilter.java similarity index 99% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/AuthFilter.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/AuthFilter.java index 487e076..0e3da4b 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/AuthFilter.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/AuthFilter.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.StringUtils; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/AuthToken.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/AuthToken.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/AuthToken.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/AuthToken.java index 7cbb1a6..3895b62 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/AuthToken.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/AuthToken.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; import org.apache.shiro.authc.AuthenticationToken; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/CustomRealm.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/CustomRealm.java similarity index 94% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/CustomRealm.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/CustomRealm.java index 7a1d712..e607484 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/CustomRealm.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/CustomRealm.java @@ -1,10 +1,10 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; -import com.hcframe.base.common.config.FrameConfig; -import com.hcframe.base.module.shiro.service.ShiroService; -import com.hcframe.base.module.shiro.service.SystemRealm; -import com.hcframe.redis.RedisUtil; +import com.taixingyiji.base.common.config.FrameConfig; +import com.taixingyiji.base.module.shiro.service.ShiroService; +import com.taixingyiji.base.module.shiro.service.SystemRealm; +import com.taixingyiji.redis.RedisUtil; import org.apache.shiro.authc.*; import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/FtToken.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/FtToken.java similarity index 94% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/FtToken.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/FtToken.java index 90ffaef..1d8bc21 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/FtToken.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/FtToken.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/NoStateFilter.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/NoStateFilter.java similarity index 98% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/NoStateFilter.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/NoStateFilter.java index 2807490..c856ec6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/NoStateFilter.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/NoStateFilter.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.StringUtils; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/ShiroConfig.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/ShiroConfig.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/ShiroConfig.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/ShiroConfig.java index 473010b..bc5587c 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/ShiroConfig.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/ShiroConfig.java @@ -1,6 +1,6 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; -import com.hcframe.base.module.shiro.service.SystemRealm; +import com.taixingyiji.base.module.shiro.service.SystemRealm; import org.apache.shiro.mgt.DefaultSessionStorageEvaluator; import org.apache.shiro.mgt.DefaultSubjectDAO; import org.apache.shiro.mgt.SecurityManager; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/ShiroSessionManager.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/ShiroSessionManager.java similarity index 97% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/ShiroSessionManager.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/ShiroSessionManager.java index fb34937..d97d027 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/ShiroSessionManager.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/ShiroSessionManager.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; import org.apache.shiro.web.servlet.ShiroHttpServletRequest; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/StatelessDefaultSubjectFactory.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/StatelessDefaultSubjectFactory.java similarity index 93% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/StatelessDefaultSubjectFactory.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/StatelessDefaultSubjectFactory.java index b685ba0..9035eb9 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/StatelessDefaultSubjectFactory.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/StatelessDefaultSubjectFactory.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro; +package com.taixingyiji.base.module.shiro; import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.SubjectContext; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/dao/FtTokenDao.java similarity index 51% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/dao/FtTokenDao.java index 75a96e9..7016ac8 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/dao/FtTokenDao.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.shiro.dao; +package com.taixingyiji.base.module.shiro.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.shiro.FtToken; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.shiro.FtToken; /** * (FtToken)表数据库访问层 diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroService.java similarity index 66% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroService.java index da16126..fe3e62c 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroService.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.shiro.service; +package com.taixingyiji.base.module.shiro.service; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.module.shiro.FtToken; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.module.shiro.FtToken; import java.util.Date; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroServiceImpl.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroServiceImpl.java index 1757c76..e1f11f6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroServiceImpl.java @@ -1,12 +1,12 @@ -package com.hcframe.base.module.shiro.service; +package com.taixingyiji.base.module.shiro.service; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.config.FrameConfig; -import com.hcframe.base.module.shiro.dao.FtTokenDao; -import com.hcframe.base.module.shiro.FtToken; -import com.hcframe.base.common.utils.TokenProccessor; -import com.hcframe.redis.RedisUtil; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.config.FrameConfig; +import com.taixingyiji.base.module.shiro.dao.FtTokenDao; +import com.taixingyiji.base.module.shiro.FtToken; +import com.taixingyiji.base.common.utils.TokenProccessor; +import com.taixingyiji.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import tk.mybatis.mapper.entity.Example; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroType.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroType.java similarity index 70% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroType.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroType.java index 16c5436..809f8d6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroType.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroType.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro.service; +package com.taixingyiji.base.module.shiro.service; public class ShiroType { diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/SystemRealm.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/SystemRealm.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/SystemRealm.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/SystemRealm.java index 6bb9053..f65c246 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/SystemRealm.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/SystemRealm.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.shiro.service; +package com.taixingyiji.base.module.shiro.service; import org.apache.shiro.authz.SimpleAuthorizationInfo; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/controller/TableConfigController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/controller/TableConfigController.java similarity index 89% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/controller/TableConfigController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/controller/TableConfigController.java index 87cefe9..f1eb23f 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/controller/TableConfigController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/controller/TableConfigController.java @@ -1,11 +1,11 @@ -package com.hcframe.base.module.tableconfig.controller; +package com.taixingyiji.base.module.tableconfig.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.tableconfig.entity.OsSysField; -import com.hcframe.base.module.tableconfig.entity.OsSysSelect; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; -import com.hcframe.base.module.tableconfig.service.TableConfigService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.tableconfig.entity.OsSysField; +import com.taixingyiji.base.module.tableconfig.entity.OsSysSelect; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.module.tableconfig.service.TableConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/controller/TableGenController.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/controller/TableGenController.java similarity index 83% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/controller/TableGenController.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/controller/TableGenController.java index 21d9b51..d927d33 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/controller/TableGenController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/controller/TableGenController.java @@ -1,11 +1,11 @@ -package com.hcframe.base.module.tableconfig.controller; +package com.taixingyiji.base.module.tableconfig.controller; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.tableconfig.entity.FieldInfo; -import com.hcframe.base.module.tableconfig.entity.TableInfo; -import com.hcframe.base.module.tableconfig.service.TableGenService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.tableconfig.entity.FieldInfo; +import com.taixingyiji.base.module.tableconfig.entity.TableInfo; +import com.taixingyiji.base.module.tableconfig.service.TableGenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysFieldDao.java similarity index 63% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysFieldDao.java index 7a8bbe1..9930351 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysFieldDao.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.tableconfig.dao; +package com.taixingyiji.base.module.tableconfig.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.tableconfig.entity.OsSysField; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.tableconfig.entity.OsSysField; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysSelectDao.java similarity index 50% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysSelectDao.java index e52fb97..f5baaf1 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysSelectDao.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.tableconfig.dao; +package com.taixingyiji.base.module.tableconfig.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.tableconfig.entity.OsSysSelect; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.tableconfig.entity.OsSysSelect; /** * (OsSysSelect)表数据库访问层 diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysTableMapper.java similarity index 52% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysTableMapper.java index c04425d..0bb92a9 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/OsSysTableMapper.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.tableconfig.dao; +package com.taixingyiji.base.module.tableconfig.dao; -import com.hcframe.base.common.Mapper; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.Mapper; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; import org.apache.ibatis.annotations.Param; public interface OsSysTableMapper extends Mapper { diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/TableGenMapper.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/TableGenMapper.java similarity index 90% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/TableGenMapper.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/TableGenMapper.java index ece78d9..a66a75e 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/TableGenMapper.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/dao/TableGenMapper.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.tableconfig.dao; +package com.taixingyiji.base.module.tableconfig.dao; -import com.hcframe.base.module.tableconfig.entity.FieldInfo; -import com.hcframe.base.module.tableconfig.entity.TableInfo; +import com.taixingyiji.base.module.tableconfig.entity.FieldInfo; +import com.taixingyiji.base.module.tableconfig.entity.TableInfo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/FieldInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/FieldInfo.java similarity index 94% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/FieldInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/FieldInfo.java index 064d73c..c456b7d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/FieldInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/FieldInfo.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.tableconfig.entity; +package com.taixingyiji.base.module.tableconfig.entity; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysField.java similarity index 96% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysField.java index 810f89f..f74ec13 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysField.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.tableconfig.entity; +package com.taixingyiji.base.module.tableconfig.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysSelect.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysSelect.java similarity index 93% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysSelect.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysSelect.java index b8e3df0..2945639 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysSelect.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysSelect.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.tableconfig.entity; +package com.taixingyiji.base.module.tableconfig.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysTable.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysTable.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysTable.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysTable.java index afb23cc..f83e600 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysTable.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/OsSysTable.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.tableconfig.entity; +package com.taixingyiji.base.module.tableconfig.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/TableInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/TableInfo.java similarity index 92% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/TableInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/TableInfo.java index 521a5a0..32ffdb7 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/TableInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/entity/TableInfo.java @@ -1,4 +1,4 @@ -package com.hcframe.base.module.tableconfig.entity; +package com.taixingyiji.base.module.tableconfig.entity; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/TableConfigService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/TableConfigService.java similarity index 70% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/TableConfigService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/TableConfigService.java index 5fe4130..3399a87 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/TableConfigService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/TableConfigService.java @@ -1,10 +1,10 @@ -package com.hcframe.base.module.tableconfig.service; +package com.taixingyiji.base.module.tableconfig.service; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.tableconfig.entity.OsSysField; -import com.hcframe.base.module.tableconfig.entity.OsSysSelect; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.tableconfig.entity.OsSysField; +import com.taixingyiji.base.module.tableconfig.entity.OsSysSelect; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; public interface TableConfigService { diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/TableGenService.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/TableGenService.java similarity index 58% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/TableGenService.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/TableGenService.java index 0f7978e..2b93982 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/TableGenService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/TableGenService.java @@ -1,10 +1,10 @@ -package com.hcframe.base.module.tableconfig.service; +package com.taixingyiji.base.module.tableconfig.service; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.tableconfig.entity.FieldInfo; -import com.hcframe.base.module.tableconfig.entity.TableInfo; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.tableconfig.entity.FieldInfo; +import com.taixingyiji.base.module.tableconfig.entity.TableInfo; public interface TableGenService { ResultVO getTableList(WebPageInfo webPageInfo, TableInfo tableInfo, DatasourceConfig datasourceConfig); diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/impl/TableConfigServiceImpl.java similarity index 91% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/impl/TableConfigServiceImpl.java index aa82545..e1655f6 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/impl/TableConfigServiceImpl.java @@ -1,22 +1,22 @@ -package com.hcframe.base.module.tableconfig.service.impl; +package com.taixingyiji.base.module.tableconfig.service.impl; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.MyPageHelper; -import com.hcframe.base.module.cache.CacheService; -import com.hcframe.base.module.cache.emum.CacheType; -import com.hcframe.base.module.data.exception.SqlException; -import com.hcframe.base.module.data.module.BaseMapper; -import com.hcframe.base.module.data.module.BaseMapperImpl; -import com.hcframe.base.module.data.module.DataMap; -import com.hcframe.base.module.tableconfig.dao.OsSysFieldDao; -import com.hcframe.base.module.tableconfig.dao.OsSysSelectDao; -import com.hcframe.base.module.tableconfig.dao.OsSysTableMapper; -import com.hcframe.base.module.tableconfig.entity.OsSysField; -import com.hcframe.base.module.tableconfig.entity.OsSysSelect; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; -import com.hcframe.base.module.cache.impl.TableCache; -import com.hcframe.base.module.tableconfig.service.TableConfigService; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.MyPageHelper; +import com.taixingyiji.base.module.cache.CacheService; +import com.taixingyiji.base.module.cache.emum.CacheType; +import com.taixingyiji.base.module.data.exception.SqlException; +import com.taixingyiji.base.module.data.module.BaseMapper; +import com.taixingyiji.base.module.data.module.BaseMapperImpl; +import com.taixingyiji.base.module.data.module.DataMap; +import com.taixingyiji.base.module.tableconfig.dao.OsSysFieldDao; +import com.taixingyiji.base.module.tableconfig.dao.OsSysSelectDao; +import com.taixingyiji.base.module.tableconfig.dao.OsSysTableMapper; +import com.taixingyiji.base.module.tableconfig.entity.OsSysField; +import com.taixingyiji.base.module.tableconfig.entity.OsSysSelect; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.module.cache.impl.TableCache; +import com.taixingyiji.base.module.tableconfig.service.TableConfigService; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableGenServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/impl/TableGenServiceImpl.java similarity index 81% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableGenServiceImpl.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/impl/TableGenServiceImpl.java index 09b58a8..105a168 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableGenServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/service/impl/TableGenServiceImpl.java @@ -1,19 +1,19 @@ -package com.hcframe.base.module.tableconfig.service.impl; +package com.taixingyiji.base.module.tableconfig.service.impl; -import com.hcframe.base.common.ResultVO; -import com.hcframe.base.common.ServiceException; -import com.hcframe.base.common.WebPageInfo; -import com.hcframe.base.common.utils.MyPageHelper; -import com.hcframe.base.module.datasource.entity.DatasourceConfig; -import com.hcframe.base.module.tableconfig.dao.OsSysFieldDao; -import com.hcframe.base.module.tableconfig.dao.OsSysTableMapper; -import com.hcframe.base.module.tableconfig.entity.FieldInfo; -import com.hcframe.base.module.tableconfig.entity.OsSysField; -import com.hcframe.base.module.tableconfig.entity.OsSysTable; -import com.hcframe.base.module.tableconfig.entity.TableInfo; -import com.hcframe.base.module.tableconfig.service.TableGenService; -import com.hcframe.base.module.tableconfig.sqlinfo.SqlInfo; -import com.hcframe.base.module.tableconfig.sqlinfo.SqlInfoFactory; +import com.taixingyiji.base.common.ResultVO; +import com.taixingyiji.base.common.ServiceException; +import com.taixingyiji.base.common.WebPageInfo; +import com.taixingyiji.base.common.utils.MyPageHelper; +import com.taixingyiji.base.module.datasource.entity.DatasourceConfig; +import com.taixingyiji.base.module.tableconfig.dao.OsSysFieldDao; +import com.taixingyiji.base.module.tableconfig.dao.OsSysTableMapper; +import com.taixingyiji.base.module.tableconfig.entity.FieldInfo; +import com.taixingyiji.base.module.tableconfig.entity.OsSysField; +import com.taixingyiji.base.module.tableconfig.entity.OsSysTable; +import com.taixingyiji.base.module.tableconfig.entity.TableInfo; +import com.taixingyiji.base.module.tableconfig.service.TableGenService; +import com.taixingyiji.base.module.tableconfig.sqlinfo.SqlInfo; +import com.taixingyiji.base.module.tableconfig.sqlinfo.SqlInfoFactory; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/SqlInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/SqlInfo.java similarity index 66% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/SqlInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/SqlInfo.java index 18b534c..f99688d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/SqlInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/SqlInfo.java @@ -1,7 +1,7 @@ -package com.hcframe.base.module.tableconfig.sqlinfo; +package com.taixingyiji.base.module.tableconfig.sqlinfo; -import com.hcframe.base.module.tableconfig.entity.FieldInfo; -import com.hcframe.base.module.tableconfig.entity.TableInfo; +import com.taixingyiji.base.module.tableconfig.entity.FieldInfo; +import com.taixingyiji.base.module.tableconfig.entity.TableInfo; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/SqlInfoFactory.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/SqlInfoFactory.java similarity index 81% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/SqlInfoFactory.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/SqlInfoFactory.java index 80660b0..d6c659b 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/SqlInfoFactory.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/SqlInfoFactory.java @@ -1,8 +1,8 @@ -package com.hcframe.base.module.tableconfig.sqlinfo; +package com.taixingyiji.base.module.tableconfig.sqlinfo; -import com.hcframe.base.common.utils.SpringContextUtil; -import com.hcframe.base.module.tableconfig.sqlinfo.impl.MysqlSqlInfo; -import com.hcframe.base.module.tableconfig.sqlinfo.impl.OracleSqlInfo; +import com.taixingyiji.base.common.utils.SpringContextUtil; +import com.taixingyiji.base.module.tableconfig.sqlinfo.impl.MysqlSqlInfo; +import com.taixingyiji.base.module.tableconfig.sqlinfo.impl.OracleSqlInfo; import java.util.ArrayList; import java.util.List; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/impl/MysqlSqlInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/impl/MysqlSqlInfo.java similarity index 73% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/impl/MysqlSqlInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/impl/MysqlSqlInfo.java index a325d44..918b11f 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/impl/MysqlSqlInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/impl/MysqlSqlInfo.java @@ -1,10 +1,10 @@ -package com.hcframe.base.module.tableconfig.sqlinfo.impl; +package com.taixingyiji.base.module.tableconfig.sqlinfo.impl; -import com.hcframe.base.module.datasource.utils.DataUnit; -import com.hcframe.base.module.tableconfig.dao.TableGenMapper; -import com.hcframe.base.module.tableconfig.entity.FieldInfo; -import com.hcframe.base.module.tableconfig.entity.TableInfo; -import com.hcframe.base.module.tableconfig.sqlinfo.SqlInfo; +import com.taixingyiji.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.module.tableconfig.dao.TableGenMapper; +import com.taixingyiji.base.module.tableconfig.entity.FieldInfo; +import com.taixingyiji.base.module.tableconfig.entity.TableInfo; +import com.taixingyiji.base.module.tableconfig.sqlinfo.SqlInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/impl/OracleSqlInfo.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/impl/OracleSqlInfo.java similarity index 72% rename from hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/impl/OracleSqlInfo.java rename to hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/impl/OracleSqlInfo.java index 86cad19..964d0c3 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/sqlinfo/impl/OracleSqlInfo.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/tableconfig/sqlinfo/impl/OracleSqlInfo.java @@ -1,10 +1,10 @@ -package com.hcframe.base.module.tableconfig.sqlinfo.impl; +package com.taixingyiji.base.module.tableconfig.sqlinfo.impl; -import com.hcframe.base.module.datasource.utils.DataUnit; -import com.hcframe.base.module.tableconfig.dao.TableGenMapper; -import com.hcframe.base.module.tableconfig.entity.FieldInfo; -import com.hcframe.base.module.tableconfig.entity.TableInfo; -import com.hcframe.base.module.tableconfig.sqlinfo.SqlInfo; +import com.taixingyiji.base.module.datasource.utils.DataUnit; +import com.taixingyiji.base.module.tableconfig.dao.TableGenMapper; +import com.taixingyiji.base.module.tableconfig.entity.FieldInfo; +import com.taixingyiji.base.module.tableconfig.entity.TableInfo; +import com.taixingyiji.base.module.tableconfig.sqlinfo.SqlInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/hcframe-parent/hcframe-base/src/main/resources/mapping/auth/OsSysMenuDao.xml b/hcframe-parent/hcframe-base/src/main/resources/mapping/auth/OsSysMenuDao.xml index 288c5f6..e4ead57 100644 --- a/hcframe-parent/hcframe-base/src/main/resources/mapping/auth/OsSysMenuDao.xml +++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/auth/OsSysMenuDao.xml @@ -1,8 +1,8 @@ - + - + diff --git a/hcframe-parent/hcframe-base/src/main/resources/mapping/data/TableMapper.xml b/hcframe-parent/hcframe-base/src/main/resources/mapping/data/TableMapper.xml index 48f6535..6f5ac78 100644 --- a/hcframe-parent/hcframe-base/src/main/resources/mapping/data/TableMapper.xml +++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/data/TableMapper.xml @@ -1,6 +1,6 @@ - + SELECT DISTINCT diff --git a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysSelectDao.xml b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysSelectDao.xml index 3d7e76b..af242ed 100644 --- a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysSelectDao.xml +++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysSelectDao.xml @@ -1,8 +1,8 @@ - + - + diff --git a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml index b01bfe4..434b703 100644 --- a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml +++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml @@ -1,13 +1,13 @@ - - + + - + '; - } - that.header.stateField = column.field; - } - if (column.radio) { - text = ''; - that.header.stateField = column.field; - that.options.singleSelect = true; - } - - html.push(text); - html.push(''); - html.push('
'); - html.push(''); - html.push(''); - }); - html.push(''); - }); - - this.$header.html(html.join('')); - this.$header.find('th[data-field]').each(function (i) { - $(this).data(visibleColumns[$(this).data('field')]); - }); - this.$container.off('click', '.th-inner').on('click', '.th-inner', function (event) { - var target = $(this); - - if (that.options.detailView) { - if (target.closest('.bootstrap-table')[0] !== that.$container[0]) - return false; - } - - if (that.options.sortable && target.parent().data().sortable) { - that.onSort(event); - } - }); - - this.$header.children().children().off('keypress').on('keypress', function (event) { - if (that.options.sortable && $(this).data().sortable) { - var code = event.keyCode || event.which; - if (code == 13) { //Enter keycode - that.onSort(event); - } - } - }); - - $(window).off('resize.bootstrap-table'); - if (!this.options.showHeader || this.options.cardView) { - this.$header.hide(); - this.$tableHeader.hide(); - this.$tableLoading.css('top', 0); - } else { - this.$header.show(); - this.$tableHeader.show(); - this.$tableLoading.css('top', this.$header.outerHeight() + 1); - // Assign the correct sortable arrow - this.getCaret(); - $(window).on('resize.bootstrap-table', $.proxy(this.resetWidth, this)); - } - - this.$selectAll = this.$header.find('[name="btSelectAll"]'); - this.$selectAll.off('click').on('click', function () { - var checked = $(this).prop('checked'); - that[checked ? 'checkAll' : 'uncheckAll'](); - that.updateSelected(); - }); - }; - - BootstrapTable.prototype.initFooter = function () { - if (!this.options.showFooter || this.options.cardView) { - this.$tableFooter.hide(); - } else { - this.$tableFooter.show(); - } - }; - - /** - * @param data - * @param type: append / prepend - */ - BootstrapTable.prototype.initData = function (data, type) { - if (type === 'append') { - this.data = this.data.concat(data); - } else if (type === 'prepend') { - this.data = [].concat(data).concat(this.data); - } else { - this.data = data || this.options.data; - } - - // Fix #839 Records deleted when adding new row on filtered table - if (type === 'append') { - this.options.data = this.options.data.concat(data); - } else if (type === 'prepend') { - this.options.data = [].concat(data).concat(this.options.data); - } else { - this.options.data = this.data; - } - - if (this.options.sidePagination === 'server') { - return; - } - this.initSort(); - }; - - BootstrapTable.prototype.initSort = function () { - var that = this, - name = this.options.sortName, - order = this.options.sortOrder === 'desc' ? -1 : 1, - index = $.inArray(this.options.sortName, this.header.fields); - - if (this.options.customSort !== $.noop) { - this.options.customSort.apply(this, [this.options.sortName, this.options.sortOrder]); - return; - } - - if (index !== -1) { - if (this.options.sortStable) { - $.each(this.data, function (i, row) { - if (!row.hasOwnProperty('_position')) row._position = i; - }); - } - - this.data.sort(function (a, b) { - if (that.header.sortNames[index]) { - name = that.header.sortNames[index]; - } - var aa = getItemField(a, name, that.options.escape), - bb = getItemField(b, name, that.options.escape), - value = calculateObjectValue(that.header, that.header.sorters[index], [aa, bb]); - - if (value !== undefined) { - return order * value; - } - - // Fix #161: undefined or null string sort bug. - if (aa === undefined || aa === null) { - aa = ''; - } - if (bb === undefined || bb === null) { - bb = ''; - } - - if (that.options.sortStable && aa === bb) { - aa = a._position; - bb = b._position; - } - - // IF both values are numeric, do a numeric comparison - if ($.isNumeric(aa) && $.isNumeric(bb)) { - // Convert numerical values form string to float. - aa = parseFloat(aa); - bb = parseFloat(bb); - if (aa < bb) { - return order * -1; - } - return order; - } - - if (aa === bb) { - return 0; - } - - // If value is not a string, convert to string - if (typeof aa !== 'string') { - aa = aa.toString(); - } - - if (aa.localeCompare(bb) === -1) { - return order * -1; - } - - return order; - }); - } - }; - - BootstrapTable.prototype.onSort = function (event) { - var $this = event.type === "keypress" ? $(event.currentTarget) : $(event.currentTarget).parent(), - $this_ = this.$header.find('th').eq($this.index()); - - this.$header.add(this.$header_).find('span.order').remove(); - - if (this.options.sortName === $this.data('field')) { - this.options.sortOrder = this.options.sortOrder === 'asc' ? 'desc' : 'asc'; - } else { - this.options.sortName = $this.data('field'); - this.options.sortOrder = $this.data('order') === 'asc' ? 'desc' : 'asc'; - } - this.trigger('sort', this.options.sortName, this.options.sortOrder); - - $this.add($this_).data('order', this.options.sortOrder); - - // Assign the correct sortable arrow - this.getCaret(); - - if (this.options.sidePagination === 'server') { - this.initServer(this.options.silentSort); - return; - } - - this.initSort(); - this.initBody(); - }; - - BootstrapTable.prototype.initToolbar = function () { - var that = this, - html = [], - timeoutId = 0, - $keepOpen, - $search, - switchableCount = 0; - - if (this.$toolbar.find('.bs-bars').children().length) { - $('body').append($(this.options.toolbar)); - } - this.$toolbar.html(''); - - if (typeof this.options.toolbar === 'string' || typeof this.options.toolbar === 'object') { - $(sprintf('
', this.options.toolbarAlign)) - .appendTo(this.$toolbar) - .append($(this.options.toolbar)); - } - - // showColumns, showToggle, showRefresh - html = [sprintf('
', - this.options.buttonsAlign, this.options.buttonsAlign)]; - - if (typeof this.options.icons === 'string') { - this.options.icons = calculateObjectValue(null, this.options.icons); - } - - if (this.options.showPaginationSwitch) { - html.push(sprintf(''); - } - - if (this.options.showRefresh) { - html.push(sprintf(''); - } - - if (this.options.showToggle) { - html.push(sprintf(''); - } - - if (this.options.showColumns) { - html.push(sprintf('
', - this.options.formatColumns()), - '', - '', - '
'); - } - - html.push('
'); - - // Fix #188: this.showToolbar is for extensions - if (this.showToolbar || html.length > 2) { - this.$toolbar.append(html.join('')); - } - - if (this.options.showPaginationSwitch) { - this.$toolbar.find('button[name="paginationSwitch"]') - .off('click').on('click', $.proxy(this.togglePagination, this)); - } - - if (this.options.showRefresh) { - this.$toolbar.find('button[name="refresh"]') - .off('click').on('click', $.proxy(this.refresh, this)); - } - - if (this.options.showToggle) { - this.$toolbar.find('button[name="toggle"]') - .off('click').on('click', function () { - that.toggleView(); - }); - } - - if (this.options.showColumns) { - $keepOpen = this.$toolbar.find('.keep-open'); - - if (switchableCount <= this.options.minimumCountColumns) { - $keepOpen.find('input').prop('disabled', true); - } - - $keepOpen.find('li').off('click').on('click', function (event) { - event.stopImmediatePropagation(); - }); - $keepOpen.find('input').off('click').on('click', function () { - var $this = $(this); - - that.toggleColumn($(this).val(), $this.prop('checked'), false); - that.trigger('column-switch', $(this).data('field'), $this.prop('checked')); - }); - } - - if (this.options.search) { - html = []; - html.push( - ''); - - this.$toolbar.append(html.join('')); - $search = this.$toolbar.find('.search input'); - $search.off('keyup drop').on('keyup drop', function (event) { - if (that.options.searchOnEnterKey && event.keyCode !== 13) { - return; - } - - if ($.inArray(event.keyCode, [37, 38, 39, 40]) > -1) { - return; - } - - clearTimeout(timeoutId); // doesn't matter if it's 0 - timeoutId = setTimeout(function () { - that.onSearch(event); - }, that.options.searchTimeOut); - }); - - if (isIEBrowser()) { - $search.off('mouseup').on('mouseup', function (event) { - clearTimeout(timeoutId); // doesn't matter if it's 0 - timeoutId = setTimeout(function () { - that.onSearch(event); - }, that.options.searchTimeOut); - }); - } - } - }; - - BootstrapTable.prototype.onSearch = function (event) { - var text = $.trim($(event.currentTarget).val()); - - // trim search input - if (this.options.trimOnSearch && $(event.currentTarget).val() !== text) { - $(event.currentTarget).val(text); - } - - if (text === this.searchText) { - return; - } - this.searchText = text; - this.options.searchText = text; - - this.options.pageNumber = 1; - this.initSearch(); - this.updatePagination(); - this.trigger('search', text); - }; - - BootstrapTable.prototype.initSearch = function () { - var that = this; - - if (this.options.sidePagination !== 'server') { - if (this.options.customSearch !== $.noop) { - this.options.customSearch.apply(this, [this.searchText]); - return; - } - - var s = this.searchText && (this.options.escape ? - escapeHTML(this.searchText) : this.searchText).toLowerCase(); - var f = $.isEmptyObject(this.filterColumns) ? null : this.filterColumns; - - // Check filter - this.data = f ? $.grep(this.options.data, function (item, i) { - for (var key in f) { - if ($.isArray(f[key]) && $.inArray(item[key], f[key]) === -1 || - item[key] !== f[key]) { - return false; - } - } - return true; - }) : this.options.data; - - this.data = s ? $.grep(this.data, function (item, i) { - for (var j = 0; j < that.header.fields.length; j++) { - - if (!that.header.searchables[j]) { - continue; - } - - var key = $.isNumeric(that.header.fields[j]) ? parseInt(that.header.fields[j], 10) : that.header.fields[j]; - var column = that.columns[getFieldIndex(that.columns, key)]; - var value; - - if (typeof key === 'string') { - value = item; - var props = key.split('.'); - for (var prop_index = 0; prop_index < props.length; prop_index++) { - value = value[props[prop_index]]; - } - - // Fix #142: respect searchForamtter boolean - if (column && column.searchFormatter) { - value = calculateObjectValue(column, - that.header.formatters[j], [value, item, i], value); - } - } else { - value = item[key]; - } - - if (typeof value === 'string' || typeof value === 'number') { - if (that.options.strictSearch) { - if ((value + '').toLowerCase() === s) { - return true; - } - } else { - if ((value + '').toLowerCase().indexOf(s) !== -1) { - return true; - } - } - } - } - return false; - }) : this.data; - } - }; - - BootstrapTable.prototype.initPagination = function () { - if (!this.options.pagination) { - this.$pagination.hide(); - return; - } else { - this.$pagination.show(); - } - - var that = this, - html = [], - $allSelected = false, - i, from, to, - $pageList, - $first, $pre, - $next, $last, - $number, - data = this.getData(), - pageList = this.options.pageList; - - if (this.options.sidePagination !== 'server') { - this.options.totalRows = data.length; - } - - this.totalPages = 0; - if (this.options.totalRows) { - if (this.options.pageSize === this.options.formatAllRows()) { - this.options.pageSize = this.options.totalRows; - $allSelected = true; - } else if (this.options.pageSize === this.options.totalRows) { - // Fix #667 Table with pagination, - // multiple pages and a search that matches to one page throws exception - var pageLst = typeof this.options.pageList === 'string' ? - this.options.pageList.replace('[', '').replace(']', '') - .replace(/ /g, '').toLowerCase().split(',') : this.options.pageList; - if ($.inArray(this.options.formatAllRows().toLowerCase(), pageLst) > -1) { - $allSelected = true; - } - } - - this.totalPages = ~~((this.options.totalRows - 1) / this.options.pageSize) + 1; - - this.options.totalPages = this.totalPages; - } - if (this.totalPages > 0 && this.options.pageNumber > this.totalPages) { - this.options.pageNumber = this.totalPages; - } - - this.pageFrom = (this.options.pageNumber - 1) * this.options.pageSize + 1; - this.pageTo = this.options.pageNumber * this.options.pageSize; - if (this.pageTo > this.options.totalRows) { - this.pageTo = this.options.totalRows; - } - - html.push( - '
', - '', - this.options.onlyInfoPagination ? this.options.formatDetailPagination(this.options.totalRows) : - this.options.formatShowingRows(this.pageFrom, this.pageTo, this.options.totalRows), - ''); - - if (!this.options.onlyInfoPagination) { - html.push(''); - - var pageNumber = [ - sprintf('', - this.options.paginationVAlign === 'top' || this.options.paginationVAlign === 'both' ? - 'dropdown' : 'dropup'), - '', - ''); - - html.push(this.options.formatRecordsPerPage(pageNumber.join(''))); - html.push(''); - - html.push('
', - ''); - } - this.$pagination.html(html.join('')); - - if (!this.options.onlyInfoPagination) { - $pageList = this.$pagination.find('.page-list a'); - $first = this.$pagination.find('.page-first'); - $pre = this.$pagination.find('.page-pre'); - $next = this.$pagination.find('.page-next'); - $last = this.$pagination.find('.page-last'); - $number = this.$pagination.find('.page-number'); - - if (this.options.smartDisplay) { - if (this.totalPages <= 1) { - this.$pagination.find('div.pagination').hide(); - } - if (pageList.length < 2 || this.options.totalRows <= pageList[0]) { - this.$pagination.find('span.page-list').hide(); - } - - // when data is empty, hide the pagination - this.$pagination[this.getData().length ? 'show' : 'hide'](); - } - if ($allSelected) { - this.options.pageSize = this.options.formatAllRows(); - } - $pageList.off('click').on('click', $.proxy(this.onPageListChange, this)); - $first.off('click').on('click', $.proxy(this.onPageFirst, this)); - $pre.off('click').on('click', $.proxy(this.onPagePre, this)); - $next.off('click').on('click', $.proxy(this.onPageNext, this)); - $last.off('click').on('click', $.proxy(this.onPageLast, this)); - $number.off('click').on('click', $.proxy(this.onPageNumber, this)); - } - }; - - BootstrapTable.prototype.updatePagination = function (event) { - // Fix #171: IE disabled button can be clicked bug. - if (event && $(event.currentTarget).hasClass('disabled')) { - return; - } - - if (!this.options.maintainSelected) { - this.resetRows(); - } - - this.initPagination(); - if (this.options.sidePagination === 'server') { - this.initServer(); - } else { - this.initBody(); - } - - this.trigger('page-change', this.options.pageNumber, this.options.pageSize); - }; - - BootstrapTable.prototype.onPageListChange = function (event) { - var $this = $(event.currentTarget); - - $this.parent().addClass('active').siblings().removeClass('active'); - this.options.pageSize = $this.text().toUpperCase() === this.options.formatAllRows().toUpperCase() ? - this.options.formatAllRows() : +$this.text(); - this.$toolbar.find('.page-size').text(this.options.pageSize); - - this.updatePagination(event); - }; - - BootstrapTable.prototype.onPageFirst = function (event) { - this.options.pageNumber = 1; - this.updatePagination(event); - }; - - BootstrapTable.prototype.onPagePre = function (event) { - if ((this.options.pageNumber - 1) === 0) { - this.options.pageNumber = this.options.totalPages; - } else { - this.options.pageNumber--; - } - this.updatePagination(event); - }; - - BootstrapTable.prototype.onPageNext = function (event) { - if ((this.options.pageNumber + 1) > this.options.totalPages) { - this.options.pageNumber = 1; - } else { - this.options.pageNumber++; - } - this.updatePagination(event); - }; - - BootstrapTable.prototype.onPageLast = function (event) { - this.options.pageNumber = this.totalPages; - this.updatePagination(event); - }; - - BootstrapTable.prototype.onPageNumber = function (event) { - if (this.options.pageNumber === +$(event.currentTarget).text()) { - return; - } - this.options.pageNumber = +$(event.currentTarget).text(); - this.updatePagination(event); - }; - - BootstrapTable.prototype.initBody = function (fixedScroll) { - var that = this, - html = [], - data = this.getData(); - - this.trigger('pre-body', data); - - this.$body = this.$el.find('>tbody'); - if (!this.$body.length) { - this.$body = $('').appendTo(this.$el); - } - - //Fix #389 Bootstrap-table-flatJSON is not working - - if (!this.options.pagination || this.options.sidePagination === 'server') { - this.pageFrom = 1; - this.pageTo = data.length; - } - - for (var i = this.pageFrom - 1; i < this.pageTo; i++) { - var key, - item = data[i], - style = {}, - csses = [], - data_ = '', - attributes = {}, - htmlAttributes = []; - - style = calculateObjectValue(this.options, this.options.rowStyle, [item, i], style); - - if (style && style.css) { - for (key in style.css) { - csses.push(key + ': ' + style.css[key]); - } - } - - attributes = calculateObjectValue(this.options, - this.options.rowAttributes, [item, i], attributes); - - if (attributes) { - for (key in attributes) { - htmlAttributes.push(sprintf('%s="%s"', key, escapeHTML(attributes[key]))); - } - } - - if (item._data && !$.isEmptyObject(item._data)) { - $.each(item._data, function (k, v) { - // ignore data-index - if (k === 'index') { - return; - } - data_ += sprintf(' data-%s="%s"', k, v); - }); - } - - html.push('' - ); - - if (this.options.cardView) { - html.push(sprintf('
', this.header.fields.length)); - } - - if (!this.options.cardView && this.options.detailView) { - html.push('', - '', - sprintf('', this.options.iconsPrefix, this.options.icons.detailOpen), - '', - ''); - } - - $.each(this.header.fields, function (j, field) { - var text = '', - value = getItemField(item, field, that.options.escape), - type = '', - cellStyle = {}, - id_ = '', - class_ = that.header.classes[j], - data_ = '', - rowspan_ = '', - colspan_ = '', - title_ = '', - column = that.columns[j]; - - if (that.fromHtml && typeof value === 'undefined') { - return; - } - - if (!column.visible) { - return; - } - - if (that.options.cardView && !column.cardVisible) { - return; - } - - style = sprintf('style="%s"', csses.concat(that.header.styles[j]).join('; ')); - - // handle td's id and class - if (item['_' + field + '_id']) { - id_ = sprintf(' id="%s"', item['_' + field + '_id']); - } - if (item['_' + field + '_class']) { - class_ = sprintf(' class="%s"', item['_' + field + '_class']); - } - if (item['_' + field + '_rowspan']) { - rowspan_ = sprintf(' rowspan="%s"', item['_' + field + '_rowspan']); - } - if (item['_' + field + '_colspan']) { - colspan_ = sprintf(' colspan="%s"', item['_' + field + '_colspan']); - } - if (item['_' + field + '_title']) { - title_ = sprintf(' title="%s"', item['_' + field + '_title']); - } - //更改cellStyle获取位置 - /*cellStyle = calculateObjectValue(that.header, - that.header.cellStyles[j], [value, item, i, field], cellStyle);*/ - cellStyle = calculateObjectValue(column, - that.header.cellStyles[j], [value, item, i, field], cellStyle); - if (cellStyle.classes) { - class_ = sprintf(' class="%s"', cellStyle.classes); - } - if (cellStyle.css) { - var csses_ = []; - for (var key in cellStyle.css) { - csses_.push(key + ': ' + cellStyle.css[key]); - } - style = sprintf('style="%s"', csses_.concat(that.header.styles[j]).join('; ')); - } - - value = calculateObjectValue(column, - that.header.formatters[j], [value, item, i], value); - - if (item['_' + field + '_data'] && !$.isEmptyObject(item['_' + field + '_data'])) { - $.each(item['_' + field + '_data'], function (k, v) { - // ignore data-index - if (k === 'index') { - return; - } - data_ += sprintf(' data-%s="%s"', k, v); - }); - } - - if (column.checkbox || column.radio) { - type = column.checkbox ? 'checkbox' : type; - type = column.radio ? 'radio' : type; - - text = [sprintf(that.options.cardView ? - '
' : '', column['class'] || ''), - '', - that.header.formatters[j] && typeof value === 'string' ? value : '', - that.options.cardView ? '
' : '' - ].join(''); - - item[that.header.stateField] = value === true || (value && value.checked); - } else { - value = typeof value === 'undefined' || value === null ? - that.options.undefinedText : value; - - text = that.options.cardView ? ['
', - that.options.showHeader ? sprintf('%s', style, - getPropertyFromOther(that.columns, 'field', 'title', field)) : '', - sprintf('%s', value), - '
' - ].join('') : [sprintf('', - id_, class_, style, data_, rowspan_, colspan_, title_), - value, - '' - ].join(''); - - // Hide empty data on Card view when smartDisplay is set to true. - if (that.options.cardView && that.options.smartDisplay && value === '') { - // Should set a placeholder for event binding correct fieldIndex - text = '
'; - } - } - - html.push(text); - }); - - if (this.options.cardView) { - html.push('
'); - } - - html.push(''); - } - - // show no records - if (!html.length) { - html.push('', - sprintf('%s', - this.$header.find('th').length, this.options.formatNoMatches()), - ''); - } - - this.$body.html(html.join('')); - - if (!fixedScroll) { - this.scrollTo(0); - } - - // click to select by column - this.$body.find('> tr[data-index] > td').off('click dblclick').on('click dblclick', function (e) { - var $td = $(this), - $tr = $td.parent(), - item = that.data[$tr.data('index')], - index = $td[0].cellIndex, - fields = that.getVisibleFields(), - field = fields[that.options.detailView && !that.options.cardView ? index - 1 : index], - column = that.columns[getFieldIndex(that.columns, field)], - value = getItemField(item, field, that.options.escape); - - if ($td.find('.detail-icon').length) { - return; - } - - that.trigger(e.type === 'click' ? 'click-cell' : 'dbl-click-cell', field, value, item, $td); - that.trigger(e.type === 'click' ? 'click-row' : 'dbl-click-row', item, $tr, field); - - // if click to select - then trigger the checkbox/radio click - if (e.type === 'click' && that.options.clickToSelect && column.clickToSelect) { - var $selectItem = $tr.find(sprintf('[name="%s"]', that.options.selectItemName)); - if ($selectItem.length) { - $selectItem[0].click(); // #144: .trigger('click') bug - } - } - }); - - this.$body.find('> tr[data-index] > td > .detail-icon').off('click').on('click', function () { - var $this = $(this), - $tr = $this.parent().parent(), - index = $tr.data('index'), - row = data[index]; // Fix #980 Detail view, when searching, returns wrong row - - // remove and update - if ($tr.next().is('tr.detail-view')) { - $this.find('i').attr('class', sprintf('%s %s', that.options.iconsPrefix, that.options.icons.detailOpen)); - $tr.next().remove(); - that.trigger('collapse-row', index, row); - } else { - $this.find('i').attr('class', sprintf('%s %s', that.options.iconsPrefix, that.options.icons.detailClose)); - $tr.after(sprintf('', $tr.find('td').length)); - var $element = $tr.next().find('td'); - var content = calculateObjectValue(that.options, that.options.detailFormatter, [index, row, $element], ''); - if($element.length === 1) { - $element.append(content); - } - that.trigger('expand-row', index, row, $element); - } - that.resetView(); - }); - - this.$selectItem = this.$body.find(sprintf('[name="%s"]', this.options.selectItemName)); - this.$selectItem.off('click').on('click', function (event) { - event.stopImmediatePropagation(); - - var $this = $(this), - checked = $this.prop('checked'), - row = that.data[$this.data('index')]; - - if (that.options.maintainSelected && $(this).is(':radio')) { - $.each(that.options.data, function (i, row) { - row[that.header.stateField] = false; - }); - } - - row[that.header.stateField] = checked; - - if (that.options.singleSelect) { - that.$selectItem.not(this).each(function () { - that.data[$(this).data('index')][that.header.stateField] = false; - }); - that.$selectItem.filter(':checked').not(this).prop('checked', false); - } - - that.updateSelected(); - that.trigger(checked ? 'check' : 'uncheck', row, $this); - }); - - $.each(this.header.events, function (i, events) { - if (!events) { - return; - } - // fix bug, if events is defined with namespace - if (typeof events === 'string') { - events = calculateObjectValue(null, events); - } - - var field = that.header.fields[i], - fieldIndex = $.inArray(field, that.getVisibleFields()); - - if (that.options.detailView && !that.options.cardView) { - fieldIndex += 1; - } - - for (var key in events) { - that.$body.find('>tr:not(.no-records-found)').each(function () { - var $tr = $(this), - $td = $tr.find(that.options.cardView ? '.card-view' : 'td').eq(fieldIndex), - index = key.indexOf(' '), - name = key.substring(0, index), - el = key.substring(index + 1), - func = events[key]; - - $td.find(el).off(name).on(name, function (e) { - var index = $tr.data('index'), - row = that.data[index], - value = row[field]; - - func.apply(this, [e, value, row, index]); - }); - }); - } - }); - - this.updateSelected(); - this.resetView(); - - this.trigger('post-body', data); - }; - - BootstrapTable.prototype.initServer = function (silent, query, url) { - var that = this, - data = {}, - params = { - searchText: this.searchText, - sortName: this.options.sortName, - sortOrder: this.options.sortOrder - }, - request; - - if (this.options.pagination) { - params.pageSize = this.options.pageSize === this.options.formatAllRows() ? - this.options.totalRows : this.options.pageSize; - params.pageNumber = this.options.pageNumber; - } - - if (!(url || this.options.url) && !this.options.ajax) { - return; - } - - if (this.options.queryParamsType === 'limit') { - params = { - search: params.searchText, - sort: params.sortName, - order: params.sortOrder - }; - - if (this.options.pagination) { - params.offset = this.options.pageSize === this.options.formatAllRows() ? - 0 : this.options.pageSize * (this.options.pageNumber - 1); - params.limit = this.options.pageSize === this.options.formatAllRows() ? - this.options.totalRows : this.options.pageSize; - } - } - - if (!($.isEmptyObject(this.filterColumnsPartial))) { - params.filter = JSON.stringify(this.filterColumnsPartial, null); - } - - data = calculateObjectValue(this.options, this.options.queryParams, [params], data); - - $.extend(data, query || {}); - - // false to stop request - if (data === false) { - return; - } - - if (!silent) { - this.$tableLoading.show(); - } - request = $.extend({}, calculateObjectValue(null, this.options.ajaxOptions), { - type: this.options.method, - url: url || this.options.url, - data: this.options.contentType === 'application/json' && this.options.method === 'post' ? - JSON.stringify(data) : data, - cache: this.options.cache, - contentType: this.options.contentType, - dataType: this.options.dataType, - success: function (res) { - res = calculateObjectValue(that.options, that.options.responseHandler, [res], res); - - that.load(res); - that.trigger('load-success', res); - if (!silent) that.$tableLoading.hide(); - }, - error: function (res) { - that.trigger('load-error', res.status, res); - if (!silent) that.$tableLoading.hide(); - } - }); - - if (this.options.ajax) { - calculateObjectValue(this, this.options.ajax, [request], null); - } else { - if (this._xhr && this._xhr.readyState !== 4) { - this._xhr.abort(); - } - this._xhr = $.ajax(request); - } - }; - - BootstrapTable.prototype.initSearchText = function () { - if (this.options.search) { - if (this.options.searchText !== '') { - var $search = this.$toolbar.find('.search input'); - $search.val(this.options.searchText); - this.onSearch({currentTarget: $search}); - } - } - }; - - BootstrapTable.prototype.getCaret = function () { - var that = this; - - $.each(this.$header.find('th'), function (i, th) { - $(th).find('.sortable').removeClass('desc asc').addClass($(th).data('field') === that.options.sortName ? that.options.sortOrder : 'both'); - }); - }; - - BootstrapTable.prototype.updateSelected = function () { - var checkAll = this.$selectItem.filter(':enabled').length && - this.$selectItem.filter(':enabled').length === - this.$selectItem.filter(':enabled').filter(':checked').length; - - this.$selectAll.add(this.$selectAll_).prop('checked', checkAll); - - this.$selectItem.each(function () { - $(this).closest('tr')[$(this).prop('checked') ? 'addClass' : 'removeClass']('selected'); - }); - }; - - BootstrapTable.prototype.updateRows = function () { - var that = this; - - this.$selectItem.each(function () { - that.data[$(this).data('index')][that.header.stateField] = $(this).prop('checked'); - }); - }; - - BootstrapTable.prototype.resetRows = function () { - var that = this; - - $.each(this.data, function (i, row) { - that.$selectAll.prop('checked', false); - that.$selectItem.prop('checked', false); - if (that.header.stateField) { - row[that.header.stateField] = false; - } - }); - }; - - BootstrapTable.prototype.trigger = function (name) { - var args = Array.prototype.slice.call(arguments, 1); - - name += '.bs.table'; - this.options[BootstrapTable.EVENTS[name]].apply(this.options, args); - this.$el.trigger($.Event(name), args); - - this.options.onAll(name, args); - this.$el.trigger($.Event('all.bs.table'), [name, args]); - }; - - BootstrapTable.prototype.resetHeader = function () { - // fix #61: the hidden table reset header bug. - // fix bug: get $el.css('width') error sometime (height = 500) - clearTimeout(this.timeoutId_); - this.timeoutId_ = setTimeout($.proxy(this.fitHeader, this), this.$el.is(':hidden') ? 100 : 0); - }; - - BootstrapTable.prototype.fitHeader = function () { - var that = this, - fixedBody, - scrollWidth, - focused, - focusedTemp; - - if (that.$el.is(':hidden')) { - that.timeoutId_ = setTimeout($.proxy(that.fitHeader, that), 100); - return; - } - fixedBody = this.$tableBody.get(0); - - scrollWidth = fixedBody.scrollWidth > fixedBody.clientWidth && - fixedBody.scrollHeight > fixedBody.clientHeight + this.$header.outerHeight() ? - getScrollBarWidth() : 0; - - this.$el.css('margin-top', -this.$header.outerHeight()); - - focused = $(':focus'); - if (focused.length > 0) { - var $th = focused.parents('th'); - if ($th.length > 0) { - var dataField = $th.attr('data-field'); - if (dataField !== undefined) { - var $headerTh = this.$header.find("[data-field='" + dataField + "']"); - if ($headerTh.length > 0) { - $headerTh.find(":input").addClass("focus-temp"); - } - } - } - } - - this.$header_ = this.$header.clone(true, true); - this.$selectAll_ = this.$header_.find('[name="btSelectAll"]'); - this.$tableHeader.css({ - 'margin-right': scrollWidth - }).find('table').css('width', this.$el.outerWidth()) - .html('').attr('class', this.$el.attr('class')) - .append(this.$header_); - - - focusedTemp = $('.focus-temp:visible:eq(0)'); - if (focusedTemp.length > 0) { - focusedTemp.focus(); - this.$header.find('.focus-temp').removeClass('focus-temp'); - } - - // fix bug: $.data() is not working as expected after $.append() - this.$header.find('th[data-field]').each(function (i) { - that.$header_.find(sprintf('th[data-field="%s"]', $(this).data('field'))).data($(this).data()); - }); - - var visibleFields = this.getVisibleFields(), - $ths = this.$header_.find('th'); - - this.$body.find('>tr:first-child:not(.no-records-found) > *').each(function (i) { - var $this = $(this), - index = i; - - if (that.options.detailView && !that.options.cardView) { - if (i === 0) { - that.$header_.find('th.detail').find('.fht-cell').width($this.innerWidth()); - } - index = i - 1; - } - - var $th = that.$header_.find(sprintf('th[data-field="%s"]', visibleFields[index])); - if ($th.length > 1) { - $th = $($ths[$this[0].cellIndex]); - } - - $th.find('.fht-cell').width($this.innerWidth()); - }); - // horizontal scroll event - // TODO: it's probably better improving the layout than binding to scroll event - this.$tableBody.off('scroll').on('scroll', function () { - that.$tableHeader.scrollLeft($(this).scrollLeft()); - - if (that.options.showFooter && !that.options.cardView) { - that.$tableFooter.scrollLeft($(this).scrollLeft()); - } - }); - that.trigger('post-header'); - }; - - BootstrapTable.prototype.resetFooter = function () { - var that = this, - data = that.getData(), - html = []; - - if (!this.options.showFooter || this.options.cardView) { //do nothing - return; - } - - if (!this.options.cardView && this.options.detailView) { - html.push('
 
'); - } - - $.each(this.columns, function (i, column) { - var key, - falign = '', // footer align style - valign = '', - csses = [], - style = {}, - class_ = sprintf(' class="%s"', column['class']); - - if (!column.visible) { - return; - } - - if (that.options.cardView && (!column.cardVisible)) { - return; - } - - falign = sprintf('text-align: %s; ', column.falign ? column.falign : column.align); - valign = sprintf('vertical-align: %s; ', column.valign); - - style = calculateObjectValue(null, that.options.footerStyle); - - if (style && style.css) { - for (key in style.css) { - csses.push(key + ': ' + style.css[key]); - } - } - - html.push(''); - html.push('
'); - - html.push(calculateObjectValue(column, column.footerFormatter, [data], ' ') || ' '); - - html.push('
'); - html.push('
'); - html.push(''); - html.push(''); - }); - - this.$tableFooter.find('tr').html(html.join('')); - this.$tableFooter.show(); - clearTimeout(this.timeoutFooter_); - this.timeoutFooter_ = setTimeout($.proxy(this.fitFooter, this), - this.$el.is(':hidden') ? 100 : 0); - }; - - BootstrapTable.prototype.fitFooter = function () { - var that = this, - $footerTd, - elWidth, - scrollWidth; - - clearTimeout(this.timeoutFooter_); - if (this.$el.is(':hidden')) { - this.timeoutFooter_ = setTimeout($.proxy(this.fitFooter, this), 100); - return; - } - - elWidth = this.$el.css('width'); - scrollWidth = elWidth > this.$tableBody.width() ? getScrollBarWidth() : 0; - - this.$tableFooter.css({ - 'margin-right': scrollWidth - }).find('table').css('width', elWidth) - .attr('class', this.$el.attr('class')); - - $footerTd = this.$tableFooter.find('td'); - - this.$body.find('>tr:first-child:not(.no-records-found) > *').each(function (i) { - var $this = $(this); - - $footerTd.eq(i).find('.fht-cell').width($this.innerWidth()); - }); - }; - - BootstrapTable.prototype.toggleColumn = function (index, checked, needUpdate) { - if (index === -1) { - return; - } - - this.columns[index].visible = checked; - this.initHeader(); - this.initSearch(); - this.initPagination(); - this.initBody(); - //自定义滚动条 - /*var newWidthStr = this.$el.outerWidth() - this.$el.find("tbody tr:first td").eq(index).outerWidth(); - var containerWidthStr = this.$container.outerWidth(); - if(newWidthStr >= containerWidthStr){ - this.$el.outerWidth(newWidthStr); - console.log(this.$el.outerWidth()); - var headerWidthStr = this.$el.outerWidth(); - this.$tableHeader.outerWidth(headerWidthStr); - console.log(this.$tableHeader.outerWidth()); - this.$toolbar.outerWidth(headerWidthStr); - console.log(this.$toolbar.outerWidth()); - this.$tableContainer.outerWidth(headerWidthStr); - console.log(this.$tableContainer.outerWidth()); - this.$tableBody.outerWidth(headerWidthStr); - console.log(this.$tableBody.outerWidth()); - this.$pagination.outerWidth(headerWidthStr); - console.log(this.$pagination.outerWidth()); - if(this.$toolbar.closest(".mCSB_container")){ - this.$toolbar.closest(".mCSB_container").outerWidth(headerWidthStr); - console.log(this.$toolbar.closest(".mCSB_container").outerWidth()); - } - $("#bottomDiv .bootstrap-table").mCustomScrollbar("update"); - }else{ - this.$el.outerWidth(containerWidthStr); - console.log(this.$el.outerWidth()); - var headerWidthStr = this.$el.outerWidth(); - this.$tableHeader.outerWidth(containerWidthStr); - console.log(this.$tableHeader.outerWidth()); - this.$toolbar.outerWidth(containerWidthStr); - console.log(this.$toolbar.outerWidth()); - this.$tableContainer.outerWidth(containerWidthStr); - console.log(this.$tableContainer.outerWidth()); - this.$tableBody.outerWidth(containerWidthStr); - console.log(this.$tableBody.outerWidth()); - this.$pagination.outerWidth(containerWidthStr); - console.log(this.$pagination.outerWidth()); - if(this.$toolbar.closest(".mCSB_container")){ - this.$toolbar.closest(".mCSB_container").outerWidth(containerWidthStr); - console.log(this.$toolbar.closest(".mCSB_container").outerWidth()); - } - $("#bottomDiv .bootstrap-table").mCustomScrollbar("update"); - }*/ - - if (this.options.showColumns) { - var $items = this.$toolbar.find('.keep-open input').prop('disabled', false); - - if (needUpdate) { - $items.filter(sprintf('[value="%s"]', index)).prop('checked', checked); - } - - if ($items.filter(':checked').length <= this.options.minimumCountColumns) { - $items.filter(':checked').prop('disabled', true); - } - } - //this.$tableBody.find('table').css('width', this.$el.outerWidth()); - console.log(this.$el.outerWidth()); - }; - - BootstrapTable.prototype.toggleRow = function (index, uniqueId, visible) { - if (index === -1) { - return; - } - - this.$body.find(typeof index !== 'undefined' ? - sprintf('tr[data-index="%s"]', index) : - sprintf('tr[data-uniqueid="%s"]', uniqueId)) - [visible ? 'show' : 'hide'](); - }; - - BootstrapTable.prototype.getVisibleFields = function () { - var that = this, - visibleFields = []; - - $.each(this.header.fields, function (j, field) { - var column = that.columns[getFieldIndex(that.columns, field)]; - - if (!column.visible) { - return; - } - visibleFields.push(field); - }); - return visibleFields; - }; - - // PUBLIC FUNCTION DEFINITION - // ======================= - - BootstrapTable.prototype.resetView = function (params) { - var padding = 0; - - if (params && params.height) { - this.options.height = params.height; - } - - this.$selectAll.prop('checked', this.$selectItem.length > 0 && - this.$selectItem.length === this.$selectItem.filter(':checked').length); - - if (this.options.height) { - var toolbarHeight = getRealHeight(this.$toolbar), - paginationHeight = getRealHeight(this.$pagination), - height = this.options.height - toolbarHeight - paginationHeight; - - this.$tableContainer.css('height', height + 'px'); - } - - if (this.options.cardView) { - // remove the element css - this.$el.css('margin-top', '0'); - this.$tableContainer.css('padding-bottom', '0'); - this.$tableFooter.hide(); - return; - } - - if (this.options.showHeader && this.options.height) { - this.$tableHeader.show(); - this.resetHeader(); - padding += this.$header.outerHeight(); - } else { - this.$tableHeader.hide(); - this.trigger('post-header'); - } - - if (this.options.showFooter) { - this.resetFooter(); - if (this.options.height) { - padding += this.$tableFooter.outerHeight() + 1; - } - } - - // Assign the correct sortable arrow - this.getCaret(); - this.$tableContainer.css('padding-bottom', padding + 'px'); - this.trigger('reset-view'); - }; - - BootstrapTable.prototype.getData = function (useCurrentPage) { - return (this.searchText || !$.isEmptyObject(this.filterColumns) || !$.isEmptyObject(this.filterColumnsPartial)) ? - (useCurrentPage ? this.data.slice(this.pageFrom - 1, this.pageTo) : this.data) : - (useCurrentPage ? this.options.data.slice(this.pageFrom - 1, this.pageTo) : this.options.data); - }; - - BootstrapTable.prototype.load = function (data) { - var fixedScroll = false; - - // #431: support pagination - if (this.options.sidePagination === 'server') { - this.options.totalRows = data.total; - fixedScroll = data.fixedScroll; - data = data[this.options.dataField]; - } else if (!$.isArray(data)) { // support fixedScroll - fixedScroll = data.fixedScroll; - data = data.data; - } - this.initData(data); - this.initSearch(); - this.initPagination(); - this.initBody(fixedScroll); - - }; - - BootstrapTable.prototype.append = function (data) { - this.initData(data, 'append'); - this.initSearch(); - this.initPagination(); - this.initSort(); - this.initBody(true); - }; - - BootstrapTable.prototype.prepend = function (data) { - this.initData(data, 'prepend'); - this.initSearch(); - this.initPagination(); - this.initSort(); - this.initBody(true); - }; - - BootstrapTable.prototype.remove = function (params) { - var len = this.options.data.length, - i, row; - - if (!params.hasOwnProperty('field') || !params.hasOwnProperty('values')) { - return; - } - - for (i = len - 1; i >= 0; i--) { - row = this.options.data[i]; - - if (!row.hasOwnProperty(params.field)) { - continue; - } - if ($.inArray(row[params.field], params.values) !== -1) { - this.options.data.splice(i, 1); - } - } - - if (len === this.options.data.length) { - return; - } - - this.initSearch(); - this.initPagination(); - this.initSort(); - this.initBody(true); - }; - - BootstrapTable.prototype.removeAll = function () { - if (this.options.data.length > 0) { - this.options.data.splice(0, this.options.data.length); - this.initSearch(); - this.initPagination(); - this.initBody(true); - } - }; - - BootstrapTable.prototype.getRowByUniqueId = function (id) { - var uniqueId = this.options.uniqueId, - len = this.options.data.length, - dataRow = null, - i, row, rowUniqueId; - - for (i = len - 1; i >= 0; i--) { - row = this.options.data[i]; - - if (row.hasOwnProperty(uniqueId)) { // uniqueId is a column - rowUniqueId = row[uniqueId]; - } else if(row._data.hasOwnProperty(uniqueId)) { // uniqueId is a row data property - rowUniqueId = row._data[uniqueId]; - } else { - continue; - } - - if (typeof rowUniqueId === 'string') { - id = id.toString(); - } else if (typeof rowUniqueId === 'number') { - if ((Number(rowUniqueId) === rowUniqueId) && (rowUniqueId % 1 === 0)) { - id = parseInt(id); - } else if ((rowUniqueId === Number(rowUniqueId)) && (rowUniqueId !== 0)) { - id = parseFloat(id); - } - } - - if (rowUniqueId === id) { - dataRow = row; - break; - } - } - - return dataRow; - }; - - BootstrapTable.prototype.removeByUniqueId = function (id) { - var len = this.options.data.length, - row = this.getRowByUniqueId(id); - - if (row) { - this.options.data.splice(this.options.data.indexOf(row), 1); - } - - if (len === this.options.data.length) { - return; - } - - this.initSearch(); - this.initPagination(); - this.initBody(true); - }; - - BootstrapTable.prototype.updateByUniqueId = function (params) { - var that = this; - var allParams = $.isArray(params) ? params : [ params ]; - - $.each(allParams, function(i, params) { - var rowId; - - if (!params.hasOwnProperty('id') || !params.hasOwnProperty('row')) { - return; - } - - rowId = $.inArray(that.getRowByUniqueId(params.id), that.options.data); - - if (rowId === -1) { - return; - } - $.extend(that.options.data[rowId], params.row); - }); - - this.initSearch(); - this.initSort(); - this.initBody(true); - }; - - BootstrapTable.prototype.insertRow = function (params) { - if (!params.hasOwnProperty('index') || !params.hasOwnProperty('row')) { - return; - } - this.data.splice(params.index, 0, params.row); - this.initSearch(); - this.initPagination(); - this.initSort(); - this.initBody(true); - }; - - BootstrapTable.prototype.updateRow = function (params) { - var that = this; - var allParams = $.isArray(params) ? params : [ params ]; - - $.each(allParams, function(i, params) { - if (!params.hasOwnProperty('index') || !params.hasOwnProperty('row')) { - return; - } - $.extend(that.options.data[params.index], params.row); - }); - - this.initSearch(); - this.initSort(); - this.initBody(true); - }; - - BootstrapTable.prototype.showRow = function (params) { - if (!params.hasOwnProperty('index') && !params.hasOwnProperty('uniqueId')) { - return; - } - this.toggleRow(params.index, params.uniqueId, true); - }; - - BootstrapTable.prototype.hideRow = function (params) { - if (!params.hasOwnProperty('index') && !params.hasOwnProperty('uniqueId')) { - return; - } - this.toggleRow(params.index, params.uniqueId, false); - }; - - BootstrapTable.prototype.getRowsHidden = function (show) { - var rows = $(this.$body[0]).children().filter(':hidden'), - i = 0; - if (show) { - for (; i < rows.length; i++) { - $(rows[i]).show(); - } - } - return rows; - }; - - BootstrapTable.prototype.mergeCells = function (options) { - var row = options.index, - col = $.inArray(options.field, this.getVisibleFields()), - rowspan = options.rowspan || 1, - colspan = options.colspan || 1, - i, j, - $tr = this.$body.find('>tr'), - $td; - - if (this.options.detailView && !this.options.cardView) { - col += 1; - } - - $td = $tr.eq(row).find('>td').eq(col); - - if (row < 0 || col < 0 || row >= this.data.length) { - return; - } - - for (i = row; i < row + rowspan; i++) { - for (j = col; j < col + colspan; j++) { - $tr.eq(i).find('>td').eq(j).hide(); - } - } - - $td.attr('rowspan', rowspan).attr('colspan', colspan).show(); - }; - - BootstrapTable.prototype.updateCell = function (params) { - if (!params.hasOwnProperty('index') || - !params.hasOwnProperty('field') || - !params.hasOwnProperty('value')) { - return; - } - this.data[params.index][params.field] = params.value; - - if (params.reinit === false) { - return; - } - this.initSort(); - this.initBody(true); - }; - - BootstrapTable.prototype.getOptions = function () { - return this.options; - }; - - BootstrapTable.prototype.getSelections = function () { - var that = this; - - return $.grep(this.options.data, function (row) { - return row[that.header.stateField]; - }); - }; - - BootstrapTable.prototype.getAllSelections = function () { - var that = this; - - return $.grep(this.options.data, function (row) { - return row[that.header.stateField]; - }); - }; - - BootstrapTable.prototype.checkAll = function () { - this.checkAll_(true); - }; - - BootstrapTable.prototype.uncheckAll = function () { - this.checkAll_(false); - }; - - BootstrapTable.prototype.checkInvert = function () { - var that = this; - var rows = that.$selectItem.filter(':enabled'); - var checked = rows.filter(':checked'); - rows.each(function() { - $(this).prop('checked', !$(this).prop('checked')); - }); - that.updateRows(); - that.updateSelected(); - that.trigger('uncheck-some', checked); - checked = that.getSelections(); - that.trigger('check-some', checked); - }; - - BootstrapTable.prototype.checkAll_ = function (checked) { - var rows; - if (!checked) { - rows = this.getSelections(); - } - this.$selectAll.add(this.$selectAll_).prop('checked', checked); - this.$selectItem.filter(':enabled').prop('checked', checked); - this.updateRows(); - if (checked) { - rows = this.getSelections(); - } - this.trigger(checked ? 'check-all' : 'uncheck-all', rows); - }; - - BootstrapTable.prototype.check = function (index) { - this.check_(true, index); - }; - - BootstrapTable.prototype.uncheck = function (index) { - this.check_(false, index); - }; - - BootstrapTable.prototype.check_ = function (checked, index) { - var $el = this.$selectItem.filter(sprintf('[data-index="%s"]', index)).prop('checked', checked); - this.data[index][this.header.stateField] = checked; - this.updateSelected(); - this.trigger(checked ? 'check' : 'uncheck', this.data[index], $el); - }; - - BootstrapTable.prototype.checkBy = function (obj) { - this.checkBy_(true, obj); - }; - - BootstrapTable.prototype.uncheckBy = function (obj) { - this.checkBy_(false, obj); - }; - - BootstrapTable.prototype.checkBy_ = function (checked, obj) { - if (!obj.hasOwnProperty('field') || !obj.hasOwnProperty('values')) { - return; - } - - var that = this, - rows = []; - $.each(this.options.data, function (index, row) { - if (!row.hasOwnProperty(obj.field)) { - return false; - } - if ($.inArray(row[obj.field], obj.values) !== -1) { - var $el = that.$selectItem.filter(':enabled') - .filter(sprintf('[data-index="%s"]', index)).prop('checked', checked); - row[that.header.stateField] = checked; - rows.push(row); - that.trigger(checked ? 'check' : 'uncheck', row, $el); - } - }); - this.updateSelected(); - this.trigger(checked ? 'check-some' : 'uncheck-some', rows); - }; - - BootstrapTable.prototype.destroy = function () { - this.$el.insertBefore(this.$container); - $(this.options.toolbar).insertBefore(this.$el); - this.$container.next().remove(); - this.$container.remove(); - this.$el.html(this.$el_.html()) - .css('margin-top', '0') - .attr('class', this.$el_.attr('class') || ''); // reset the class - }; - - BootstrapTable.prototype.showLoading = function () { - this.$tableLoading.show(); - }; - - BootstrapTable.prototype.hideLoading = function () { - this.$tableLoading.hide(); - }; - - BootstrapTable.prototype.togglePagination = function () { - this.options.pagination = !this.options.pagination; - var button = this.$toolbar.find('button[name="paginationSwitch"] i'); - if (this.options.pagination) { - button.attr("class", this.options.iconsPrefix + " " + this.options.icons.paginationSwitchDown); - } else { - button.attr("class", this.options.iconsPrefix + " " + this.options.icons.paginationSwitchUp); - } - this.updatePagination(); - }; - - BootstrapTable.prototype.refresh = function (params) { - if (params && params.url) { - this.options.pageNumber = 1; - } - this.initServer(params && params.silent, - params && params.query, params && params.url); - this.trigger('refresh', params); - }; - - BootstrapTable.prototype.resetWidth = function () { - if (this.options.showHeader && this.options.height) { - this.fitHeader(); - } - if (this.options.showFooter) { - this.fitFooter(); - } - }; - - BootstrapTable.prototype.showColumn = function (field) { - this.toggleColumn(getFieldIndex(this.columns, field), true, true); - }; - - BootstrapTable.prototype.hideColumn = function (field) { - this.toggleColumn(getFieldIndex(this.columns, field), false, true); - }; - - BootstrapTable.prototype.getHiddenColumns = function () { - return $.grep(this.columns, function (column) { - return !column.visible; - }); - }; - - BootstrapTable.prototype.getVisibleColumns = function () { - return $.grep(this.columns, function (column) { - return column.visible; - }); - }; - - BootstrapTable.prototype.toggleAllColumns = function (visible) { - $.each(this.columns, function (i, column) { - this.columns[i].visible = visible; - }); - - this.initHeader(); - this.initSearch(); - this.initPagination(); - this.initBody(); - if (this.options.showColumns) { - var $items = this.$toolbar.find('.keep-open input').prop('disabled', false); - - if ($items.filter(':checked').length <= this.options.minimumCountColumns) { - $items.filter(':checked').prop('disabled', true); - } - } - }; - - BootstrapTable.prototype.showAllColumns = function () { - this.toggleAllColumns(true); - }; - - BootstrapTable.prototype.hideAllColumns = function () { - this.toggleAllColumns(false); - }; - - BootstrapTable.prototype.filterBy = function (columns) { - this.filterColumns = $.isEmptyObject(columns) ? {} : columns; - this.options.pageNumber = 1; - this.initSearch(); - this.updatePagination(); - }; - - BootstrapTable.prototype.scrollTo = function (value) { - if (typeof value === 'string') { - value = value === 'bottom' ? this.$tableBody[0].scrollHeight : 0; - } - if (typeof value === 'number') { - this.$tableBody.scrollTop(value); - } - if (typeof value === 'undefined') { - return this.$tableBody.scrollTop(); - } - }; - - BootstrapTable.prototype.getScrollPosition = function () { - return this.scrollTo(); - }; - - BootstrapTable.prototype.selectPage = function (page) { - if (page > 0 && page <= this.options.totalPages) { - this.options.pageNumber = page; - this.updatePagination(); - } - }; - - BootstrapTable.prototype.prevPage = function () { - if (this.options.pageNumber > 1) { - this.options.pageNumber--; - this.updatePagination(); - } - }; - - BootstrapTable.prototype.nextPage = function () { - if (this.options.pageNumber < this.options.totalPages) { - this.options.pageNumber++; - this.updatePagination(); - } - }; - - BootstrapTable.prototype.toggleView = function () { - this.options.cardView = !this.options.cardView; - this.initHeader(); - // Fixed remove toolbar when click cardView button. - //that.initToolbar(); - this.initBody(); - this.trigger('toggle', this.options.cardView); - }; - - BootstrapTable.prototype.refreshOptions = function (options) { - //If the objects are equivalent then avoid the call of destroy / init methods - if (compareObjects(this.options, options, true)) { - return; - } - this.options = $.extend(this.options, options); - this.trigger('refresh-options', this.options); - this.destroy(); - this.init(); - }; - - BootstrapTable.prototype.resetSearch = function (text) { - var $search = this.$toolbar.find('.search input'); - $search.val(text || ''); - this.onSearch({currentTarget: $search}); - }; - - BootstrapTable.prototype.expandRow_ = function (expand, index) { - var $tr = this.$body.find(sprintf('> tr[data-index="%s"]', index)); - if ($tr.next().is('tr.detail-view') === (expand ? false : true)) { - $tr.find('> td > .detail-icon').click(); - } - }; - - BootstrapTable.prototype.expandRow = function (index) { - this.expandRow_(true, index); - }; - - BootstrapTable.prototype.collapseRow = function (index) { - this.expandRow_(false, index); - }; - - BootstrapTable.prototype.expandAllRows = function (isSubTable) { - if (isSubTable) { - var $tr = this.$body.find(sprintf('> tr[data-index="%s"]', 0)), - that = this, - detailIcon = null, - executeInterval = false, - idInterval = -1; - - if (!$tr.next().is('tr.detail-view')) { - $tr.find('> td > .detail-icon').click(); - executeInterval = true; - } else if (!$tr.next().next().is('tr.detail-view')) { - $tr.next().find(".detail-icon").click(); - executeInterval = true; - } - - if (executeInterval) { - try { - idInterval = setInterval(function () { - detailIcon = that.$body.find("tr.detail-view").last().find(".detail-icon"); - if (detailIcon.length > 0) { - detailIcon.click(); - } else { - clearInterval(idInterval); - } - }, 1); - } catch (ex) { - clearInterval(idInterval); - } - } - } else { - var trs = this.$body.children(); - for (var i = 0; i < trs.length; i++) { - this.expandRow_(true, $(trs[i]).data("index")); - } - } - }; - - BootstrapTable.prototype.collapseAllRows = function (isSubTable) { - if (isSubTable) { - this.expandRow_(false, 0); - } else { - var trs = this.$body.children(); - for (var i = 0; i < trs.length; i++) { - this.expandRow_(false, $(trs[i]).data("index")); - } - } - }; - - BootstrapTable.prototype.updateFormatText = function (name, text) { - if (this.options[sprintf('format%s', name)]) { - if (typeof text === 'string') { - this.options[sprintf('format%s', name)] = function () { - return text; - }; - } else if (typeof text === 'function') { - this.options[sprintf('format%s', name)] = text; - } - } - this.initToolbar(); - this.initPagination(); - this.initBody(); - }; - - // BOOTSTRAP TABLE PLUGIN DEFINITION - // ======================= - - var allowedMethods = [ - 'getOptions', - 'getSelections', 'getAllSelections', 'getData', - 'load', 'append', 'prepend', 'remove', 'removeAll', - 'insertRow', 'updateRow', 'updateCell', 'updateByUniqueId', 'removeByUniqueId', - 'getRowByUniqueId', 'showRow', 'hideRow', 'getRowsHidden', - 'mergeCells', - 'checkAll', 'uncheckAll', 'checkInvert', - 'check', 'uncheck', - 'checkBy', 'uncheckBy', - 'refresh', - 'resetView', - 'resetWidth', - 'destroy', - 'showLoading', 'hideLoading', - 'showColumn', 'hideColumn', 'getHiddenColumns', 'getVisibleColumns', - 'showAllColumns', 'hideAllColumns', - 'filterBy', - 'scrollTo', - 'getScrollPosition', - 'selectPage', 'prevPage', 'nextPage', - 'togglePagination', - 'toggleView', - 'refreshOptions', - 'resetSearch', - 'expandRow', 'collapseRow', 'expandAllRows', 'collapseAllRows', - 'updateFormatText' - ]; - - $.fn.bootstrapTable = function (option) { - var value, - args = Array.prototype.slice.call(arguments, 1); - - this.each(function () { - var $this = $(this), - data = $this.data('bootstrap.table'), - options = $.extend({}, BootstrapTable.DEFAULTS, $this.data(), - typeof option === 'object' && option); - - if (typeof option === 'string') { - if ($.inArray(option, allowedMethods) < 0) { - throw new Error("Unknown method: " + option); - } - - if (!data) { - return; - } - - value = data[option].apply(data, args); - - if (option === 'destroy') { - $this.removeData('bootstrap.table'); - } - } - - if (!data) { - $this.data('bootstrap.table', (data = new BootstrapTable(this, options))); - } - }); - - return typeof value === 'undefined' ? this : value; - }; - - $.fn.bootstrapTable.Constructor = BootstrapTable; - $.fn.bootstrapTable.defaults = BootstrapTable.DEFAULTS; - $.fn.bootstrapTable.columnDefaults = BootstrapTable.COLUMN_DEFAULTS; - $.fn.bootstrapTable.locales = BootstrapTable.LOCALES; - $.fn.bootstrapTable.methods = allowedMethods; - $.fn.bootstrapTable.utils = { - sprintf: sprintf, - getFieldIndex: getFieldIndex, - compareObjects: compareObjects, - calculateObjectValue: calculateObjectValue, - getItemField: getItemField, - objectKeys: objectKeys, - isIEBrowser: isIEBrowser - }; - - // BOOTSTRAP TABLE INIT - // ======================= - - $(function () { - $('[data-toggle="table"]').bootstrapTable(); - }); -})(jQuery); \ No newline at end of file diff --git a/hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap-table_scroll.js b/hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap-table_scroll.js deleted file mode 100644 index fdd40e0..0000000 --- a/hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap-table_scroll.js +++ /dev/null @@ -1,3196 +0,0 @@ -/** - * @author zhixin wen - * version: 1.12.1 - * https://github.com/wenzhixin/bootstrap-table/ - */ - -($ => { - // TOOLS DEFINITION - // ====================== - - let bootstrapVersion = 3 - try { - bootstrapVersion = parseInt($.fn.dropdown.Constructor.VERSION, 10) - } catch (e) {} - - const bootstrap = { - 3: { - iconsPrefix: 'glyphicon', - icons: { - paginationSwitchDown: 'glyphicon-collapse-down icon-chevron-down', - paginationSwitchUp: 'glyphicon-collapse-up icon-chevron-up', - refresh: 'glyphicon-refresh icon-refresh', - toggleOff: 'glyphicon-list-alt icon-list-alt', - toggleOn: 'glyphicon-list-alt icon-list-alt', - columns: 'glyphicon-th icon-th', - detailOpen: 'glyphicon-plus icon-plus', - detailClose: 'glyphicon-minus icon-minus', - fullscreen: 'glyphicon-fullscreen' - }, - classes: { - buttons: 'default', - pull: 'pull' - }, - html: { - toobarDropdow: [''], - toobarDropdowItem: '
  • ', - pageDropdown: [''], - pageDropdownItem: '' - } - }, - 4: { - iconsPrefix: 'fa', - icons: { - paginationSwitchDown: 'fa-toggle-down', - paginationSwitchUp: 'fa-toggle-up', - refresh: 'fa-refresh', - toggleOff: 'fa-toggle-off', - toggleOn: 'fa-toggle-on', - columns: 'fa-th-list', - detailOpen: 'fa-plus', - detailClose: 'fa-minus', - fullscreen: 'fa-arrows-alt' - }, - classes: { - buttons: 'secondary', - pull: 'float' - }, - html: { - toobarDropdow: [''], - toobarDropdowItem: '', - pageDropdown: [''], - pageDropdownItem: '%s' - } - } - }[bootstrapVersion] - - const Utils = { - bootstrapVersion, - - // it only does '%s', and return '' when arguments are undefined - sprintf (str, ...args) { - let flag = true - let i = 0 - - str = str.replace(/%s/g, () => { - const arg = args[i++] - - if (typeof arg === 'undefined') { - flag = false - return '' - } - return arg - }) - return flag ? str : '' - }, - - getFieldTitle (list, value) { - for (let item of list) { - if (item.field === value) { - return item.title - } - } - return '' - }, - - setFieldIndex (columns) { - let totalCol = 0 - const flag = [] - - for (const column of columns[0]) { - totalCol += column.colspan || 1 - } - - for (let i = 0; i < columns.length; i++) { - flag[i] = [] - for (let j = 0; j < totalCol; j++) { - flag[i][j] = false - } - } - - for (let i = 0; i < columns.length; i++) { - for (let j = 0; j < columns[i].length; j++) { - const r = columns[i][j] - const rowspan = r.rowspan || 1 - const colspan = r.colspan || 1 - const index = flag[i].indexOf(false) - - if (colspan === 1) { - r.fieldIndex = index - // when field is undefined, use index instead - if (typeof r.field === 'undefined') { - r.field = index - } - } - - for (let k = 0; k < rowspan; k++) { - flag[i + k][index] = true - } - for (let k = 0; k < colspan; k++) { - flag[i][index + k] = true - } - } - } - }, - - getScrollBarWidth () { - if (this.cachedWidth === null) { - /*const $inner = $('
    ').addClass('fixed-table-scroll-inner') - const $outer = $('
    ').addClass('fixed-table-scroll-outer')*/ - const $inner = $('

    ') - const $outer = $('

    ') - let w1 - let w2 - - $outer.append($inner) - $('body').append($outer) - - /*w1 = $inner[0].offsetWidth - $outer.css('overflow', 'scroll') - w2 = $inner[0].offsetWidth*/ - w1 = $('.calcscrollout')[0].offsetWidth; - w2 = $('.calcscrollin')[0].offsetWidth; - - if (w1 === w2) { - /*w2 = $outer[0].clientWidth*/ - w2 = $('.calcscrollin')[0].clientWidth; - } - - $outer.remove() - this.cachedWidth = w1 - w2 - } - return this.cachedWidth - }, - - calculateObjectValue (self, name, args, defaultValue) { - let func = name - - if (typeof name === 'string') { - // support obj.func1.func2 - const names = name.split('.') - - if (names.length > 1) { - func = window - for (const f of name) { - func = func[f] - } - } else { - func = window[name] - } - } - - if (typeof func === 'object') { - return func - } - - if (typeof func === 'function') { - return func.apply(self, args || []) - } - - if ( - !func && - typeof name === 'string' && - this.sprintf(name, ...args) - ) { - return this.sprintf(name, ...args) - } - - return defaultValue - }, - - compareObjects (objectA, objectB, compareLength) { - const aKeys = Object.keys(objectA) - const bKeys = Object.keys(objectB) - - if (compareLength && aKeys.length !== bKeys.length) { - return false - } - - for (const key of aKeys) { - if (bKeys.includes(key) && objectA[key] !== objectB[key]) { - return false - } - } - - return true - }, - - escapeHTML (text) { - if (typeof text === 'string') { - return text - .replace(/&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"') - .replace(/'/g, ''') - .replace(/`/g, '`') - } - return text - }, - - getRealDataAttr (dataAttr) { - for (const attr in dataAttr) { - const auxAttr = attr.split(/(?=[A-Z])/).join('-').toLowerCase() - if (auxAttr !== attr) { - dataAttr[auxAttr] = dataAttr[attr] - delete dataAttr[attr] - } - } - return dataAttr - }, - - getItemField (item, field, escape) { - let value = item - - if (typeof field !== 'string' || item.hasOwnProperty(field)) { - return escape ? this.escapeHTML(item[field]) : item[field] - } - - const props = field.split('.') - for (const p of props) { - value = value && value[p] - } - return escape ? this.escapeHTML(value) : value - }, - - isIEBrowser () { - return navigator.userAgent.includes('MSIE ') || - /Trident.*rv:11\./.test(navigator.userAgent) - } - } - - // BOOTSTRAP TABLE CLASS DEFINITION - // ====================== - - const DEFAULTS = { - classes: 'table table-hover', - locale: undefined, - height: undefined, - undefinedText: '-', - sortName: undefined, - sortOrder: 'asc', - sortStable: false, - sortClass: undefined, - rememberOrder: false, - striped: false, - columns: [ - [] - ], - data: [], - totalField: 'total', - dataField: 'rows', - method: 'get', - url: undefined, - ajax: undefined, - cache: true, - contentType: 'application/json', - dataType: 'json', - ajaxOptions: {}, - queryParams (params) { - return params - }, - queryParamsType: 'limit', // 'limit', undefined - responseHandler (res) { - return res - }, - pagination: false, - onlyInfoPagination: false, - paginationLoop: true, - sidePagination: 'client', // client or server - totalRows: 0, // server side need to set - pageNumber: 1, - pageSize: 10, - pageList: [10, 25, 50, 100], - paginationHAlign: 'right', // right, left - paginationVAlign: 'bottom', // bottom, top, both - paginationDetailHAlign: 'left', // right, left - paginationPreText: '‹', - paginationNextText: '›', - search: false, - searchOnEnterKey: false, - strictSearch: false, - searchAlign: 'right', - selectItemName: 'btSelectItem', - showHeader: true, - showFooter: false, - showColumns: false, - showPaginationSwitch: false, - showRefresh: false, - showToggle: false, - showFullscreen: false, - smartDisplay: true, - escape: false, - minimumCountColumns: 1, - idField: undefined, - uniqueId: undefined, - cardView: false, - detailView: false, - detailFormatter (index, row) { - return '' - }, - detailFilter (index, row) { - return true - }, - trimOnSearch: true, - clickToSelect: false, - singleSelect: false, - toolbar: undefined, - toolbarAlign: 'left', - buttonsToolbar: undefined, - buttonsAlign: 'right', - checkboxHeader: true, - sortable: true, - silentSort: true, - maintainSelected: false, - searchTimeOut: 500, - searchText: '', - iconSize: undefined, - buttonsClass: bootstrap.classes.buttons, - iconsPrefix: bootstrap.iconsPrefix, // glyphicon or fa(font-awesome) - icons: bootstrap.icons, - customSearch: $.noop, - customSort: $.noop, - ignoreClickToSelectOn (element) { - return ['A', 'BUTTON'].includes(element.tagName) - }, - rowStyle (row, index) { - return {} - }, - rowAttributes (row, index) { - return {} - }, - footerStyle (row, index) { - return {} - }, - onAll (name, args) { - return false - }, - onClickCell (field, value, row, $element) { - return false - }, - onDblClickCell (field, value, row, $element) { - return false - }, - onClickRow (item, $element) { - return false - }, - onDblClickRow (item, $element) { - return false - }, - onSort (name, order) { - return false - }, - onCheck (row) { - return false - }, - onUncheck (row) { - return false - }, - onCheckAll (rows) { - return false - }, - onUncheckAll (rows) { - return false - }, - onCheckSome (rows) { - return false - }, - onUncheckSome (rows) { - return false - }, - onLoadSuccess (data) { - return false - }, - onLoadError (status) { - return false - }, - onColumnSwitch (field, checked) { - return false - }, - onPageChange (number, size) { - return false - }, - onSearch (text) { - return false - }, - onToggle (cardView) { - return false - }, - onPreBody (data) { - return false - }, - onPostBody () { - return false - }, - onPostHeader () { - return false - }, - onExpandRow (index, row, $detail) { - return false - }, - onCollapseRow (index, row) { - return false - }, - onRefreshOptions (options) { - return false - }, - onRefresh (params) { - return false - }, - onResetView () { - return false - }, - onScrollBody () { - return false - } - } - - const LOCALES = {} - LOCALES['en-US'] = LOCALES.en = { - formatLoadingMessage () { - return 'Loading, please wait...' - }, - formatRecordsPerPage (pageNumber) { - return Utils.sprintf('%s rows per page', pageNumber) - }, - formatShowingRows (pageFrom, pageTo, totalRows) { - return Utils.sprintf('Showing %s to %s of %s rows', pageFrom, pageTo, totalRows) - }, - formatDetailPagination (totalRows) { - return Utils.sprintf('Showing %s rows', totalRows) - }, - formatSearch () { - return 'Search' - }, - formatNoMatches () { - return 'No matching records found' - }, - formatPaginationSwitch () { - return 'Hide/Show pagination' - }, - formatRefresh () { - return 'Refresh' - }, - formatToggle () { - return 'Toggle' - }, - formatFullscreen () { - return 'Fullscreen' - }, - formatColumns () { - return 'Columns' - }, - formatAllRows () { - return 'All' - } - } - - $.extend(DEFAULTS, LOCALES['en-US']) - - const COLUMN_DEFAULTS = { - radio: false, - checkbox: false, - checkboxEnabled: true, - field: undefined, - title: undefined, - titleTooltip: undefined, - 'class': undefined, - align: undefined, // left, right, center - halign: undefined, // left, right, center - falign: undefined, // left, right, center - valign: undefined, // top, middle, bottom - width: undefined, - sortable: false, - order: 'asc', // asc, desc - visible: true, - switchable: true, - clickToSelect: true, - formatter: undefined, - footerFormatter: undefined, - events: undefined, - sorter: undefined, - sortName: undefined, - cellStyle: undefined, - searchable: true, - searchFormatter: true, - cardVisible: true, - escape: false, - showSelectTitle: false - } - - const EVENTS = { - 'all.bs.table': 'onAll', - 'click-cell.bs.table': 'onClickCell', - 'dbl-click-cell.bs.table': 'onDblClickCell', - 'click-row.bs.table': 'onClickRow', - 'dbl-click-row.bs.table': 'onDblClickRow', - 'sort.bs.table': 'onSort', - 'check.bs.table': 'onCheck', - 'uncheck.bs.table': 'onUncheck', - 'check-all.bs.table': 'onCheckAll', - 'uncheck-all.bs.table': 'onUncheckAll', - 'check-some.bs.table': 'onCheckSome', - 'uncheck-some.bs.table': 'onUncheckSome', - 'load-success.bs.table': 'onLoadSuccess', - 'load-error.bs.table': 'onLoadError', - 'column-switch.bs.table': 'onColumnSwitch', - 'page-change.bs.table': 'onPageChange', - 'search.bs.table': 'onSearch', - 'toggle.bs.table': 'onToggle', - 'pre-body.bs.table': 'onPreBody', - 'post-body.bs.table': 'onPostBody', - 'post-header.bs.table': 'onPostHeader', - 'expand-row.bs.table': 'onExpandRow', - 'collapse-row.bs.table': 'onCollapseRow', - 'refresh-options.bs.table': 'onRefreshOptions', - 'reset-view.bs.table': 'onResetView', - 'refresh.bs.table': 'onRefresh', - 'scroll-body.bs.table': 'onScrollBody' - } - - class BootstrapTable { - constructor (el, options) { - this.options = options - this.$el = $(el) - this.$el_ = this.$el.clone() - this.timeoutId_ = 0 - this.timeoutFooter_ = 0 - - this.init() - } - - init () { - this.initLocale() - this.initContainer() - this.initTable() - this.initHeader() - this.initData() - this.initHiddenRows() - this.initFooter() - this.initToolbar() - this.initPagination() - this.initBody() - this.initSearchText() - this.initServer() - } - - initLocale () { - if (this.options.locale) { - const locales = $.fn.bootstrapTable.locales - const parts = this.options.locale.split(/-|_/) - parts[0].toLowerCase() - if (parts[1]) { - parts[1].toUpperCase() - } - if (locales[this.options.locale]) { - // locale as requested - $.extend(this.options, locales[this.options.locale]) - } else if ($.fn.bootstrapTable.locales[parts.join('-')]) { - // locale with sep set to - (in case original was specified with _) - $.extend(this.options, locales[parts.join('-')]) - } else if ($.fn.bootstrapTable.locales[parts[0]]) { - // short locale language code (i.e. 'en') - $.extend(this.options, locales[parts[0]]) - } - } - } - - initContainer () { - const topPagination = ['top', 'both'].includes(this.options.paginationVAlign) - ? '
    ' : '' - const bottomPagination = ['bottom', 'both'].includes(this.options.paginationVAlign) - ? '
    ' : '' - - this.$container = $(` -
    -
    - ${topPagination} -
    -
    -
    -
    - ${this.options.formatLoadingMessage()} -
    -
    - -
    - ${bottomPagination} -
    - `) - - this.$container.insertAfter(this.$el) - this.$tableContainer = this.$container.find('.fixed-table-container') - this.$tableHeader = this.$container.find('.fixed-table-header') - this.$tableBody = this.$container.find('.fixed-table-body') - this.$tableLoading = this.$container.find('.fixed-table-loading') - this.$tableFooter = this.$container.find('.fixed-table-footer') - // checking if custom table-toolbar exists or not - if (this.options.buttonsToolbar) { - this.$toolbar = $('body').find(this.options.buttonsToolbar) - } else { - this.$toolbar = this.$container.find('.fixed-table-toolbar') - } - this.$pagination = this.$container.find('.fixed-table-pagination') - - this.$tableBody.append(this.$el) - this.$container.after('
    ') - - this.$el.addClass(this.options.classes) - if (this.options.striped) { - this.$el.addClass('table-striped') - } - if (this.options.classes.split(' ').includes('table-no-bordered')) { - this.$tableContainer.addClass('table-no-bordered') - } - } - - initTable () { - const columns = [] - const data = [] - - this.$header = this.$el.find('>thead') - if (!this.$header.length) { - this.$header = $('').appendTo(this.$el) - } - this.$header.find('tr').each((i, el) => { - const column = [] - - $(el).find('th').each((i, el) => { - // #2014: getFieldIndex and elsewhere assume this is string, causes issues if not - if (typeof $(el).data('field') !== 'undefined') { - $(el).data('field', `${$(el).data('field')}`) - } - column.push($.extend({}, { - title: $(el).html(), - 'class': $(el).attr('class'), - titleTooltip: $(el).attr('title'), - rowspan: $(el).attr('rowspan') ? +$(el).attr('rowspan') : undefined, - colspan: $(el).attr('colspan') ? +$(el).attr('colspan') : undefined - }, $(el).data())) - }) - columns.push(column) - }) - - if (!Array.isArray(this.options.columns[0])) { - this.options.columns = [this.options.columns] - } - - this.options.columns = $.extend(true, [], columns, this.options.columns) - this.columns = [] - this.fieldsColumnsIndex = [] - - Utils.setFieldIndex(this.options.columns) - - this.options.columns.forEach((columns, i) => { - columns.forEach((column, j) => { - column = $.extend({}, BootstrapTable.COLUMN_DEFAULTS, column) - - if (typeof column.fieldIndex !== 'undefined') { - this.columns[column.fieldIndex] = column - this.fieldsColumnsIndex[column.field] = column.fieldIndex - } - - this.options.columns[i][j] = column - }) - }) - - // if options.data is setting, do not process tbody data - if (this.options.data.length) { - return - } - - const m = [] - this.$el.find('>tbody>tr').each((y, el) => { - const row = {} - - // save tr's id, class and data-* attributes - row._id = $(el).attr('id') - row._class = $(el).attr('class') - row._data = Utils.getRealDataAttr($(el).data()) - - $(el).find('>td').each((x, el) => { - const cspan = +$(el).attr('colspan') || 1 - const rspan = +$(el).attr('rowspan') || 1 - - // skip already occupied cells in current row - for (; m[y] && m[y][x]; x++) {} - - // mark matrix elements occupied by current cell with true - for (let tx = x; tx < x + cspan; tx++) { - for (let ty = y; ty < y + rspan; ty++) { - if (!m[ty]) { // fill missing rows - m[ty] = [] - } - m[ty][tx] = true - } - } - - const field = this.columns[x].field - - row[field] = $(el).html() - // save td's id, class and data-* attributes - row[`_${field}_id`] = $(el).attr('id') - row[`_${field}_class`] = $(el).attr('class') - row[`_${field}_rowspan`] = $(el).attr('rowspan') - row[`_${field}_colspan`] = $(el).attr('colspan') - row[`_${field}_title`] = $(el).attr('title') - row[`_${field}_data`] = Utils.getRealDataAttr($(el).data()) - }) - data.push(row) - }) - this.options.data = data - if (data.length) { - this.fromHtml = true - } - } - - initHeader () { - const visibleColumns = {} - const html = [] - - this.header = { - fields: [], - styles: [], - classes: [], - formatters: [], - events: [], - sorters: [], - sortNames: [], - cellStyles: [], - searchables: [] - } - - this.options.columns.forEach((columns, i) => { - html.push('') - - if (i === 0 && !this.options.cardView && this.options.detailView) { - html.push(` -
    - - `) - } - - columns.forEach((column, j) => { - let text = '' - - let halign = '' // header align style - - let align = '' // body align style - - let style = '' - const class_ = Utils.sprintf(' class="%s"', column['class']) - let unitWidth = 'px' - let width = column.width - - if (column.width !== undefined && (!this.options.cardView)) { - if (typeof column.width === 'string') { - if (column.width.includes('%')) { - unitWidth = '%' - } - } - } - if (column.width && typeof column.width === 'string') { - width = column.width.replace('%', '').replace('px', '') - } - - halign = Utils.sprintf('text-align: %s; ', column.halign ? column.halign : column.align) - align = Utils.sprintf('text-align: %s; ', column.align) - style = Utils.sprintf('vertical-align: %s; ', column.valign) - style += Utils.sprintf('width: %s; ', (column.checkbox || column.radio) && !width - ? (!column.showSelectTitle ? '36px' : undefined) - : (width ? width + unitWidth : undefined)) - - if (typeof column.fieldIndex !== 'undefined') { - this.header.fields[column.fieldIndex] = column.field - this.header.styles[column.fieldIndex] = align + style - this.header.classes[column.fieldIndex] = class_ - this.header.formatters[column.fieldIndex] = column.formatter - this.header.events[column.fieldIndex] = column.events - this.header.sorters[column.fieldIndex] = column.sorter - this.header.sortNames[column.fieldIndex] = column.sortName - this.header.cellStyles[column.fieldIndex] = column.cellStyle - this.header.searchables[column.fieldIndex] = column.searchable - - if (!column.visible) { - return - } - - if (this.options.cardView && (!column.cardVisible)) { - return - } - - visibleColumns[column.field] = column - } - - html.push(`') - - html.push(Utils.sprintf('
    ', this.options.sortable && column.sortable - ? 'sortable both' : '')) - - text = this.options.escape ? Utils.escapeHTML(column.title) : column.title - - const title = text - if (column.checkbox) { - text = '' - if (!this.options.singleSelect && this.options.checkboxHeader) { - text = '' - } - this.header.stateField = column.field - } - if (column.radio) { - text = '' - this.header.stateField = column.field - this.options.singleSelect = true - } - if (!text && column.showSelectTitle) { - text += title - } - - html.push(text) - html.push('
    ') - html.push('
    ') - html.push('
    ') - html.push('') - }) - html.push('') - }) - - this.$header.html(html.join('')) - this.$header.find('th[data-field]').each((i, el) => { - $(el).data(visibleColumns[$(el).data('field')]) - }) - this.$container.off('click', '.th-inner').on('click', '.th-inner', e => { - const $this = $(e.currentTarget) - - if (this.options.detailView && !$this.parent().hasClass('bs-checkbox')) { - if ($this.closest('.bootstrap-table')[0] !== this.$container[0]) { - return false - } - } - - if (this.options.sortable && $this.parent().data().sortable) { - this.onSort(e) - } - }) - - this.$header.children().children().off('keypress').on('keypress', e => { - if (this.options.sortable && $(e.currentTarget).data().sortable) { - const code = e.keyCode || e.which - if (code === 13) { // Enter keycode - this.onSort(e) - } - } - }) - - $(window).off('resize.bootstrap-table') - if (!this.options.showHeader || this.options.cardView) { - this.$header.hide() - this.$tableHeader.hide() - this.$tableLoading.css('top', 0) - } else { - this.$header.show() - this.$tableHeader.show() - this.$tableLoading.css('top', this.$header.outerHeight() + 1) - // Assign the correct sortable arrow - this.getCaret() - $(window).on('resize.bootstrap-table', $.proxy(this.resetWidth, this)) - } - - this.$selectAll = this.$header.find('[name="btSelectAll"]') - this.$selectAll.off('click').on('click', e => { - const checked = $(e.currentTarget).prop('checked') - this[checked ? 'checkAll' : 'uncheckAll']() - this.updateSelected() - }) - } - - initFooter () { - if (!this.options.showFooter || this.options.cardView) { - this.$tableFooter.hide() - } else { - this.$tableFooter.show() - } - } - - /** - * @param data - * @param type: append / prepend - */ - initData (data, type) { - if (type === 'append') { - this.options.data = this.options.data.concat(data) - } else if (type === 'prepend') { - this.options.data = [].concat(data).concat(this.options.data) - } else { - this.options.data = data || this.options.data - } - - this.data = this.options.data - - if (this.options.sidePagination === 'server') { - return - } - this.initSort() - } - - initSort () { - let name = this.options.sortName - const order = this.options.sortOrder === 'desc' ? -1 : 1 - const index = this.header.fields.indexOf(this.options.sortName) - let timeoutId = 0 - - if (this.options.customSort !== $.noop) { - this.options.customSort.apply(this, [this.options.sortName, this.options.sortOrder]) - return - } - - if (index !== -1) { - if (this.options.sortStable) { - this.data.forEach((row, i) => { - row._position = i - }) - } - - this.data.sort((a, b) => { - if (this.header.sortNames[index]) { - name = this.header.sortNames[index] - } - let aa = Utils.getItemField(a, name, this.options.escape) - let bb = Utils.getItemField(b, name, this.options.escape) - const value = Utils.calculateObjectValue(this.header, this.header.sorters[index], [aa, bb, a, b]) - - if (value !== undefined) { - if (this.options.sortStable && value === 0) { - return a._position - b._position - } - return order * value - } - - // Fix #161: undefined or null string sort bug. - if (aa === undefined || aa === null) { - aa = '' - } - if (bb === undefined || bb === null) { - bb = '' - } - - if (this.options.sortStable && aa === bb) { - aa = a._position - bb = b._position - return a._position - b._position - } - - // IF both values are numeric, do a numeric comparison - if ($.isNumeric(aa) && $.isNumeric(bb)) { - // Convert numerical values form string to float. - aa = parseFloat(aa) - bb = parseFloat(bb) - if (aa < bb) { - return order * -1 - } - return order - } - - if (aa === bb) { - return 0 - } - - // If value is not a string, convert to string - if (typeof aa !== 'string') { - aa = aa.toString() - } - - if (aa.localeCompare(bb) === -1) { - return order * -1 - } - - return order - }) - - if (this.options.sortClass !== undefined) { - clearTimeout(timeoutId) - timeoutId = setTimeout(() => { - this.$el.removeClass(this.options.sortClass) - const index = this.$header.find(Utils.sprintf('[data-field="%s"]', - this.options.sortName).index() + 1) - this.$el.find(Utils.sprintf('tr td:nth-child(%s)', index)) - .addClass(this.options.sortClass) - }, 250) - } - } - } - - onSort ({type, currentTarget}) { - const $this = type === 'keypress' ? $(currentTarget) : $(currentTarget).parent() - const $this_ = this.$header.find('th').eq($this.index()) - - this.$header.add(this.$header_).find('span.order').remove() - - if (this.options.sortName === $this.data('field')) { - this.options.sortOrder = this.options.sortOrder === 'asc' ? 'desc' : 'asc' - } else { - this.options.sortName = $this.data('field') - if (this.options.rememberOrder) { - this.options.sortOrder = $this.data('order') === 'asc' ? 'desc' : 'asc' - } else { - this.options.sortOrder = this.columns[this.fieldsColumnsIndex[$this.data('field')]].order - } - } - this.trigger('sort', this.options.sortName, this.options.sortOrder) - - $this.add($this_).data('order', this.options.sortOrder) - - // Assign the correct sortable arrow - this.getCaret() - - if (this.options.sidePagination === 'server') { - this.initServer(this.options.silentSort) - return - } - - this.initSort() - this.initBody() - } - - initToolbar () { - let html = [] - let timeoutId = 0 - let $keepOpen - let $search - let switchableCount = 0 - - if (this.$toolbar.find('.bs-bars').children().length) { - $('body').append($(this.options.toolbar)) - } - this.$toolbar.html('') - - if (typeof this.options.toolbar === 'string' || typeof this.options.toolbar === 'object') { - $(Utils.sprintf('
    ', bootstrap.classes.pull, this.options.toolbarAlign)) - .appendTo(this.$toolbar) - .append($(this.options.toolbar)) - } - - // showColumns, showToggle, showRefresh - html = [Utils.sprintf('
    ', - this.options.buttonsAlign, bootstrap.classes.pull, this.options.buttonsAlign)] - - if (typeof this.options.icons === 'string') { - this.options.icons = Utils.calculateObjectValue(null, this.options.icons) - } - - if (this.options.showPaginationSwitch) { - html.push(Utils.sprintf(`') - } - - if (this.options.showFullscreen) { - this.$toolbar.find('button[name="fullscreen"]') - .off('click').on('click', $.proxy(this.toggleFullscreen, this)) - } - - if (this.options.showRefresh) { - html.push(Utils.sprintf(`') - } - - if (this.options.showToggle) { - html.push(Utils.sprintf(`') - } - - if (this.options.showFullscreen) { - html.push(Utils.sprintf(`') - } - - if (this.options.showColumns) { - html.push(Utils.sprintf('
    ', - this.options.formatColumns()), - `', - bootstrap.html.toobarDropdow[0]) - - this.columns.forEach((column, i) => { - if (column.radio || column.checkbox) { - return - } - - if (this.options.cardView && !column.cardVisible) { - return - } - - const checked = column.visible ? ' checked="checked"' : '' - - if (column.switchable) { - html.push(Utils.sprintf(bootstrap.html.toobarDropdowItem, - Utils.sprintf(' %s', - column.field, i, checked, column.title))) - switchableCount++ - } - }) - html.push(bootstrap.html.toobarDropdow[1], '
    ') - } - - html.push('
    ') - - // Fix #188: this.showToolbar is for extensions - if (this.showToolbar || html.length > 2) { - this.$toolbar.append(html.join('')) - } - - if (this.options.showPaginationSwitch) { - this.$toolbar.find('button[name="paginationSwitch"]') - .off('click').on('click', $.proxy(this.togglePagination, this)) - } - - if (this.options.showRefresh) { - this.$toolbar.find('button[name="refresh"]') - .off('click').on('click', $.proxy(this.refresh, this)) - } - - if (this.options.showToggle) { - this.$toolbar.find('button[name="toggle"]') - .off('click').on('click', () => { - this.toggleView() - }) - } - - if (this.options.showColumns) { - $keepOpen = this.$toolbar.find('.keep-open') - - if (switchableCount <= this.options.minimumCountColumns) { - $keepOpen.find('input').prop('disabled', true) - } - - $keepOpen.find('li').off('click').on('click', e => { - e.stopImmediatePropagation() - }) - $keepOpen.find('input').off('click').on('click', e => { - const $this = $(e.currentTarget) - - this.toggleColumn($this.val(), $this.prop('checked'), false) - this.trigger('column-switch', $this.data('field'), $this.prop('checked')) - }) - } - - if (this.options.search) { - html = [] - html.push( - Utils.sprintf('') - - this.$toolbar.append(html.join('')) - $search = this.$toolbar.find('.search input') - $search.off('keyup drop blur').on('keyup drop blur', event => { - if (this.options.searchOnEnterKey && event.keyCode !== 13) { - return - } - - if ([37, 38, 39, 40].includes(event.keyCode)) { - return - } - - clearTimeout(timeoutId) // doesn't matter if it's 0 - timeoutId = setTimeout(() => { - this.onSearch(event) - }, this.options.searchTimeOut) - }) - - if (Utils.isIEBrowser()) { - $search.off('mouseup').on('mouseup', event => { - clearTimeout(timeoutId) // doesn't matter if it's 0 - timeoutId = setTimeout(() => { - this.onSearch(event) - }, this.options.searchTimeOut) - }) - } - } - } - - onSearch ({currentTarget, firedByInitSearchText}) { - const text = $.trim($(currentTarget).val()) - - // trim search input - if (this.options.trimOnSearch && $(currentTarget).val() !== text) { - $(currentTarget).val(text) - } - - if (text === this.searchText) { - return - } - this.searchText = text - this.options.searchText = text - - if (!firedByInitSearchText) { - this.options.pageNumber = 1 - } - this.initSearch() - if (firedByInitSearchText) { - if (this.options.sidePagination === 'client') { - this.updatePagination() - } - } else { - this.updatePagination() - } - this.trigger('search', text) - } - - initSearch () { - if (this.options.sidePagination !== 'server') { - if (this.options.customSearch !== $.noop) { - window[this.options.customSearch].apply(this, [this.searchText]) - return - } - - const s = this.searchText && (this.options.escape - ? Utils.escapeHTML(this.searchText) : this.searchText).toLowerCase() - const f = $.isEmptyObject(this.filterColumns) ? null : this.filterColumns - - // Check filter - this.data = f ? this.options.data.filter((item, i) => { - for (const key in f) { - if ( - (Array.isArray(f[key]) && - !f[key].includes(item[key])) || - (!Array.isArray(f[key]) && - item[key] !== f[key]) - ) { - return false - } - } - return true - }) : this.options.data - - this.data = s ? this.data.filter((item, i) => { - for (let j = 0; j < this.header.fields.length; j++) { - if (!this.header.searchables[j]) { - continue - } - - const key = $.isNumeric(this.header.fields[j]) ? parseInt(this.header.fields[j], 10) : this.header.fields[j] - const column = this.columns[this.fieldsColumnsIndex[key]] - let value - - if (typeof key === 'string') { - value = item - const props = key.split('.') - for (let i = 0; i < props.length; i++) { - if (value[props[i]] != null) { - value = value[props[i]] - } - } - - // Fix #142: respect searchForamtter boolean - if (column && column.searchFormatter) { - value = Utils.calculateObjectValue(column, - this.header.formatters[j], [value, item, i], value) - } - } else { - value = item[key] - } - - if (typeof value === 'string' || typeof value === 'number') { - if (this.options.strictSearch) { - if ((`${value}`).toLowerCase() === s) { - return true - } - } else { - if ((`${value}`).toLowerCase().includes(s)) { - return true - } - } - } - } - return false - }) : this.data - } - } - - initPagination () { - if (!this.options.pagination) { - this.$pagination.hide() - return - } else { - this.$pagination.show() - } - - const html = [] - let $allSelected = false - let i - let from - let to - let $pageList - let $pre - let $next - let $number - const data = this.getData() - let pageList = this.options.pageList - - if (this.options.sidePagination !== 'server') { - this.options.totalRows = data.length - } - - this.totalPages = 0 - if (this.options.totalRows) { - if (this.options.pageSize === this.options.formatAllRows()) { - this.options.pageSize = this.options.totalRows - $allSelected = true - } else if (this.options.pageSize === this.options.totalRows) { - // Fix #667 Table with pagination, - // multiple pages and a search this matches to one page throws exception - const pageLst = typeof this.options.pageList === 'string' - ? this.options.pageList.replace('[', '').replace(']', '') - .replace(/ /g, '').toLowerCase().split(',') : this.options.pageList - if (pageLst.includes(this.options.formatAllRows().toLowerCase())) { - $allSelected = true - } - } - - this.totalPages = ~~((this.options.totalRows - 1) / this.options.pageSize) + 1 - - this.options.totalPages = this.totalPages - } - if (this.totalPages > 0 && this.options.pageNumber > this.totalPages) { - this.options.pageNumber = this.totalPages - } - - this.pageFrom = (this.options.pageNumber - 1) * this.options.pageSize + 1 - this.pageTo = this.options.pageNumber * this.options.pageSize - if (this.pageTo > this.options.totalRows) { - this.pageTo = this.options.totalRows - } - - html.push( - Utils.sprintf('
    ', bootstrap.classes.pull, this.options.paginationDetailHAlign), - '', - this.options.onlyInfoPagination ? this.options.formatDetailPagination(this.options.totalRows) - : this.options.formatShowingRows(this.pageFrom, this.pageTo, this.options.totalRows), - '') - - if (!this.options.onlyInfoPagination) { - html.push('') - - const pageNumber = [ - Utils.sprintf('', - this.options.paginationVAlign === 'top' || this.options.paginationVAlign === 'both' - ? 'dropdown' : 'dropup'), - `', - bootstrap.html.pageDropdown[0] - ] - - if (typeof this.options.pageList === 'string') { - const list = this.options.pageList.replace('[', '').replace(']', '') - .replace(/ /g, '').split(',') - - pageList = [] - for (let value of list) { - pageList.push( - (value.toUpperCase() === this.options.formatAllRows().toUpperCase() || - value.toUpperCase() === 'UNLIMITED') - ? this.options.formatAllRows() : +value) - } - } - - pageList.forEach((page, i) => { - if (!this.options.smartDisplay || i === 0 || pageList[i - 1] < this.options.totalRows) { - let active - if ($allSelected) { - active = page === this.options.formatAllRows() ? 'active' : '' - } else { - active = page === this.options.pageSize ? 'active' : '' - } - pageNumber.push(Utils.sprintf(bootstrap.html.pageDropdownItem, active, page)) - } - }) - pageNumber.push(`${bootstrap.html.pageDropdown[1]}`) - - html.push(this.options.formatRecordsPerPage(pageNumber.join(''))) - html.push('') - - html.push('
    ', - Utils.sprintf('') - } - this.$pagination.html(html.join('')) - - if (!this.options.onlyInfoPagination) { - $pageList = this.$pagination.find('.page-list a') - $pre = this.$pagination.find('.page-pre') - $next = this.$pagination.find('.page-next') - $number = this.$pagination.find('.page-item').not('.page-next, .page-pre') - - if (this.options.smartDisplay) { - if (this.totalPages <= 1) { - this.$pagination.find('div.pagination').hide() - } - if (pageList.length < 2 || this.options.totalRows <= pageList[0]) { - this.$pagination.find('span.page-list').hide() - } - - // when data is empty, hide the pagination - this.$pagination[this.getData().length ? 'show' : 'hide']() - } - - if (!this.options.paginationLoop) { - if (this.options.pageNumber === 1) { - $pre.addClass('disabled') - } - if (this.options.pageNumber === this.totalPages) { - $next.addClass('disabled') - } - } - - if ($allSelected) { - this.options.pageSize = this.options.formatAllRows() - } - // removed the events for last and first, onPageNumber executeds the same logic - $pageList.off('click').on('click', $.proxy(this.onPageListChange, this)) - $pre.off('click').on('click', $.proxy(this.onPagePre, this)) - $next.off('click').on('click', $.proxy(this.onPageNext, this)) - $number.off('click').on('click', $.proxy(this.onPageNumber, this)) - } - } - - updatePagination (event) { - // Fix #171: IE disabled button can be clicked bug. - if (event && $(event.currentTarget).hasClass('disabled')) { - return - } - - if (!this.options.maintainSelected) { - this.resetRows() - } - - this.initPagination() - if (this.options.sidePagination === 'server') { - this.initServer() - } else { - this.initBody() - } - - this.trigger('page-change', this.options.pageNumber, this.options.pageSize) - } - - onPageListChange (event) { - event.preventDefault() - const $this = $(event.currentTarget) - - $this.parent().addClass('active').siblings().removeClass('active') - this.options.pageSize = $this.text().toUpperCase() === this.options.formatAllRows().toUpperCase() - ? this.options.formatAllRows() : +$this.text() - this.$toolbar.find('.page-size').text(this.options.pageSize) - - this.updatePagination(event) - return false - } - - onPagePre (event) { - event.preventDefault() - if ((this.options.pageNumber - 1) === 0) { - this.options.pageNumber = this.options.totalPages - } else { - this.options.pageNumber-- - } - this.updatePagination(event) - return false - } - - onPageNext (event) { - event.preventDefault() - if ((this.options.pageNumber + 1) > this.options.totalPages) { - this.options.pageNumber = 1 - } else { - this.options.pageNumber++ - } - this.updatePagination(event) - return false - } - - onPageNumber (event) { - event.preventDefault() - if (this.options.pageNumber === +$(event.currentTarget).text()) { - return - } - this.options.pageNumber = +$(event.currentTarget).text() - this.updatePagination(event) - return false - } - - initRow (item, i, data) { - let key - const html = [] - let style = {} - const csses = [] - let data_ = '' - let attributes = {} - const htmlAttributes = [] - - if (this.hiddenRows.includes(item)) { - return - } - - style = Utils.calculateObjectValue(this.options, this.options.rowStyle, [item, i], style) - - if (style && style.css) { - for (key in style.css) { - csses.push(`${key}: ${style.css[key]}`) - } - } - - attributes = Utils.calculateObjectValue(this.options, - this.options.rowAttributes, [item, i], attributes) - - if (attributes) { - for (key in attributes) { - htmlAttributes.push(`${key}="${Utils.escapeHTML(attributes[key])}"`) - } - } - - if (item._data && !$.isEmptyObject(item._data)) { - item._data.forEach((v, k) => { - // ignore data-index - if (k === 'index') { - return - } - data_ += ` data-${k}="${v}"` - }) - } - - html.push('' - ) - - if (this.options.cardView) { - html.push(`
    `) - } - - if (!this.options.cardView && this.options.detailView) { - html.push('') - - if (Utils.calculateObjectValue(null, this.options.detailFilter, [i, item])) { - html.push(` - - - - `) - } - - html.push('') - } - - this.header.fields.forEach((field, j) => { - let text = '' - let value_ = Utils.getItemField(item, field, this.options.escape) - let value = '' - let type = '' - let cellStyle = {} - let id_ = '' - let class_ = this.header.classes[j] - let style_ = '' - let data_ = '' - let rowspan_ = '' - let colspan_ = '' - let title_ = '' - const column = this.columns[j] - - if (this.fromHtml && typeof value_ === 'undefined') { - if ((!column.checkbox) && (!column.radio)) { - return - } - } - - if (!column.visible) { - return - } - - if (this.options.cardView && (!column.cardVisible)) { - return - } - - if (column.escape) { - value_ = Utils.escapeHTML(value_) - } - - if (csses.concat([this.header.styles[j]]).length) { - style_ = ` style="${csses.concat([this.header.styles[j]]).join('; ')}"` - } - // handle td's id and class - if (item[`_${field}_id`]) { - id_ = Utils.sprintf(' id="%s"', item[`_${field}_id`]) - } - if (item[`_${field}_class`]) { - class_ = Utils.sprintf(' class="%s"', item[`_${field}_class`]) - } - if (item[`_${field}_rowspan`]) { - rowspan_ = Utils.sprintf(' rowspan="%s"', item[`_${field}_rowspan`]) - } - if (item[`_${field}_colspan`]) { - colspan_ = Utils.sprintf(' colspan="%s"', item[`_${field}_colspan`]) - } - if (item[`_${field}_title`]) { - title_ = Utils.sprintf(' title="%s"', item[`_${field}_title`]) - } - cellStyle = Utils.calculateObjectValue(this.header, - this.header.cellStyles[j], [value_, item, i, field], cellStyle) - if (cellStyle.classes) { - class_ = ` class="${cellStyle.classes}"` - } - if (cellStyle.css) { - const csses_ = [] - for (const key in cellStyle.css) { - csses_.push(`${key}: ${cellStyle.css[key]}`) - } - style_ = ` style="${csses_.concat(this.header.styles[j]).join('; ')}"` - } - - value = Utils.calculateObjectValue(column, - this.header.formatters[j], [value_, item, i, field], value_) - - if (item[`_${field}_data`] && !$.isEmptyObject(item[`_${field}_data`])) { - item[`_${field}_data`].forEach((v, k) => { - // ignore data-index - if (k === 'index') { - return - } - data_ += ` data-${k}="${v}"` - }) - } - - if (column.checkbox || column.radio) { - type = column.checkbox ? 'checkbox' : type - type = column.radio ? 'radio' : type - - const c = column['class'] || '' - const isChecked = value === true || (value_ || value && value.checked) - const isDisabled = !column.checkboxEnabled || (value && value.disabled) - - text = [ - this.options.cardView - ? `
    ` - : ``, - ``, - this.header.formatters[j] && typeof value === 'string' ? value : '', - this.options.cardView ? '
    ' : '' - ].join('') - - item[this.header.stateField] = value === true || (!!value_ || (value && value.checked)) - } else { - value = typeof value === 'undefined' || value === null - ? this.options.undefinedText : value - - if (this.options.cardView) { - const cardTitle = this.options.showHeader - ? `${Utils.getFieldTitle(this.columns, field)}` : '' - - text = `
    ${cardTitle}${value}
    ` - - if (this.options.smartDisplay && value === '') { - text = '
    ' - } - } else { - text = `${value}` - } - } - - html.push(text) - }) - - if (this.options.cardView) { - html.push('
    ') - } - html.push('') - - return html.join('') - } - - initBody (fixedScroll) { - const data = this.getData() - - this.trigger('pre-body', data) - - this.$body = this.$el.find('>tbody') - if (!this.$body.length) { - this.$body = $('').appendTo(this.$el) - } - - // Fix #389 Bootstrap-table-flatJSON is not working - if (!this.options.pagination || this.options.sidePagination === 'server') { - this.pageFrom = 1 - this.pageTo = data.length - } - - const html = [] - for (let i = this.pageFrom - 1; i < this.pageTo; i++) { - html.push(this.initRow(data[i], i, data)) - } - - // show no records - if (!html.length) { - this.$body.html(`${Utils.sprintf('%s', - this.$header.find('th').length, - this.options.formatNoMatches())}`) - } - - this.$body.html(html.join('')) - - if (!fixedScroll) { - this.scrollTo(0) - } - - // click to select by column - this.$body.find('> tr[data-index] > td').off('click dblclick').on('click dblclick', (e) => { - const $td = $(e.currentTarget) - const $tr = $td.parent() - const item = this.data[$tr.data('index')] - const index = $td[0].cellIndex - const fields = this.getVisibleFields() - const field = fields[this.options.detailView && !this.options.cardView ? index - 1 : index] - const column = this.columns[this.fieldsColumnsIndex[field]] - const value = Utils.getItemField(item, field, this.options.escape) - - if ($td.find('.detail-icon').length) { - return - } - - this.trigger(e.type === 'click' ? 'click-cell' : 'dbl-click-cell', field, value, item, $td) - this.trigger(e.type === 'click' ? 'click-row' : 'dbl-click-row', item, $tr, field) - - // if click to select - then trigger the checkbox/radio click - if ( - e.type === 'click' && - this.options.clickToSelect && - column.clickToSelect && - !this.options.ignoreClickToSelectOn(e.target) - ) { - const $selectItem = $tr.find(Utils.sprintf('[name="%s"]', this.options.selectItemName)) - if ($selectItem.length) { - $selectItem[0].click() // #144: .trigger('click') bug - } - } - }) - - this.$body.find('> tr[data-index] > td > .detail-icon').off('click').on('click', e => { - e.preventDefault() - - const $this = $(e.currentTarget) // Fix #980 Detail view, when searching, returns wrong row - const $tr = $this.parent().parent() - const index = $tr.data('index') - const row = data[index] - - // remove and update - if ($tr.next().is('tr.detail-view')) { - $this.find('i').attr('class', Utils.sprintf('%s %s', this.options.iconsPrefix, this.options.icons.detailOpen)) - this.trigger('collapse-row', index, row, $tr.next()) - $tr.next().remove() - } else { - $this.find('i').attr('class', Utils.sprintf('%s %s', this.options.iconsPrefix, this.options.icons.detailClose)) - $tr.after(Utils.sprintf('', $tr.find('td').length)) - const $element = $tr.next().find('td') - const content = Utils.calculateObjectValue(this.options, this.options.detailFormatter, [index, row, $element], '') - if ($element.length === 1) { - $element.append(content) - } - this.trigger('expand-row', index, row, $element) - } - this.resetView() - return false - }) - - this.$selectItem = this.$body.find(Utils.sprintf('[name="%s"]', this.options.selectItemName)) - this.$selectItem.off('click').on('click', e => { - e.stopImmediatePropagation() - - const $this = $(e.currentTarget) - this.check_($this.prop('checked'), $this.data('index')) - }) - - this.header.events.forEach((events, i) => { - if (!events) { - return - } - // fix bug, if events is defined with namespace - if (typeof events === 'string') { - events = Utils.calculateObjectValue(null, events) - } - - const field = this.header.fields[i] - let fieldIndex = this.getVisibleFields().indexOf(field) - - if (fieldIndex === -1) { - return - } - - if (this.options.detailView && !this.options.cardView) { - fieldIndex += 1 - } - - for (const key in events) { - this.$body.find('>tr:not(.no-records-found)').each((i, tr) => { - const $tr = $(tr) - const $td = $tr.find(this.options.cardView ? '.card-view' : 'td').eq(fieldIndex) - const index = key.indexOf(' ') - const name = key.substring(0, index) - const el = key.substring(index + 1) - const func = events[key] - - $td.find(el).off(name).on(name, e => { - const index = $tr.data('index') - const row = this.data[index] - const value = row[field] - - func.apply(this, [e, value, row, index]) - }) - }) - } - }) - - this.updateSelected() - this.resetView() - - this.trigger('post-body', data) - } - - initServer (silent, query, url) { - let data = {} - const index = this.header.fields.indexOf(this.options.sortName) - - let params = { - searchText: this.searchText, - sortName: this.options.sortName, - sortOrder: this.options.sortOrder - } - - let request - - if (this.header.sortNames[index]) { - params.sortName = this.header.sortNames[index] - } - - if (this.options.pagination && this.options.sidePagination === 'server') { - params.pageSize = this.options.pageSize === this.options.formatAllRows() - ? this.options.totalRows : this.options.pageSize - params.pageNumber = this.options.pageNumber - } - - if (!(url || this.options.url) && !this.options.ajax) { - return - } - - if (this.options.queryParamsType === 'limit') { - params = { - search: params.searchText, - sort: params.sortName, - order: params.sortOrder - } - - if (this.options.pagination && this.options.sidePagination === 'server') { - params.offset = this.options.pageSize === this.options.formatAllRows() - ? 0 : this.options.pageSize * (this.options.pageNumber - 1) - params.limit = this.options.pageSize === this.options.formatAllRows() - ? this.options.totalRows : this.options.pageSize - if (params.limit === 0) { - delete params.limit - } - } - } - - if (!($.isEmptyObject(this.filterColumnsPartial))) { - params.filter = JSON.stringify(this.filterColumnsPartial, null) - } - - data = Utils.calculateObjectValue(this.options, this.options.queryParams, [params], data) - - $.extend(data, query || {}) - - // false to stop request - if (data === false) { - return - } - - if (!silent) { - this.$tableLoading.show() - } - request = $.extend({}, Utils.calculateObjectValue(null, this.options.ajaxOptions), { - type: this.options.method, - url: url || this.options.url, - data: this.options.contentType === 'application/json' && this.options.method === 'post' - ? JSON.stringify(data) : data, - cache: this.options.cache, - contentType: this.options.contentType, - dataType: this.options.dataType, - success: res => { - res = Utils.calculateObjectValue(this.options, this.options.responseHandler, [res], res) - - this.load(res) - this.trigger('load-success', res) - if (!silent) this.$tableLoading.hide() - }, - error: res => { - let data = [] - if (this.options.sidePagination === 'server') { - data = {} - data[this.options.totalField] = 0 - data[this.options.dataField] = [] - } - this.load(data) - this.trigger('load-error', res.status, res) - if (!silent) this.$tableLoading.hide() - } - }) - - if (this.options.ajax) { - Utils.calculateObjectValue(this, this.options.ajax, [request], null) - } else { - if (this._xhr && this._xhr.readyState !== 4) { - this._xhr.abort() - } - this._xhr = $.ajax(request) - } - } - - initSearchText () { - if (this.options.search) { - this.searchText = '' - if (this.options.searchText !== '') { - const $search = this.$toolbar.find('.search input') - $search.val(this.options.searchText) - this.onSearch({currentTarget: $search, firedByInitSearchText: true}) - } - } - } - - getCaret () { - this.$header.find('th').each((i, th) => { - $(th).find('.sortable').removeClass('desc asc') - .addClass($(th).data('field') === this.options.sortName - ? this.options.sortOrder : 'both') - }) - } - - updateSelected () { - const checkAll = this.$selectItem.filter(':enabled').length && - this.$selectItem.filter(':enabled').length === - this.$selectItem.filter(':enabled').filter(':checked').length - - this.$selectAll.add(this.$selectAll_).prop('checked', checkAll) - - this.$selectItem.each((i, el) => { - $(el).closest('tr')[$(el).prop('checked') ? 'addClass' : 'removeClass']('selected') - }) - } - - updateRows () { - this.$selectItem.each((i, el) => { - this.data[$(el).data('index')][this.header.stateField] = $(el).prop('checked') - }) - } - - resetRows () { - for (let row of this.data) { - this.$selectAll.prop('checked', false) - this.$selectItem.prop('checked', false) - if (this.header.stateField) { - row[this.header.stateField] = false - } - } - this.initHiddenRows() - } - - trigger (name, ...args) { - name += '.bs.table' - this.options[BootstrapTable.EVENTS[name]].apply(this.options, args) - this.$el.trigger($.Event(name), args) - - this.options.onAll(name, args) - this.$el.trigger($.Event('all.bs.table'), [name, args]) - } - - resetHeader () { - // fix #61: the hidden table reset header bug. - // fix bug: get $el.css('width') error sometime (height = 500) - clearTimeout(this.timeoutId_) - this.timeoutId_ = setTimeout($.proxy(this.fitHeader, this), this.$el.is(':hidden') ? 100 : 0) - } - - fitHeader () { - let fixedBody - let scrollWidth - let focused - let focusedTemp - - if (this.$el.is(':hidden')) { - this.timeoutId_ = setTimeout($.proxy(this.fitHeader, this), 100) - return - } - fixedBody = this.$tableBody.get(0) - - scrollWidth = fixedBody.scrollWidth > fixedBody.clientWidth && - fixedBody.scrollHeight > fixedBody.clientHeight + this.$header.outerHeight() - ? Utils.getScrollBarWidth() : 0 - - this.$el.css('margin-top', -this.$header.outerHeight()) - - focused = $(':focus') - if (focused.length > 0) { - const $th = focused.parents('th') - if ($th.length > 0) { - const dataField = $th.attr('data-field') - if (dataField !== undefined) { - const $headerTh = this.$header.find(`[data-field='${dataField}']`) - if ($headerTh.length > 0) { - $headerTh.find(':input').addClass('focus-temp') - } - } - } - } - - this.$header_ = this.$header.clone(true, true) - this.$selectAll_ = this.$header_.find('[name="btSelectAll"]') - this.$tableHeader.css({ - 'margin-right': scrollWidth - }).find('table').css('width', this.$el.outerWidth()) - .html('').attr('class', this.$el.attr('class')) - .append(this.$header_) - - focusedTemp = $('.focus-temp:visible:eq(0)') - if (focusedTemp.length > 0) { - focusedTemp.focus() - this.$header.find('.focus-temp').removeClass('focus-temp') - } - - // fix bug: $.data() is not working as expected after $.append() - this.$header.find('th[data-field]').each((i, el) => { - this.$header_.find(Utils.sprintf('th[data-field="%s"]', $(el).data('field'))).data($(el).data()) - }) - - const visibleFields = this.getVisibleFields() - const $ths = this.$header_.find('th') - - this.$body.find('>tr:first-child:not(.no-records-found) > *').each((i, el) => { - const $this = $(el) - let index = i - - if (this.options.detailView && !this.options.cardView) { - if (i === 0) { - this.$header_.find('th.detail').find('.fht-cell').width($this.innerWidth()) - } - index = i - 1 - } - - if (index === -1) { - return - } - - let $th = this.$header_.find(Utils.sprintf('th[data-field="%s"]', visibleFields[index])) - if ($th.length > 1) { - $th = $($ths[$this[0].cellIndex]) - } - - const zoomWidth = $th.width() - $th.find('.fht-cell').width() - $th.find('.fht-cell').width($this.innerWidth() - zoomWidth) - }) - - this.horizontalScroll() - this.trigger('post-header') - } - - resetFooter () { - const data = this.getData() - const html = [] - - if (!this.options.showFooter || this.options.cardView) { // do nothing - return - } - - if (!this.options.cardView && this.options.detailView) { - html.push('
     
    ') - } - - for (let column of this.columns) { - let key - - let // footer align style - falign = '' - - let valign = '' - const csses = [] - let style = {} - const class_ = Utils.sprintf(' class="%s"', column['class']) - - if (!column.visible) { - return - } - - if (this.options.cardView && (!column.cardVisible)) { - return - } - - falign = Utils.sprintf('text-align: %s; ', column.falign ? column.falign : column.align) - valign = Utils.sprintf('vertical-align: %s; ', column.valign) - - style = Utils.calculateObjectValue(null, this.options.footerStyle) - - if (style && style.css) { - for (key in style.css) { - csses.push(`${key}: ${style.css[key]}`) - } - } - - html.push('') - html.push('
    ') - - html.push(Utils.calculateObjectValue(column, column.footerFormatter, [data], ' ') || ' ') - - html.push('
    ') - html.push('
    ') - html.push('
    ') - html.push('') - } - - this.$tableFooter.find('tr').html(html.join('')) - this.$tableFooter.show() - clearTimeout(this.timeoutFooter_) - this.timeoutFooter_ = setTimeout($.proxy(this.fitFooter, this), - this.$el.is(':hidden') ? 100 : 0) - } - - fitFooter () { - let $footerTd - let elWidth - let scrollWidth - - clearTimeout(this.timeoutFooter_) - if (this.$el.is(':hidden')) { - this.timeoutFooter_ = setTimeout($.proxy(this.fitFooter, this), 100) - return - } - - elWidth = this.$el.css('width') - scrollWidth = elWidth > this.$tableBody.width() ? Utils.getScrollBarWidth() : 0 - - this.$tableFooter.css({ - 'margin-right': scrollWidth - }).find('table').css('width', elWidth) - .attr('class', this.$el.attr('class')) - - $footerTd = this.$tableFooter.find('td') - - this.$body.find('>tr:first-child:not(.no-records-found) > *').each((i, el) => { - const $this = $(el) - - $footerTd.eq(i).find('.fht-cell').width($this.innerWidth()) - }) - - this.horizontalScroll() - } - - horizontalScroll () { - // horizontal scroll event - // TODO: it's probably better improving the layout than binding to scroll event - - this.trigger('scroll-body') - this.$tableBody.off('scroll').on('scroll', e => { - if (this.options.showHeader && this.options.height) { - this.$tableHeader.scrollLeft($(e.currentTarget).scrollLeft()) - } - - if (this.options.showFooter && !this.options.cardView) { - this.$tableFooter.scrollLeft($(e.currentTarget).scrollLeft()) - } - }) - } - - toggleColumn (index, checked, needUpdate) { - if (index === -1) { - return - } - this.columns[index].visible = checked - this.initHeader() - this.initSearch() - this.initPagination() - this.initBody() - - if (this.options.showColumns) { - const $items = this.$toolbar.find('.keep-open input').prop('disabled', false) - - if (needUpdate) { - $items.filter(Utils.sprintf('[value="%s"]', index)).prop('checked', checked) - } - - if ($items.filter(':checked').length <= this.options.minimumCountColumns) { - $items.filter(':checked').prop('disabled', true) - } - } - } - - getVisibleFields () { - const visibleFields = [] - - for (let field of this.header.fields) { - const column = this.columns[this.fieldsColumnsIndex[field]] - - if (!column.visible) { - continue - } - visibleFields.push(field) - } - return visibleFields - } - - // PUBLIC FUNCTION DEFINITION - // ======================= - - resetView (params) { - let padding = 0 - - if (params && params.height) { - this.options.height = params.height - } - - this.$selectAll.prop('checked', this.$selectItem.length > 0 && - this.$selectItem.length === this.$selectItem.filter(':checked').length) - - if (this.options.height) { - const toolbarHeight = this.$toolbar.outerHeight(true) - const paginationHeight = this.$pagination.outerHeight(true) - const height = this.options.height - toolbarHeight - paginationHeight - - this.$tableContainer.css('height', `${height}px`) - } - - if (this.options.cardView) { - // remove the element css - this.$el.css('margin-top', '0') - this.$tableContainer.css('padding-bottom', '0') - this.$tableFooter.hide() - return - } - - if (this.options.showHeader && this.options.height) { - this.$tableHeader.show() - this.resetHeader() - padding += this.$header.outerHeight() - } else { - this.$tableHeader.hide() - this.trigger('post-header') - } - - if (this.options.showFooter) { - this.resetFooter() - if (this.options.height) { - padding += this.$tableFooter.outerHeight() + 1 - } - } - - // Assign the correct sortable arrow - this.getCaret() - this.$tableContainer.css('padding-bottom', `${padding}px`) - this.trigger('reset-view') - } - - getData (useCurrentPage) { - let data = this.options.data - if (this.searchText || this.options.sortName || !$.isEmptyObject(this.filterColumns) || !$.isEmptyObject(this.filterColumnsPartial)) { - data = this.data - } - - if (useCurrentPage) { - return data.slice(this.pageFrom - 1, this.pageTo) - } - - return data - } - - load (data) { - let fixedScroll = false - - // #431: support pagination - if (this.options.pagination && this.options.sidePagination === 'server') { - this.options.totalRows = data[this.options.totalField] - fixedScroll = data.fixedScroll - data = data[this.options.dataField] - } else if (!Array.isArray(data)) { // support fixedScroll - fixedScroll = data.fixedScroll - data = data.data - } - - this.initData(data) - this.initSearch() - this.initPagination() - this.initBody(fixedScroll) - } - - append (data) { - this.initData(data, 'append') - this.initSearch() - this.initPagination() - this.initSort() - this.initBody(true) - } - - prepend (data) { - this.initData(data, 'prepend') - this.initSearch() - this.initPagination() - this.initSort() - this.initBody(true) - } - - remove (params) { - const len = this.options.data.length - let i - let row - - if (!params.hasOwnProperty('field') || !params.hasOwnProperty('values')) { - return - } - - for (i = len - 1; i >= 0; i--) { - row = this.options.data[i] - - if (!row.hasOwnProperty(params.field)) { - continue - } - if (params.values.includes(row[params.field])) { - this.options.data.splice(i, 1) - if (this.options.sidePagination === 'server') { - this.options.totalRows -= 1 - } - } - } - - if (len === this.options.data.length) { - return - } - - this.initSearch() - this.initPagination() - this.initSort() - this.initBody(true) - } - - removeAll () { - if (this.options.data.length > 0) { - this.options.data.splice(0, this.options.data.length) - this.initSearch() - this.initPagination() - this.initBody(true) - } - } - - getRowByUniqueId (id) { - const uniqueId = this.options.uniqueId - const len = this.options.data.length - let dataRow = null - let i - let row - let rowUniqueId - - for (i = len - 1; i >= 0; i--) { - row = this.options.data[i] - - if (row.hasOwnProperty(uniqueId)) { // uniqueId is a column - rowUniqueId = row[uniqueId] - } else if (row._data.hasOwnProperty(uniqueId)) { // uniqueId is a row data property - rowUniqueId = row._data[uniqueId] - } else { - continue - } - - if (typeof rowUniqueId === 'string') { - id = id.toString() - } else if (typeof rowUniqueId === 'number') { - if ((Number(rowUniqueId) === rowUniqueId) && (rowUniqueId % 1 === 0)) { - id = parseInt(id) - } else if ((rowUniqueId === Number(rowUniqueId)) && (rowUniqueId !== 0)) { - id = parseFloat(id) - } - } - - if (rowUniqueId === id) { - dataRow = row - break - } - } - - return dataRow - } - - removeByUniqueId (id) { - const len = this.options.data.length - const row = this.getRowByUniqueId(id) - - if (row) { - this.options.data.splice(this.options.data.indexOf(row), 1) - } - - if (len === this.options.data.length) { - return - } - - this.initSearch() - this.initPagination() - this.initBody(true) - } - - updateByUniqueId (params) { - const allParams = Array.isArray(params) ? params : [ params ] - - for (let params of allParams) { - let rowId - - if (!params.hasOwnProperty('id') || !params.hasOwnProperty('row')) { - continue - } - - rowId = this.options.data.indexOf(this.getRowByUniqueId(params.id)) - - if (rowId === -1) { - continue - } - $.extend(this.options.data[rowId], params.row) - } - - this.initSearch() - this.initPagination() - this.initSort() - this.initBody(true) - } - - refreshColumnTitle (params) { - if (!params.hasOwnProperty('field') || !params.hasOwnProperty('title')) { - return - } - - this.columns[this.fieldsColumnsIndex[params.field]].title = - this.options.escape ? Utils.escapeHTML(params.title) : params.title - - if (this.columns[this.fieldsColumnsIndex[params.field]].visible) { - const header = this.options.height !== undefined ? this.$tableHeader : this.$header - header.find('th[data-field]').each((i, el) => { - if ($(el).data('field') === params.field) { - $($(el).find('.th-inner')[0]).text(params.title) - return false - } - }) - } - } - - insertRow (params) { - if (!params.hasOwnProperty('index') || !params.hasOwnProperty('row')) { - return - } - this.options.data.splice(params.index, 0, params.row) - this.initSearch() - this.initPagination() - this.initSort() - this.initBody(true) - } - - updateRow (params) { - const allParams = Array.isArray(params) ? params : [ params ] - - for (let params of allParams) { - if (!params.hasOwnProperty('index') || !params.hasOwnProperty('row')) { - continue - } - $.extend(this.options.data[params.index], params.row) - } - - this.initSearch() - this.initPagination() - this.initSort() - this.initBody(true) - } - - initHiddenRows () { - this.hiddenRows = [] - } - - showRow (params) { - this.toggleRow(params, true) - } - - hideRow (params) { - this.toggleRow(params, false) - } - - toggleRow (params, visible) { - let row - let index - - if (params.hasOwnProperty('index')) { - row = this.getData()[params.index] - } else if (params.hasOwnProperty('uniqueId')) { - row = this.getRowByUniqueId(params.uniqueId) - } - - if (!row) { - return - } - - index = this.hiddenRows.indexOf(row) - - if (!visible && index === -1) { - this.hiddenRows.push(row) - } else if (visible && index > -1) { - this.hiddenRows.splice(index, 1) - } - this.initBody(true) - } - - getHiddenRows (show) { - const data = this.getData() - const rows = [] - - for (let row of data) { - if (this.hiddenRows.includes(row)) { - rows.push(row) - } - } - this.hiddenRows = rows - return rows - } - - mergeCells (options) { - const row = options.index - let col = this.getVisibleFields().indexOf(options.field) - const rowspan = options.rowspan || 1 - const colspan = options.colspan || 1 - let i - let j - const $tr = this.$body.find('>tr') - let $td - - if (this.options.detailView && !this.options.cardView) { - col += 1 - } - - $td = $tr.eq(row).find('>td').eq(col) - - if (row < 0 || col < 0 || row >= this.data.length) { - return - } - - for (i = row; i < row + rowspan; i++) { - for (j = col; j < col + colspan; j++) { - $tr.eq(i).find('>td').eq(j).hide() - } - } - - $td.attr('rowspan', rowspan).attr('colspan', colspan).show() - } - - updateCell (params) { - if (!params.hasOwnProperty('index') || - !params.hasOwnProperty('field') || - !params.hasOwnProperty('value')) { - return - } - this.data[params.index][params.field] = params.value - - if (params.reinit === false) { - return - } - this.initSort() - this.initBody(true) - } - - updateCellById (params) { - if (!params.hasOwnProperty('id') || - !params.hasOwnProperty('field') || - !params.hasOwnProperty('value')) { - return - } - const allParams = Array.isArray(params) ? params : [ params ] - - allParams.forEach(({id, field, value}) => { - let rowId - - rowId = this.options.data.indexOf(this.getRowByUniqueId(id)) - - if (rowId === -1) { - return - } - this.data[rowId][field] = value - }) - - if (params.reinit === false) { - return - } - this.initSort() - this.initBody(true) - } - - getOptions () { - // Deep copy - return $.extend(true, {}, this.options) - } - - getSelections () { - // fix #2424: from html with checkbox - return this.options.data.filter(row => - row[this.header.stateField] === true) - } - - getAllSelections () { - return this.options.data.filter(row => row[this.header.stateField]) - } - - checkAll () { - this.checkAll_(true) - } - - uncheckAll () { - this.checkAll_(false) - } - - checkInvert () { - const $items = this.$selectItem.filter(':enabled') - let checked = $items.filter(':checked') - $items.each((i, el) => { - $(el).prop('checked', !$(el).prop('checked')) - }) - this.updateRows() - this.updateSelected() - this.trigger('uncheck-some', checked) - checked = this.getSelections() - this.trigger('check-some', checked) - } - - checkAll_ (checked) { - let rows - if (!checked) { - rows = this.getSelections() - } - this.$selectAll.add(this.$selectAll_).prop('checked', checked) - this.$selectItem.filter(':enabled').prop('checked', checked) - this.updateRows() - if (checked) { - rows = this.getSelections() - } - this.trigger(checked ? 'check-all' : 'uncheck-all', rows) - } - - check (index) { - this.check_(true, index) - } - - uncheck (index) { - this.check_(false, index) - } - - check_ (checked, index) { - const $el = this.$selectItem.filter(`[data-index="${index}"]`) - const row = this.data[index] - - if ($el.is(':radio') || this.options.singleSelect) { - for (let r of this.options.data) { - r[this.header.stateField] = false - } - this.$selectItem.filter(':checked').not($this).prop('checked', false) - } - - row[this.header.stateField] = checked - $el.prop('checked', checked) - this.updateSelected() - this.trigger(checked ? 'check' : 'uncheck', this.data[index], $el) - } - - checkBy (obj) { - this.checkBy_(true, obj) - } - - uncheckBy (obj) { - this.checkBy_(false, obj) - } - - checkBy_ (checked, obj) { - if (!obj.hasOwnProperty('field') || !obj.hasOwnProperty('values')) { - return - } - - const rows = [] - this.options.data.forEach((row, i) => { - if (!row.hasOwnProperty(obj.field)) { - return false - } - if (obj.values.includes(row[obj.field])) { - const $el = this.$selectItem.filter(':enabled') - .filter(Utils.sprintf('[data-index="%s"]', i)).prop('checked', checked) - row[this.header.stateField] = checked - rows.push(row) - this.trigger(checked ? 'check' : 'uncheck', row, $el) - } - }) - this.updateSelected() - this.trigger(checked ? 'check-some' : 'uncheck-some', rows) - } - - destroy () { - this.$el.insertBefore(this.$container) - $(this.options.toolbar).insertBefore(this.$el) - this.$container.next().remove() - this.$container.remove() - this.$el.html(this.$el_.html()) - .css('margin-top', '0') - .attr('class', this.$el_.attr('class') || '') // reset the class - } - - showLoading () { - this.$tableLoading.show() - } - - hideLoading () { - this.$tableLoading.hide() - } - - togglePagination () { - this.options.pagination = !this.options.pagination - const button = this.$toolbar.find('button[name="paginationSwitch"] i') - if (this.options.pagination) { - button.attr('class', `${this.options.iconsPrefix} ${this.options.icons.paginationSwitchDown}`) - } else { - button.attr('class', `${this.options.iconsPrefix} ${this.options.icons.paginationSwitchUp}`) - } - this.updatePagination() - } - - toggleFullscreen () { - this.$el.closest('.bootstrap-table').toggleClass('fullscreen') - } - - refresh (params) { - if (params && params.url) { - this.options.url = params.url - } - if (params && params.pageNumber) { - this.options.pageNumber = params.pageNumber - } - if (params && params.pageSize) { - this.options.pageSize = params.pageSize - } - this.initServer(params && params.silent, - params && params.query, params && params.url) - this.trigger('refresh', params) - } - - resetWidth () { - if (this.options.showHeader && this.options.height) { - this.fitHeader() - } - if (this.options.showFooter && !this.options.cardView) { - this.fitFooter() - } - } - - showColumn (field) { - this.toggleColumn(this.fieldsColumnsIndex[field], true, true) - } - - hideColumn (field) { - this.toggleColumn(this.fieldsColumnsIndex[field], false, true) - } - - getHiddenColumns () { - return this.columns.filter(({visible}) => !visible) - } - - getVisibleColumns () { - return this.columns.filter(({visible}) => visible) - } - - toggleAllColumns (visible) { - for (let column of this.columns) { - column.visible = visible - } - - this.initHeader() - this.initSearch() - this.initPagination() - this.initBody() - if (this.options.showColumns) { - const $items = this.$toolbar.find('.keep-open input').prop('disabled', false) - - if ($items.filter(':checked').length <= this.options.minimumCountColumns) { - $items.filter(':checked').prop('disabled', true) - } - } - } - - showAllColumns () { - this.toggleAllColumns(true) - } - - hideAllColumns () { - this.toggleAllColumns(false) - } - - filterBy (columns) { - this.filterColumns = $.isEmptyObject(columns) ? {} : columns - this.options.pageNumber = 1 - this.initSearch() - this.updatePagination() - } - - scrollTo (value) { - if (typeof value === 'string') { - value = value === 'bottom' ? this.$tableBody[0].scrollHeight : 0 - } - if (typeof value === 'number') { - this.$tableBody.scrollTop(value) - } - if (typeof value === 'undefined') { - return this.$tableBody.scrollTop() - } - } - - getScrollPosition () { - return this.scrollTo() - } - - selectPage (page) { - if (page > 0 && page <= this.options.totalPages) { - this.options.pageNumber = page - this.updatePagination() - } - } - - prevPage () { - if (this.options.pageNumber > 1) { - this.options.pageNumber-- - this.updatePagination() - } - } - - nextPage () { - if (this.options.pageNumber < this.options.totalPages) { - this.options.pageNumber++ - this.updatePagination() - } - } - - toggleView () { - this.options.cardView = !this.options.cardView - this.initHeader() - // Fixed remove toolbar when click cardView button. - // this.initToolbar(); - const $icon = this.$toolbar.find('button[name="toggle"] i') - if (this.options.cardView) { - $icon.removeClass(this.options.icons.toggleOff) - $icon.addClass(this.options.icons.toggleOn) - } else { - $icon.removeClass(this.options.icons.toggleOn) - $icon.addClass(this.options.icons.toggleOff) - } - this.initBody() - this.trigger('toggle', this.options.cardView) - } - - refreshOptions (options) { - // If the objects are equivalent then avoid the call of destroy / init methods - if (Utils.compareObjects(this.options, options, true)) { - return - } - this.options = $.extend(this.options, options) - this.trigger('refresh-options', this.options) - this.destroy() - this.init() - } - - resetSearch (text) { - const $search = this.$toolbar.find('.search input') - $search.val(text || '') - this.onSearch({currentTarget: $search}) - } - - expandRow_ (expand, index) { - const $tr = this.$body.find(Utils.sprintf('> tr[data-index="%s"]', index)) - if ($tr.next().is('tr.detail-view') === (!expand)) { - $tr.find('> td > .detail-icon').click() - } - } - - expandRow (index) { - this.expandRow_(true, index) - } - - collapseRow (index) { - this.expandRow_(false, index) - } - - expandAllRows (isSubTable) { - if (isSubTable) { - const $tr = this.$body.find(Utils.sprintf('> tr[data-index="%s"]', 0)) - let detailIcon = null - let executeInterval = false - let idInterval = -1 - - if (!$tr.next().is('tr.detail-view')) { - $tr.find('> td > .detail-icon').click() - executeInterval = true - } else if (!$tr.next().next().is('tr.detail-view')) { - $tr.next().find('.detail-icon').click() - executeInterval = true - } - - if (executeInterval) { - try { - idInterval = setInterval(() => { - detailIcon = this.$body.find('tr.detail-view').last().find('.detail-icon') - if (detailIcon.length > 0) { - detailIcon.click() - } else { - clearInterval(idInterval) - } - }, 1) - } catch (ex) { - clearInterval(idInterval) - } - } - } else { - const trs = this.$body.children() - for (let i = 0; i < trs.length; i++) { - this.expandRow_(true, $(trs[i]).data('index')) - } - } - } - - collapseAllRows (isSubTable) { - if (isSubTable) { - this.expandRow_(false, 0) - } else { - const trs = this.$body.children() - for (let i = 0; i < trs.length; i++) { - this.expandRow_(false, $(trs[i]).data('index')) - } - } - } - - updateFormatText (name, text) { - if (this.options[Utils.sprintf('format%s', name)]) { - if (typeof text === 'string') { - this.options[Utils.sprintf('format%s', name)] = () => text - } else if (typeof text === 'function') { - this.options[Utils.sprintf('format%s', name)] = text - } - } - this.initToolbar() - this.initPagination() - this.initBody() - } - } - - BootstrapTable.DEFAULTS = DEFAULTS - BootstrapTable.LOCALES = LOCALES - BootstrapTable.COLUMN_DEFAULTS = COLUMN_DEFAULTS - BootstrapTable.EVENTS = EVENTS - - // BOOTSTRAP TABLE PLUGIN DEFINITION - // ======================= - - const allowedMethods = [ - 'getOptions', - 'getSelections', 'getAllSelections', 'getData', - 'load', 'append', 'prepend', 'remove', 'removeAll', - 'insertRow', 'updateRow', 'updateCell', - 'updateByUniqueId', 'removeByUniqueId', - 'getRowByUniqueId', 'showRow', 'hideRow', 'getHiddenRows', - 'mergeCells', 'refreshColumnTitle', - 'checkAll', 'uncheckAll', 'checkInvert', - 'check', 'uncheck', - 'checkBy', 'uncheckBy', - 'refresh', - 'resetView', - 'resetWidth', - 'destroy', - 'showLoading', 'hideLoading', - 'showColumn', 'hideColumn', - 'getHiddenColumns', 'getVisibleColumns', - 'showAllColumns', 'hideAllColumns', - 'filterBy', - 'scrollTo', - 'getScrollPosition', - 'selectPage', 'prevPage', 'nextPage', - 'togglePagination', - 'toggleView', - 'refreshOptions', - 'resetSearch', - 'expandRow', 'collapseRow', - 'expandAllRows', 'collapseAllRows', - 'updateFormatText', 'updateCellById' - ] - - $.BootstrapTable = BootstrapTable - $.fn.bootstrapTable = function (option, ...args) { - let value - - this.each((i, el) => { - let data = $(el).data('bootstrap.table') - const options = $.extend({}, BootstrapTable.DEFAULTS, $(el).data(), - typeof option === 'object' && option) - - if (typeof option === 'string') { - if (!allowedMethods.includes(option)) { - throw new Error('Unknown method: ' + option) - } - - if (!data) { - return - } - - value = data[option].apply(data, args) - - if (option === 'destroy') { - $(el).removeData('bootstrap.table') - } - } - - if (!data) { - $(el).data('bootstrap.table', (data = new $.BootstrapTable(el, options))) - } - }) - - return typeof value === 'undefined' ? this : value - } - - $.fn.bootstrapTable.Constructor = BootstrapTable - $.fn.bootstrapTable.defaults = BootstrapTable.DEFAULTS - $.fn.bootstrapTable.columnDefaults = BootstrapTable.COLUMN_DEFAULTS - $.fn.bootstrapTable.locales = BootstrapTable.LOCALES - $.fn.bootstrapTable.methods = allowedMethods - $.fn.bootstrapTable.utils = Utils - - // BOOTSTRAP TABLE INIT - // ======================= - - $(() => { - $('[data-toggle="table"]').bootstrapTable() - }) -})(jQuery) diff --git a/hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap.min.js b/hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap.min.js deleted file mode 100644 index 7c1561a..0000000 --- a/hcframe-parent/storage/src/main/resources/static/casAssets/plugins/bootstrap-table/js/bootstrap.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! - * Bootstrap v3.2.0 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ -if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.2.0",d.prototype.close=function(b){function c(){f.detach().trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",c).emulateTransitionEnd(150):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.2.0",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),d[e](null==f[b]?this.options[b]:f[b]),setTimeout(a.proxy(function(){"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b).on("keydown.bs.carousel",a.proxy(this.keydown,this)),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.2.0",c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},c.prototype.keydown=function(a){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.to=function(b){var c=this,d=this.getItemIndex(this.$active=this.$element.find(".item.active"));return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=e[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:g});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,f&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(e)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:g});return a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one("bsTransitionEnd",function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(1e3*d.css("transition-duration").slice(0,-1))):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger(m)),f&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b);!e&&f.toggle&&"show"==b&&(b=!b),e||d.data("bs.collapse",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};c.VERSION="3.2.0",c.DEFAULTS={toggle:!0},c.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},c.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var c=a.Event("show.bs.collapse");if(this.$element.trigger(c),!c.isDefaultPrevented()){var d=this.$parent&&this.$parent.find("> .panel > .in");if(d&&d.length){var e=d.data("bs.collapse");if(e&&e.transitioning)return;b.call(d,"hide"),e||d.data("bs.collapse",null)}var f=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[f](0),this.transitioning=1;var g=function(){this.$element.removeClass("collapsing").addClass("collapse in")[f](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return g.call(this);var h=a.camelCase(["scroll",f].join("-"));this.$element.one("bsTransitionEnd",a.proxy(g,this)).emulateTransitionEnd(350)[f](this.$element[0][h])}}},c.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(d,this)).emulateTransitionEnd(350):d.call(this)}}},c.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var d=a.fn.collapse;a.fn.collapse=b,a.fn.collapse.Constructor=c,a.fn.collapse.noConflict=function(){return a.fn.collapse=d,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(c){var d,e=a(this),f=e.attr("data-target")||c.preventDefault()||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),g=a(f),h=g.data("bs.collapse"),i=h?"toggle":e.data(),j=e.attr("data-parent"),k=j&&a(j);h&&h.transitioning||(k&&k.find('[data-toggle="collapse"][data-parent="'+j+'"]').not(e).addClass("collapsed"),e[g.hasClass("in")?"addClass":"removeClass"]("collapsed")),b.call(g,i)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=c(a(this)),e={relatedTarget:this};d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown",e)),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown",e))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.2.0",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('