From 0d1218f655a37ffd899bed8afe58820608878a8d Mon Sep 17 00:00:00 2001 From: luyya Date: Thu, 5 Jun 2025 17:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E5=B7=9E=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../src/main/resources/logback-plus.xml | 11 +- .../websocket/config/WebSocketConfig.java | 3 +- .../src/main/resources/logback-plus.xml | 86 -------------- stwzhj-modules/pom.xml | 8 +- .../src/main/resources/logback-plus.xml | 105 ++++++------------ .../src/main/resources/logback-plus.xml | 86 -------------- .../src/main/resources/logback-plus.xml | 90 ++++++++++++++- .../src/main/resources/logback-plus.xml | 86 -------------- .../{stwzhj-data2es => wzhj-data2es}/pom.xml | 4 +- .../dromara/data2es/HjData2esApplication.java | 0 .../data2es/config/ElasticsearchConfig.java | 2 +- .../dromara/data2es/config/KafkaConfig.java | 2 +- .../data2es/config/KafkaSecurityUtil.java | 0 .../org/dromara/data2es/config/LoginUtil.java | 0 .../data2es/config/RedisListenerConfig.java | 0 .../controller/DataToEsController.java | 0 .../controller/DeviceInfoController.java | 0 .../dromara/data2es/domain/DSQinwuEntity.java | 0 .../org/dromara/data2es/domain/EsGpsInfo.java | 0 .../dromara/data2es/domain/EsGpsInfoVO2.java | 0 .../data2es/domain/entity/GpsInfoEntity.java | 0 .../dromara/data2es/domain/vo/DSResponse.java | 0 .../data2es/domain/vo/EsGpsInfoVO3.java | 0 .../dubbo/RemoteDataToEsServiceImpl.java | 0 .../exception/MyBusinessException.java | 0 .../handler/DataInsertBatchHandler.java | 0 .../data2es/handler/RedisExpireListener.java | 0 .../data2es/handler/RequestHandler.java | 0 .../dromara/data2es/mapper/DSQinwuMapper.java | 0 .../dromara/data2es/producer/NewProducer.java | 0 .../src/main/java/org/dromara/data2es/replace | 0 .../data2es/schedule/BaseDataSchedule.java | 0 .../dromara/data2es/schedule/GpsTaskTest.java | 0 .../data2es/service/DSQinwuService.java | 0 .../dromara/data2es/service/IGpsService.java | 0 .../data2es/service/StoreDataService.java | 0 .../service/impl/DSQinwuServiceImpl.java | 0 .../data2es/service/impl/GpsServiceImpl.java | 8 +- .../service/impl/StoreDataServiceImpl.java | 0 .../dromara/data2es/util/ConfigConstants.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 49 ++++++++ .../src/main/resources/logback-plus.xml | 103 ++++++----------- .../pom.xml | 4 +- .../dromara/location/LocationApplication.java | 0 .../location/config/ElasticsearchConfig.java | 0 .../controller/ElasticSearchController.java | 0 .../controller/LocationController.java | 41 +++---- .../dubbo/RemoteElasticSearchServiceImpl.java | 0 .../location/service/ISearchService.java | 0 .../service/impl/SearchServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 49 ++++++++ .../{stwzhj-system => wzhj-system}/Dockerfile | 0 .../{stwzhj-system => wzhj-system}/pom.xml | 4 +- .../system/RuoYiSystemApplication.java | 0 .../controller/monitor/CacheController.java | 0 .../monitor/SysLogininforController.java | 0 .../monitor/SysOperlogController.java | 0 .../monitor/SysUserOnlineController.java | 0 .../system/IndexStaticsController.java | 0 .../system/SysClientController.java | 0 .../system/SysConfigController.java | 0 .../controller/system/SysDeptController.java | 0 .../system/SysDictDataController.java | 0 .../system/SysDictTypeController.java | 0 .../controller/system/SysMenuController.java | 0 .../system/SysNoticeController.java | 0 .../controller/system/SysPostController.java | 0 .../system/SysProfileController.java | 0 .../controller/system/SysRoleController.java | 0 .../system/SysSocialController.java | 0 .../system/SysTenantController.java | 0 .../system/SysTenantPackageController.java | 0 .../controller/system/SysUserController.java | 0 .../controller/system/TDeviceController.java | 15 ++- .../dromara/system/domain/DeviceRedis.java | 0 .../org/dromara/system/domain/SysClient.java | 0 .../org/dromara/system/domain/SysConfig.java | 0 .../org/dromara/system/domain/SysDept.java | 0 .../dromara/system/domain/SysDictData.java | 0 .../dromara/system/domain/SysDictType.java | 0 .../dromara/system/domain/SysLogininfor.java | 0 .../org/dromara/system/domain/SysMenu.java | 0 .../org/dromara/system/domain/SysNotice.java | 0 .../org/dromara/system/domain/SysOperLog.java | 0 .../org/dromara/system/domain/SysPost.java | 0 .../org/dromara/system/domain/SysRole.java | 0 .../dromara/system/domain/SysRoleDept.java | 0 .../dromara/system/domain/SysRoleMenu.java | 0 .../org/dromara/system/domain/SysSocial.java | 0 .../org/dromara/system/domain/SysTenant.java | 0 .../system/domain/SysTenantPackage.java | 0 .../org/dromara/system/domain/SysUser.java | 0 .../dromara/system/domain/SysUserPost.java | 0 .../dromara/system/domain/SysUserRole.java | 0 .../org/dromara/system/domain/TDevice.java | 0 .../dromara/system/domain/bo/SysClientBo.java | 0 .../dromara/system/domain/bo/SysConfigBo.java | 0 .../dromara/system/domain/bo/SysDeptBo.java | 0 .../system/domain/bo/SysDictDataBo.java | 0 .../system/domain/bo/SysDictTypeBo.java | 0 .../system/domain/bo/SysLogininforBo.java | 0 .../dromara/system/domain/bo/SysMenuBo.java | 0 .../dromara/system/domain/bo/SysNoticeBo.java | 0 .../system/domain/bo/SysOperLogBo.java | 0 .../dromara/system/domain/bo/SysPostBo.java | 0 .../dromara/system/domain/bo/SysRoleBo.java | 0 .../dromara/system/domain/bo/SysSocialBo.java | 0 .../dromara/system/domain/bo/SysTenantBo.java | 0 .../system/domain/bo/SysTenantPackageBo.java | 0 .../dromara/system/domain/bo/SysUserBo.java | 0 .../system/domain/bo/SysUserPasswordBo.java | 0 .../system/domain/bo/SysUserProfileBo.java | 0 .../dromara/system/domain/bo/TDeviceBo.java | 4 + .../domain/convert/SysClientVoConvert.java | 0 .../domain/convert/SysDictDataVoConvert.java | 0 .../convert/SysLogininforBoConvert.java | 0 .../domain/convert/SysOperLogBoConvert.java | 0 .../domain/convert/SysSocialBoConvert.java | 0 .../domain/convert/SysSocialVoConvert.java | 0 .../domain/convert/SysTenantVoConvert.java | 0 .../domain/convert/SysUserBoConvert.java | 0 .../domain/convert/SysUserVoConvert.java | 0 .../dromara/system/domain/vo/AvatarVo.java | 0 .../system/domain/vo/CacheListInfoVo.java | 0 .../system/domain/vo/DeptTreeSelectVo.java | 0 .../system/domain/vo/DeviceRedisVo.java | 0 .../system/domain/vo/DeviceStaticsVo.java | 0 .../system/domain/vo/MenuTreeSelectVo.java | 0 .../org/dromara/system/domain/vo/MetaVo.java | 0 .../dromara/system/domain/vo/ProfileVo.java | 0 .../dromara/system/domain/vo/RouterVo.java | 0 .../dromara/system/domain/vo/SysClientVo.java | 0 .../dromara/system/domain/vo/SysConfigVo.java | 0 .../dromara/system/domain/vo/SysDeptVo.java | 0 .../system/domain/vo/SysDictDataVo.java | 0 .../system/domain/vo/SysDictTypeVo.java | 0 .../system/domain/vo/SysLogininforVo.java | 0 .../dromara/system/domain/vo/SysMenuVo.java | 0 .../dromara/system/domain/vo/SysNoticeVo.java | 0 .../system/domain/vo/SysOperLogVo.java | 0 .../dromara/system/domain/vo/SysPostVo.java | 0 .../dromara/system/domain/vo/SysRoleVo.java | 0 .../dromara/system/domain/vo/SysSocialVo.java | 0 .../system/domain/vo/SysTenantPackageVo.java | 0 .../dromara/system/domain/vo/SysTenantVo.java | 0 .../system/domain/vo/SysUserExportVo.java | 0 .../system/domain/vo/SysUserImportVo.java | 0 .../system/domain/vo/SysUserInfoVo.java | 0 .../dromara/system/domain/vo/SysUserVo.java | 0 .../system/domain/vo/TDeviceExportVo.java | 0 .../system/domain/vo/TDeviceImportVo.java | 0 .../dromara/system/domain/vo/TDeviceVo.java | 0 .../dromara/system/domain/vo/UserInfoVo.java | 0 .../system/dubbo/RemoteClientServiceImpl.java | 0 .../system/dubbo/RemoteConfigServiceImpl.java | 0 .../dubbo/RemoteDataScopeServiceImpl.java | 0 .../system/dubbo/RemoteDeptServiceImpl.java | 0 .../system/dubbo/RemoteDeviceImpl.java | 0 .../system/dubbo/RemoteDictServiceImpl.java | 0 .../system/dubbo/RemoteLogServiceImpl.java | 0 .../system/dubbo/RemoteSocialServiceImpl.java | 0 .../system/dubbo/RemoteTenantServiceImpl.java | 0 .../system/dubbo/RemoteUserServiceImpl.java | 0 .../exception/MyBusinessException.java | 2 +- .../listener/SysUserImportListener.java | 0 .../listener/TDeviceImportListener.java | 0 .../system/mapper/DeviceRedisMapper.java | 0 .../system/mapper/SysClientMapper.java | 0 .../system/mapper/SysConfigMapper.java | 0 .../dromara/system/mapper/SysDeptMapper.java | 0 .../system/mapper/SysDictDataMapper.java | 0 .../system/mapper/SysDictTypeMapper.java | 0 .../system/mapper/SysLogininforMapper.java | 0 .../dromara/system/mapper/SysMenuMapper.java | 0 .../system/mapper/SysNoticeMapper.java | 0 .../system/mapper/SysOperLogMapper.java | 0 .../dromara/system/mapper/SysPostMapper.java | 0 .../system/mapper/SysRoleDeptMapper.java | 0 .../dromara/system/mapper/SysRoleMapper.java | 0 .../system/mapper/SysRoleMenuMapper.java | 0 .../system/mapper/SysSocialMapper.java | 0 .../system/mapper/SysTenantMapper.java | 0 .../system/mapper/SysTenantPackageMapper.java | 0 .../dromara/system/mapper/SysUserMapper.java | 0 .../system/mapper/SysUserPostMapper.java | 0 .../system/mapper/SysUserRoleMapper.java | 0 .../dromara/system/mapper/TDeviceMapper.java | 0 .../system/schedule/DeviceRedisSchedule.java | 2 +- .../system/service/IDeviceRedisService.java | 0 .../system/service/ISysClientService.java | 0 .../system/service/ISysConfigService.java | 0 .../system/service/ISysDeptService.java | 0 .../system/service/ISysDictDataService.java | 0 .../system/service/ISysDictTypeService.java | 0 .../system/service/ISysLogininforService.java | 0 .../system/service/ISysMenuService.java | 0 .../system/service/ISysNoticeService.java | 0 .../system/service/ISysOperLogService.java | 0 .../system/service/ISysPermissionService.java | 0 .../system/service/ISysPostService.java | 0 .../system/service/ISysRoleService.java | 0 .../system/service/ISysSocialService.java | 0 .../service/ISysTenantPackageService.java | 0 .../system/service/ISysTenantService.java | 0 .../system/service/ISysUserService.java | 0 .../system/service/ITDeviceService.java | 0 .../service/impl/DeviceRedisServiceImpl.java | 0 .../service/impl/SysClientServiceImpl.java | 0 .../service/impl/SysConfigServiceImpl.java | 0 .../service/impl/SysDeptServiceImpl.java | 0 .../service/impl/SysDictDataServiceImpl.java | 0 .../service/impl/SysDictTypeServiceImpl.java | 0 .../impl/SysLogininforServiceImpl.java | 0 .../service/impl/SysMenuServiceImpl.java | 0 .../service/impl/SysNoticeServiceImpl.java | 0 .../service/impl/SysOperLogServiceImpl.java | 0 .../impl/SysPermissionServiceImpl.java | 0 .../service/impl/SysPostServiceImpl.java | 0 .../service/impl/SysRoleServiceImpl.java | 0 .../service/impl/SysSensitiveServiceImpl.java | 0 .../service/impl/SysSocialServiceImpl.java | 0 .../impl/SysTenantPackageServiceImpl.java | 0 .../service/impl/SysTenantServiceImpl.java | 0 .../service/impl/SysUserServiceImpl.java | 0 .../service/impl/TDeviceServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 49 ++++++++ .../src/main/resources/mapper/package-info.md | 0 .../mapper/system/DeviceRedisMapper.xml | 0 .../mapper/system/SysClientMapper.xml | 0 .../mapper/system/SysConfigMapper.xml | 0 .../resources/mapper/system/SysDeptMapper.xml | 0 .../mapper/system/SysDictDataMapper.xml | 0 .../mapper/system/SysDictTypeMapper.xml | 0 .../mapper/system/SysLogininforMapper.xml | 0 .../resources/mapper/system/SysMenuMapper.xml | 0 .../mapper/system/SysNoticeMapper.xml | 0 .../mapper/system/SysOperLogMapper.xml | 0 .../resources/mapper/system/SysPostMapper.xml | 0 .../mapper/system/SysRoleDeptMapper.xml | 0 .../resources/mapper/system/SysRoleMapper.xml | 0 .../mapper/system/SysRoleMenuMapper.xml | 0 .../mapper/system/SysSocialMapper.xml | 0 .../mapper/system/SysTenantMapper.xml | 0 .../mapper/system/SysTenantPackageMapper.xml | 0 .../resources/mapper/system/SysUserMapper.xml | 0 .../mapper/system/SysUserPostMapper.xml | 0 .../mapper/system/SysUserRoleMapper.xml | 0 .../resources/mapper/system/TDeviceMapper.xml | 0 .../org/dromara/udp/config/AsyncUtils.java | 5 +- .../src/main/resources/logback-plus.xml | 103 ++++++----------- .../src/main/resources/logback-plus.xml | 86 -------------- .../pom.xml | 4 +- .../websocket}/ZfjlyWebscoketApplication.java | 2 +- .../websocket}/config/AsyncConfiguration.java | 2 +- .../websocket}/config/TestController.java | 2 +- .../websocket}/config/ThreadConfig.java | 8 +- .../constants/WebSocketMessageConstant.java | 2 +- .../domain/LocationZfjlyEntity.java | 2 +- .../domain/LocationZfjlyEntityXml.java | 2 +- .../websocket}/domain/OriginDevice.java | 2 +- .../dromara/websocket}/domain/XmlEntity.java | 2 +- .../exception/MyBusinessException.java | 54 +++++++++ ...MyApplicationContextRefreshedListener.java | 4 +- .../handler/MyWebSocketClientHandler.java | 4 +- .../websocket}/mapper/OriginDeviceMapper.java | 4 +- .../websocket}/schedule/DeviceSchedule.java | 6 +- .../schedule/DeviceStatusSchedule.java | 6 +- .../strategy/ChuZhouTextMessageHandler.java | 10 +- .../strategy/IMessageHandleStrategy.java | 2 +- .../strategy/TextMessageHandler.java | 10 +- .../strategy/TonglingTextMessageHandler.java | 6 +- .../strategy/WebMessageContext.java | 4 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-plus.xml | 49 ++++++++ .../resources/mapper/OriginDeviceMapper.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.properties | 2 +- {stwzhj-gateway => wzhj-gateway}/Dockerfile | 0 {stwzhj-gateway => wzhj-gateway}/pom.xml | 2 +- .../callback/DefaultBlockRequestHandler.java | 0 .../gateway/RuoYiGatewayApplication.java | 0 .../dromara/gateway/config/GatewayConfig.java | 0 .../properties/ApiDecryptProperties.java | 0 .../properties/CustomGatewayProperties.java | 0 .../properties/IgnoreWhiteProperties.java | 0 .../dromara/gateway/filter/AuthFilter.java | 0 .../gateway/filter/BlackListUrlFilter.java | 0 .../gateway/filter/ForwardAuthFilter.java | 0 .../filter/GlobalCacheRequestFilter.java | 0 .../gateway/filter/GlobalCorsFilter.java | 0 .../gateway/filter/GlobalI18nFilter.java | 0 .../gateway/filter/GlobalLogFilter.java | 0 .../gateway/filter/WebSocketAuthFilter.java | 0 .../handler/GatewayExceptionHandler.java | 0 .../handler/SentinelFallbackHandler.java | 0 .../dromara/gateway/utils/WebFluxUtils.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 49 +++++--- 306 files changed, 583 insertions(+), 672 deletions(-) delete mode 100644 stwzhj-gateway/src/main/resources/logback-plus.xml delete mode 100644 stwzhj-modules/stwzhj-data2es/src/main/resources/logback-plus.xml delete mode 100644 stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/pom.xml (98%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/HjData2esApplication.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java (96%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/config/KafkaConfig.java (98%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/config/LoginUtil.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/controller/DataToEsController.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/domain/DSQinwuEntity.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/domain/vo/DSResponse.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/domain/vo/EsGpsInfoVO3.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/exception/MyBusinessException.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/handler/RequestHandler.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/mapper/DSQinwuMapper.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/producer/NewProducer.java (100%) create mode 100644 stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/replace rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/service/DSQinwuService.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/service/IGpsService.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/service/StoreDataService.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java (98%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/service/impl/StoreDataServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/java/org/dromara/data2es/util/ConfigConstants.java (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/resources/application.yml (100%) rename stwzhj-modules/{stwzhj-data2es => wzhj-data2es}/src/main/resources/banner.txt (100%) create mode 100644 stwzhj-modules/wzhj-data2es/src/main/resources/logback-plus.xml rename stwzhj-modules/{stwzhj-location => wzhj-location}/pom.xml (98%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/LocationApplication.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/config/ElasticsearchConfig.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/controller/ElasticSearchController.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/controller/LocationController.java (86%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/service/ISearchService.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/resources/application.yml (100%) rename stwzhj-modules/{stwzhj-location => wzhj-location}/src/main/resources/banner.txt (100%) create mode 100644 stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml rename stwzhj-modules/{stwzhj-system => wzhj-system}/Dockerfile (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/pom.xml (98%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/RuoYiSystemApplication.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/CacheController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysClientController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysConfigController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysDeptController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysDictDataController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysMenuController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysNoticeController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysPostController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysProfileController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysRoleController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysSocialController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysTenantController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/SysUserController.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/controller/system/TDeviceController.java (89%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/DeviceRedis.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysClient.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysConfig.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysDept.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysDictData.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysDictType.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysLogininfor.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysMenu.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysNotice.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysOperLog.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysPost.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysRole.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysRoleDept.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysRoleMenu.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysSocial.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysTenant.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysTenantPackage.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysUser.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysUserPost.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/SysUserRole.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/TDevice.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysClientBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysPostBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysUserBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java (97%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/AvatarVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/MetaVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/ProfileVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/RouterVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysClientVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysPostVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/SysUserVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java (100%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-system/src/main/java/org/dromara/system}/exception/MyBusinessException.java (96%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/listener/SysUserImportListener.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/listener/TDeviceImportListener.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysClientMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysConfigMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysDeptMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysMenuMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysPostMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysRoleMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysSocialMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysTenantMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysUserMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/mapper/TDeviceMapper.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java (98%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/IDeviceRedisService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysClientService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysConfigService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysDeptService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysDictDataService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysDictTypeService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysLogininforService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysMenuService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysNoticeService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysOperLogService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysPermissionService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysPostService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysRoleService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysSocialService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysTenantPackageService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysTenantService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ISysUserService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/ITDeviceService.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/application.yml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/banner.txt (100%) create mode 100644 stwzhj-modules/wzhj-system/src/main/resources/logback-plus.xml rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/package-info.md (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/DeviceRedisMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysClientMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysConfigMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysDeptMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysDictDataMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysDictTypeMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysLogininforMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysMenuMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysNoticeMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysOperLogMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysPostMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysRoleDeptMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysRoleMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysRoleMenuMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysSocialMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysTenantMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysTenantPackageMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysUserMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysUserPostMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/SysUserRoleMapper.xml (100%) rename stwzhj-modules/{stwzhj-system => wzhj-system}/src/main/resources/mapper/system/TDeviceMapper.xml (100%) delete mode 100644 stwzhj-modules/wzhj-webscoket/src/main/resources/logback-plus.xml rename stwzhj-modules/{wzhj-webscoket => wzhj-websocket}/pom.xml (98%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/ZfjlyWebscoketApplication.java (96%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/config/AsyncConfiguration.java (96%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/config/TestController.java (97%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/config/ThreadConfig.java (67%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/constants/WebSocketMessageConstant.java (91%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/domain/LocationZfjlyEntity.java (99%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/domain/LocationZfjlyEntityXml.java (99%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/domain/OriginDevice.java (97%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/domain/XmlEntity.java (99%) create mode 100644 stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/exception/MyBusinessException.java rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/handler/MyApplicationContextRefreshedListener.java (93%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/handler/MyWebSocketClientHandler.java (97%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/mapper/OriginDeviceMapper.java (74%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/schedule/DeviceSchedule.java (97%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/schedule/DeviceStatusSchedule.java (95%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/strategy/ChuZhouTextMessageHandler.java (96%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/strategy/IMessageHandleStrategy.java (85%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/strategy/TextMessageHandler.java (97%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/strategy/TonglingTextMessageHandler.java (98%) rename stwzhj-modules/{wzhj-webscoket/src/main/java/org/dromara/webscoket => wzhj-websocket/src/main/java/org/dromara/websocket}/strategy/WebMessageContext.java (94%) rename stwzhj-modules/{wzhj-webscoket => wzhj-websocket}/src/main/resources/application.yml (96%) create mode 100644 stwzhj-modules/wzhj-websocket/src/main/resources/logback-plus.xml rename stwzhj-modules/{wzhj-webscoket => wzhj-websocket}/src/main/resources/mapper/OriginDeviceMapper.xml (72%) rename {stwzhj-gateway => wzhj-gateway}/Dockerfile (100%) rename {stwzhj-gateway => wzhj-gateway}/pom.xml (99%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/config/GatewayConfig.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/AuthFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/filter/WebSocketAuthFilter.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/resources/application.yml (100%) rename {stwzhj-gateway => wzhj-gateway}/src/main/resources/banner.txt (100%) rename {stwzhj-modules/stwzhj-location => wzhj-gateway}/src/main/resources/logback-plus.xml (75%) diff --git a/pom.xml b/pom.xml index 912ad929..b6d5e180 100644 --- a/pom.xml +++ b/pom.xml @@ -376,7 +376,7 @@ stwzhj-auth - stwzhj-gateway + wzhj-gateway stwzhj-visual stwzhj-modules stwzhj-api diff --git a/stwzhj-auth/src/main/resources/logback-plus.xml b/stwzhj-auth/src/main/resources/logback-plus.xml index 909b3020..ce76b73b 100644 --- a/stwzhj-auth/src/main/resources/logback-plus.xml +++ b/stwzhj-auth/src/main/resources/logback-plus.xml @@ -2,6 +2,7 @@ + @@ -37,13 +38,13 @@ 如果同时有和，那么当天日志是，明天会自动把今天 的日志改名为今天的日期。即， 的日志都是当天的。 --> - ${LOG_PATH}${LOG_FILE} + ${log.path}${log.file} UTF-8 %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz + ${log.path}info/${log.file}.%d{yyyy-MM-dd}.%i.gz 50MB 20 @@ -59,11 +60,11 @@ 如果同时有和，那么当天日志是，明天会自动把今天 的日志改名为今天的日期。即， 的日志都是当天的。 --> - ${LOG_PATH}error.${LOG_FILE} + ${log.path}error.${log.file} - + - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz + ${log.path}error/${log.file}.%d{yyyy-MM-dd}.%i.gz 50MB 180 diff --git a/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java index ef5cfc96..afdb94cb 100644 --- a/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java +++ b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java @@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; @@ -19,7 +20,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor; * * @author zendwang */ -@AutoConfiguration +@Configuration @ConditionalOnProperty(value = "websocket.enabled", havingValue = "true") @EnableConfigurationProperties(WebSocketProperties.class) @EnableWebSocket diff --git a/stwzhj-gateway/src/main/resources/logback-plus.xml b/stwzhj-gateway/src/main/resources/logback-plus.xml deleted file mode 100644 index 909b3020..00000000 --- a/stwzhj-gateway/src/main/resources/logback-plus.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ERROR - - DENY - - ACCEPT - - - ${LOG_PATH}${LOG_FILE} - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - 50MB - 20 - - - - - - - - Error - - - ${LOG_PATH}error.${LOG_FILE} - - - - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - - 50MB - 180 - - - - - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - - - - - - - - diff --git a/stwzhj-modules/pom.xml b/stwzhj-modules/pom.xml index 54edfd46..fbcf75e4 100644 --- a/stwzhj-modules/pom.xml +++ b/stwzhj-modules/pom.xml @@ -9,18 +9,18 @@ 4.0.0 - stwzhj-system + wzhj-system stwzhj-gen stwzhj-job stwzhj-resource stwzhj-workflow - stwzhj-data2es + wzhj-data2es stwzhj-baseToSt stwzhj-consumer - stwzhj-location + wzhj-location stwzhj-dataToGas stwzhj-kafkaToWebsocket - wzhj-webscoket + wzhj-websocket wzhj-extract wzhj-udp diff --git a/stwzhj-modules/stwzhj-consumer/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-consumer/src/main/resources/logback-plus.xml index efdad6ff..d71cb666 100644 --- a/stwzhj-modules/stwzhj-consumer/src/main/resources/logback-plus.xml +++ b/stwzhj-modules/stwzhj-consumer/src/main/resources/logback-plus.xml @@ -1,86 +1,49 @@ - - - - - - - - - - - - - - - - + + + + + + + + ${log.path}/info.${log.file}.log - - ERROR - - DENY - - ACCEPT + INFO + ACCEPT + DENY - - ${LOG_PATH}${LOG_FILE} - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - 50MB - 20 + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} - - - - - - - Error - - - ${LOG_PATH}error.${LOG_FILE} - - - - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - - 50MB - 180 - - - - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + - - - + + + diff --git a/stwzhj-modules/stwzhj-data2es/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-data2es/src/main/resources/logback-plus.xml deleted file mode 100644 index 909b3020..00000000 --- a/stwzhj-modules/stwzhj-data2es/src/main/resources/logback-plus.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ERROR - - DENY - - ACCEPT - - - ${LOG_PATH}${LOG_FILE} - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - 50MB - 20 - - - - - - - - Error - - - ${LOG_PATH}error.${LOG_FILE} - - - - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - - 50MB - 180 - - - - - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - - - - - - - - diff --git a/stwzhj-modules/stwzhj-resource/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-resource/src/main/resources/logback-plus.xml index a2e187f8..e9f4d70d 100644 --- a/stwzhj-modules/stwzhj-resource/src/main/resources/logback-plus.xml +++ b/stwzhj-modules/stwzhj-resource/src/main/resources/logback-plus.xml @@ -1,28 +1,106 @@ - + + + + + + ${console.log.pattern} + utf-8 + + + - + + ${log.path}/console.log + + + ${log.path}/console.%d{yyyy-MM-dd}.log + + 1 + - ${console.log.pattern} + ${log.pattern} utf-8 + + + INFO + + + + + + + + + + ERROR + + DENY + + ACCEPT + + + ${log.path}${log.file} + + UTF-8 + %date [%level] [%thread] %logger{60} [%file : %line] %msg%n + + + ${log.path}info/${log.file}.%d{yyyy-MM-dd}.%i.gz + 50MB + 20 + + + + + + + + Error + + + ${log.path}error.${log.file} + + + + ${log.path}error/${log.file}.%d{yyyy-MM-dd}.%i.gz + + 50MB + 180 + + + + + + UTF-8 + %date [%level] [%thread] %logger{60} [%file : %line] %msg%n + - - - + + + + diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml deleted file mode 100644 index 909b3020..00000000 --- a/stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ERROR - - DENY - - ACCEPT - - - ${LOG_PATH}${LOG_FILE} - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - 50MB - 20 - - - - - - - - Error - - - ${LOG_PATH}error.${LOG_FILE} - - - - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - - 50MB - 180 - - - - - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - - - - - - - - diff --git a/stwzhj-modules/stwzhj-data2es/pom.xml b/stwzhj-modules/wzhj-data2es/pom.xml similarity index 98% rename from stwzhj-modules/stwzhj-data2es/pom.xml rename to stwzhj-modules/wzhj-data2es/pom.xml index 3b749d9d..13953dbd 100644 --- a/stwzhj-modules/stwzhj-data2es/pom.xml +++ b/stwzhj-modules/wzhj-data2es/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - stwzhj-data2es + wzhj-data2es - stwzhj-data2es位置汇聚数据处理 + wzhj-data2es位置汇聚数据处理 diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/HjData2esApplication.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/HjData2esApplication.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/HjData2esApplication.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/HjData2esApplication.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java similarity index 96% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java index a41e0289..44217c19 100644 --- a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java @@ -68,7 +68,7 @@ public class ElasticsearchConfig { RestClientBuilder builder = RestClient.builder(httpHost); // 设置用户名、密码 CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); -// credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password)); + credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password)); // 连接延时配置 builder.setRequestConfigCallback(requestConfigBuilder -> { requestConfigBuilder.setConnectTimeout(connectTimeOut); diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java similarity index 98% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java index fedb34ec..00563135 100644 --- a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java @@ -27,7 +27,7 @@ public class KafkaConfig { // private String kafkaServers = "140.168.2.31:21007,140.168.2.32:21007,140.168.2.33:21007"; // private String kafkaServers = "53.208.61.105:6667,53.208.61.106:6667,53.208.61.107:6667";//六安GA网 // private String kafkaServers = "34.72.62.93:9092";//六安视频网 - private String kafkaServers = "127.0.0.1:9092";//本地 + private String kafkaServers = "53.176.146.99:9092,53.176.146.100:9092,53.176.146.101:9092";//本地 // private String kafkaServers = "53.238.79.4:9092,53.238.79.5:9092,53.238.79.6:9092";//省厅 马伟提供 private String groupId = "ruansiProducer"; diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/LoginUtil.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/LoginUtil.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/LoginUtil.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/LoginUtil.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DataToEsController.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/controller/DataToEsController.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DataToEsController.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/controller/DataToEsController.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/DSQinwuEntity.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/DSQinwuEntity.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/DSQinwuEntity.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/DSQinwuEntity.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/DSResponse.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/DSResponse.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/DSResponse.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/DSResponse.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/EsGpsInfoVO3.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/EsGpsInfoVO3.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/EsGpsInfoVO3.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/domain/vo/EsGpsInfoVO3.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/exception/MyBusinessException.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/exception/MyBusinessException.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/exception/MyBusinessException.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/exception/MyBusinessException.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/mapper/DSQinwuMapper.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/mapper/DSQinwuMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/mapper/DSQinwuMapper.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/mapper/DSQinwuMapper.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/producer/NewProducer.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/producer/NewProducer.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/producer/NewProducer.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/producer/NewProducer.java diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/replace b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/replace new file mode 100644 index 00000000..e69de29b diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/DSQinwuService.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/DSQinwuService.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/DSQinwuService.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/DSQinwuService.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/IGpsService.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/IGpsService.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/IGpsService.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/IGpsService.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/StoreDataService.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/StoreDataService.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/StoreDataService.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/StoreDataService.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java similarity index 98% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java index aa572c7c..55993988 100644 --- a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java @@ -110,11 +110,12 @@ public class GpsServiceImpl implements IGpsService { List deleteKeys = new ArrayList<>(); BulkRequest bulkRequest = new BulkRequest(); for (EsGpsInfoVO2 info : list) { - + String deviceType = info.getDeviceType(); + String deviceCode = info.getDeviceCode(); //设置地市zzjgdm info = getInfo(info); if (Objects.isNull(info)) { - logger.error("redis中的Object=null，deviceType={},deviceCode={}",info.getDeviceType(),info.getDeviceCode()); + logger.error("redis或者mysql中的Object=null，deviceType={},deviceCode={}",deviceType,deviceCode); continue; } //redis @@ -144,6 +145,9 @@ public class GpsServiceImpl implements IGpsService { public R saveData(EsGpsInfoVO2 info) throws ExecutionException, InterruptedException{ //设置地市zzjgdm info = getInfo(info); + if (null == info){ + return R.fail(-1,"保存失败,暂无基础信息"); + } IndexRequest indexRequest = buildEsIndexRequest(info); //存es CompletableFuture esFuture = doRequest(info); diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/StoreDataServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/StoreDataServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/StoreDataServiceImpl.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/StoreDataServiceImpl.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/util/ConfigConstants.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/util/ConfigConstants.java similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/util/ConfigConstants.java rename to stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/util/ConfigConstants.java diff --git a/stwzhj-modules/stwzhj-data2es/src/main/resources/application.yml b/stwzhj-modules/wzhj-data2es/src/main/resources/application.yml similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/resources/application.yml rename to stwzhj-modules/wzhj-data2es/src/main/resources/application.yml diff --git a/stwzhj-modules/stwzhj-data2es/src/main/resources/banner.txt b/stwzhj-modules/wzhj-data2es/src/main/resources/banner.txt similarity index 100% rename from stwzhj-modules/stwzhj-data2es/src/main/resources/banner.txt rename to stwzhj-modules/wzhj-data2es/src/main/resources/banner.txt diff --git a/stwzhj-modules/wzhj-data2es/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-data2es/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..b144d683 --- /dev/null +++ b/stwzhj-modules/wzhj-data2es/src/main/resources/logback-plus.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + ${log.path}/info.${log.file}.log + + INFO + ACCEPT + DENY + + + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + diff --git a/stwzhj-modules/wzhj-extract/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-extract/src/main/resources/logback-plus.xml index 909b3020..6b92c630 100644 --- a/stwzhj-modules/wzhj-extract/src/main/resources/logback-plus.xml +++ b/stwzhj-modules/wzhj-extract/src/main/resources/logback-plus.xml @@ -1,86 +1,49 @@ - + + + + - - - - - - - - - - - - - - + + + ${log.path}/info.${log.file}.log - - ERROR - - DENY - - ACCEPT + INFO + ACCEPT + DENY - - ${LOG_PATH}${LOG_FILE} - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - 50MB - 20 + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} - - - - - - - Error - - - ${LOG_PATH}error.${LOG_FILE} - - - - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - - 50MB - 180 - - - - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + - - - + + + diff --git a/stwzhj-modules/stwzhj-location/pom.xml b/stwzhj-modules/wzhj-location/pom.xml similarity index 98% rename from stwzhj-modules/stwzhj-location/pom.xml rename to stwzhj-modules/wzhj-location/pom.xml index 63703e66..6bcb3603 100644 --- a/stwzhj-modules/stwzhj-location/pom.xml +++ b/stwzhj-modules/wzhj-location/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - stwzhj-location + wzhj-location - stwzhj-location位置汇聚坐标点位历史轨迹 + wzhj-location位置汇聚坐标点位历史轨迹 diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/LocationApplication.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/LocationApplication.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/LocationApplication.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/LocationApplication.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java similarity index 86% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java index 7082cd53..eb2731a6 100644 --- a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java +++ b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java @@ -27,6 +27,7 @@ import redis.clients.jedis.resps.GeoRadiusResponse; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; @Configuration @RestController @@ -49,7 +50,6 @@ public class LocationController { * */ @PostMapping("/getAllLocation") public R getAllLocaltion(@RequestBody Map params){ - String now = DateUtil.format(new Date(),"YYYY-MM-dd"); String keys = "online_users:"; String key = null; // 在不同条件下赋值 最后根据此key取值 if(CollectionUtils.isEmpty(params)){ @@ -62,9 +62,9 @@ public class LocationController { } if (null != params.get("type")){ String type = params.get("type").toString(); - key = keys + "*:[" +type+"]:*"; + key = keys + "[" +type+"]:*"; if (null != params.get("deptId")){ - key = keys + params.get("deptId").toString() + "*:["+type+"]:*"; // key值为 online_users:2022-04-20:3401*:[01,02]:* + key = keys + params.get("deptId").toString() + ":["+type+"]:*"; // key值为 online_users:2022-04-20:3401*:[01,02]:* } }else { @@ -98,33 +98,34 @@ public class LocationController { times = params.get("times").toString(); } String zzjgdms = ""; - List dlist = new ArrayList<>(); + List dlist = new ArrayList<>(); if (null != params.get("type")){ //类型不为空时 查询Redis数据 String type = params.get("type").toString(); // String[] types = Convert.toStrArray(type); + String key = keys + "["+type+"]:*"; // key值为 online_users:[01,02]:* zzjgdms = params.get("zzjgdm").toString(); String[] zzjgdm = Convert.toStrArray(zzjgdms); - for (String s : zzjgdm) { - s = deptIdSub(s); - String key = keys + s + ":["+type+"]:*"; // key值为 online_users:3401xxxx:[01,02]:* - List list = RedisUtils.searchAndGetKeysValues(key); - list.removeAll(Collections.singleton(null)); - dlist.addAll(list); - } + Set targetSet = new HashSet<>(List.of(zzjgdm)); // 转为HashSet提高查询效率 + List list = RedisUtils.searchAndGetKeysValues(key); + list.removeAll(Collections.singleton(null)); + List matchedObjects = list.stream() + .filter(obj -> targetSet.contains(obj.getStr("zzjgdm"))) + .collect(Collectors.toList()); //根据前端勾选机构和全部的redis记录匹配是否包含 这样减少多次查询和查库 + dlist.addAll(matchedObjects); }else { + String key = keys + "*"; // key值为 online_users:* zzjgdms = params.get("zzjgdm").toString(); String[] zzjgdm = Convert.toStrArray(zzjgdms); - for (String s : zzjgdm) { - s = deptIdSub(s); - String key = keys + s + ":*"; - List list = RedisUtils.searchAndGetKeysValues(key); - list.removeAll(Collections.singleton(null)); - dlist.addAll(list); - } + Set targetSet = new HashSet<>(List.of(zzjgdm)); // 转为HashSet提高查询效率 + List list = RedisUtils.searchAndGetKeysValues(key); + list.removeAll(Collections.singleton(null)); + List matchedObjects = list.stream() + .filter(obj -> targetSet.contains(obj.getStr("zzjgdm"))) + .collect(Collectors.toList()); //根据前端勾选机构和全部的redis记录匹配是否包含 这样减少多次查询和查库 + dlist.addAll(matchedObjects); } JSONArray.toJSONString(dlist); - if ("1".equals(times)){ - List nearList = new ArrayList<>(); + if ("1".equals(times)){ List nearList = new ArrayList<>(); for (Object o : dlist) { JSONObject object = JSONUtil.parseObj(o); Integer online = object.getInt("online"); diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/dubbo/RemoteElasticSearchServiceImpl.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/ISearchService.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/ISearchService.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/ISearchService.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/ISearchService.java diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java rename to stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/application.yml b/stwzhj-modules/wzhj-location/src/main/resources/application.yml similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/resources/application.yml rename to stwzhj-modules/wzhj-location/src/main/resources/application.yml diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/banner.txt b/stwzhj-modules/wzhj-location/src/main/resources/banner.txt similarity index 100% rename from stwzhj-modules/stwzhj-location/src/main/resources/banner.txt rename to stwzhj-modules/wzhj-location/src/main/resources/banner.txt diff --git a/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..fcb89dcf --- /dev/null +++ b/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + ${log.path}/info.${log.file}.log + + INFO + ACCEPT + DENY + + + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + diff --git a/stwzhj-modules/stwzhj-system/Dockerfile b/stwzhj-modules/wzhj-system/Dockerfile similarity index 100% rename from stwzhj-modules/stwzhj-system/Dockerfile rename to stwzhj-modules/wzhj-system/Dockerfile diff --git a/stwzhj-modules/stwzhj-system/pom.xml b/stwzhj-modules/wzhj-system/pom.xml similarity index 98% rename from stwzhj-modules/stwzhj-system/pom.xml rename to stwzhj-modules/wzhj-system/pom.xml index e638f8c2..e36e422c 100644 --- a/stwzhj-modules/stwzhj-system/pom.xml +++ b/stwzhj-modules/wzhj-system/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - stwzhj-system + wzhj-system - stwzhj-system系统模块 + wzhj-system系统模块 diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java similarity index 89% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java index ac6b3bb1..40e8563f 100644 --- a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java @@ -1,7 +1,8 @@ -package org.dromara.system.controller; +package org.dromara.system.controller.system; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -11,6 +12,7 @@ import org.dromara.common.excel.core.ExcelResult; import org.dromara.system.domain.vo.SysUserImportVo; import org.dromara.system.domain.vo.TDeviceExportVo; import org.dromara.system.domain.vo.TDeviceImportVo; +import org.dromara.system.exception.MyBusinessException; import org.dromara.system.listener.SysUserImportListener; import org.dromara.system.listener.TDeviceImportListener; import org.springframework.http.MediaType; @@ -55,6 +57,17 @@ public class TDeviceController extends BaseController { return tDeviceService.queryPageList(bo, pageQuery); } + @PostMapping("/getDeviceList") + public TableDataInfo getDeviceList(@RequestBody TDeviceBo bo){ + PageQuery pageQuery = new PageQuery(); + if (Objects.isNull(bo)) { + throw new MyBusinessException("请求参数不能为空"); + } + pageQuery.setPageNum(bo.getPageNum()); + pageQuery.setPageSize(bo.getPageSize()); + return tDeviceService.queryPageList(bo, pageQuery); + } + /** * 导出device列表 */ diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysClient.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysClient.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysClient.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysClient.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDept.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDept.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDept.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDept.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysPost.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysPost.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysPost.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysPost.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRole.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRole.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRole.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRole.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUser.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUser.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/TDevice.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/TDevice.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/TDevice.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/TDevice.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java similarity index 97% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java index ccdc3b25..33ac9b48 100644 --- a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java @@ -96,6 +96,10 @@ public class TDeviceBo extends BaseEntity { */ private String remark2; + private int pageNum; + + private int pageSize; + private String[] zzjgdms; diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/exception/MyBusinessException.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/exception/MyBusinessException.java similarity index 96% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/exception/MyBusinessException.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/exception/MyBusinessException.java index 010009bc..6a692bce 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/exception/MyBusinessException.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/exception/MyBusinessException.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.exception; +package org.dromara.system.exception; /** *

description:

diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java similarity index 98% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java index bda57b27..7c219e82 100644 --- a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java @@ -39,7 +39,7 @@ public class DeviceRedisSchedule { /* * 把Redis中 online_user数据存入t_device_redis表中 * */ -// @Scheduled(cron = "0/30 * * * * ?") + @Scheduled(cron = "0/30 * * * * ?") public void handleDeviceRedis(){ List jlist = RedisUtils.searchAndGetKeysValues("online_users:*"); redisService.insertBatch(BeanUtil.copyToList(jlist, DeviceRedis.class)); diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java rename to stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/application.yml b/stwzhj-modules/wzhj-system/src/main/resources/application.yml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/application.yml rename to stwzhj-modules/wzhj-system/src/main/resources/application.yml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/banner.txt b/stwzhj-modules/wzhj-system/src/main/resources/banner.txt similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/banner.txt rename to stwzhj-modules/wzhj-system/src/main/resources/banner.txt diff --git a/stwzhj-modules/wzhj-system/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-system/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..ef7fff34 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/resources/logback-plus.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + ${log.path}/info.${log.file}.log + + INFO + ACCEPT + DENY + + + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/package-info.md b/stwzhj-modules/wzhj-system/src/main/resources/mapper/package-info.md similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/package-info.md rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/package-info.md diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysClientMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysClientMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysClientMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysClientMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysPostMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysPostMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml similarity index 100% rename from stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml rename to stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml diff --git a/stwzhj-modules/wzhj-udp/src/main/java/org/dromara/udp/config/AsyncUtils.java b/stwzhj-modules/wzhj-udp/src/main/java/org/dromara/udp/config/AsyncUtils.java index d0fd2368..e2e51c77 100644 --- a/stwzhj-modules/wzhj-udp/src/main/java/org/dromara/udp/config/AsyncUtils.java +++ b/stwzhj-modules/wzhj-udp/src/main/java/org/dromara/udp/config/AsyncUtils.java @@ -100,10 +100,13 @@ public class AsyncUtils { logger.error("height:"+height); logger.error("jingdu:"+jingdu); - long year = BitConverter.byteArrayToShort(Arrays.copyOfRange(copyByte, 44, 46), false); + long year = BitConverter.byteArrayToShort(Arrays.copyOfRange(copyByte, 44, 46), true); + logger.error("year:"+year); //月日时分秒 byte[] sfm = Arrays.copyOfRange(copyByte, 46, 51); String time = singleByteToString2(sfm); + String time2 = singleByteToString2(sfm); + logger.error("time2:"+time2); logger.error("time:"+year+time); return BuilderEsGpsInfo(gpsId, lonD, latD, speed, angle, height, jingdu, (year + time)); diff --git a/stwzhj-modules/wzhj-udp/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-udp/src/main/resources/logback-plus.xml index 909b3020..57e5c7e8 100644 --- a/stwzhj-modules/wzhj-udp/src/main/resources/logback-plus.xml +++ b/stwzhj-modules/wzhj-udp/src/main/resources/logback-plus.xml @@ -1,86 +1,49 @@ - + + + + - - - - - - - - - - - - - - + + + ${log.path}/info.${log.file}.log - - ERROR - - DENY - - ACCEPT + INFO + ACCEPT + DENY - - ${LOG_PATH}${LOG_FILE} - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - 50MB - 20 + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} - - - - - - - Error - - - ${LOG_PATH}error.${LOG_FILE} - - - - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - - 50MB - 180 - - - - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + - - - + + + diff --git a/stwzhj-modules/wzhj-webscoket/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-webscoket/src/main/resources/logback-plus.xml deleted file mode 100644 index 909b3020..00000000 --- a/stwzhj-modules/wzhj-webscoket/src/main/resources/logback-plus.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ERROR - - DENY - - ACCEPT - - - ${LOG_PATH}${LOG_FILE} - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - 50MB - 20 - - - - - - - - Error - - - ${LOG_PATH}error.${LOG_FILE} - - - - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz - - 50MB - 180 - - - - - - UTF-8 - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - - - - - - - - - - diff --git a/stwzhj-modules/wzhj-webscoket/pom.xml b/stwzhj-modules/wzhj-websocket/pom.xml similarity index 98% rename from stwzhj-modules/wzhj-webscoket/pom.xml rename to stwzhj-modules/wzhj-websocket/pom.xml index 02d179d2..01ae1289 100644 --- a/stwzhj-modules/wzhj-webscoket/pom.xml +++ b/stwzhj-modules/wzhj-websocket/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - wzhj-webscoket + wzhj-websocket - wzhj-webscoket记录仪数据接收 + wzhj-websocket记录仪数据接收 diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/ZfjlyWebscoketApplication.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/ZfjlyWebscoketApplication.java similarity index 96% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/ZfjlyWebscoketApplication.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/ZfjlyWebscoketApplication.java index 7e29ffc3..0b0d9062 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/ZfjlyWebscoketApplication.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/ZfjlyWebscoketApplication.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket; +package org.dromara.websocket; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/AsyncConfiguration.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/AsyncConfiguration.java similarity index 96% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/AsyncConfiguration.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/AsyncConfiguration.java index bdd86700..c3e44de3 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/AsyncConfiguration.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/AsyncConfiguration.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.config; +package org.dromara.websocket.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/TestController.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/TestController.java similarity index 97% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/TestController.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/TestController.java index 26277ffb..82142225 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/TestController.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/TestController.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.config; +package org.dromara.websocket.config; import cn.hutool.core.date.DateUtil; import lombok.extern.slf4j.Slf4j; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/ThreadConfig.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/ThreadConfig.java similarity index 67% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/ThreadConfig.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/ThreadConfig.java index 0c481820..70567430 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/ThreadConfig.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/config/ThreadConfig.java @@ -1,8 +1,6 @@ -package org.dromara.webscoket.config; +package org.dromara.websocket.config; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; import java.util.concurrent.ScheduledThreadPoolExecutor; @@ -12,8 +10,8 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; * @author chenle * @date 2022-03-15 10:11 */ -@Configuration -@EnableScheduling +//@Configuration +//@EnableScheduling public class ThreadConfig { @Bean public ScheduledThreadPoolExecutor scheduledExecutorService() { diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/constants/WebSocketMessageConstant.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/constants/WebSocketMessageConstant.java similarity index 91% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/constants/WebSocketMessageConstant.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/constants/WebSocketMessageConstant.java index 11d3866e..dbd910b6 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/constants/WebSocketMessageConstant.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/constants/WebSocketMessageConstant.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.constants; +package org.dromara.websocket.constants; /** *

description:

diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntity.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/LocationZfjlyEntity.java similarity index 99% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntity.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/LocationZfjlyEntity.java index 9f5afd0c..e7423e3b 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntity.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/LocationZfjlyEntity.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.domain; +package org.dromara.websocket.domain; import java.util.List; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntityXml.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/LocationZfjlyEntityXml.java similarity index 99% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntityXml.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/LocationZfjlyEntityXml.java index 599b8b82..5d673b7d 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntityXml.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/LocationZfjlyEntityXml.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.domain; +package org.dromara.websocket.domain; import java.util.List; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/OriginDevice.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/OriginDevice.java similarity index 97% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/OriginDevice.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/OriginDevice.java index d116943a..93c3cb9a 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/OriginDevice.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/OriginDevice.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.domain; +package org.dromara.websocket.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/XmlEntity.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/XmlEntity.java similarity index 99% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/XmlEntity.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/XmlEntity.java index fec1f8f9..d5699a5c 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/XmlEntity.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/domain/XmlEntity.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.domain; +package org.dromara.websocket.domain; import java.util.List; diff --git a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/exception/MyBusinessException.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/exception/MyBusinessException.java new file mode 100644 index 00000000..dbad967c --- /dev/null +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/exception/MyBusinessException.java @@ -0,0 +1,54 @@ +package org.dromara.websocket.exception; + +/** + *

description:

+ * + * @author chenle + * @date 2021-06-07 10:56 + */ +public class MyBusinessException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private String msg; + private int code = 500; + + public MyBusinessException(String msg) { + super(msg); + this.msg = msg; + } + + public MyBusinessException(String msg, Throwable e) { + super(msg, e); + this.msg = msg; + } + + public MyBusinessException(String msg, int code) { + super(msg); + this.msg = msg; + this.code = code; + } + + public MyBusinessException(String msg, int code, Throwable e) { + super(msg, e); + this.msg = msg; + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + +} diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyApplicationContextRefreshedListener.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyApplicationContextRefreshedListener.java similarity index 93% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyApplicationContextRefreshedListener.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyApplicationContextRefreshedListener.java index c436fe38..48ae0c30 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyApplicationContextRefreshedListener.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyApplicationContextRefreshedListener.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.handler; +package org.dromara.websocket.handler; import jakarta.servlet.annotation.WebListener; import org.slf4j.Logger; @@ -33,7 +33,7 @@ public class MyApplicationContextRefreshedListener implements ApplicationListene //滁州 // public static final String WEBSOCKET_URL = "ws://53.193.3.5:32090/vms/websocket/socketServer.do"; //铜陵 - public static final String WEBSOCKET_URL = "ws://53.238.84.26:32090/vms/websocket/socketServer.do"; + public static final String WEBSOCKET_URL = "ws://10.129.162.100:32090/vms/websocket/socketServer.do"; /** * 定义websocket配置 diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyWebSocketClientHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyWebSocketClientHandler.java similarity index 97% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyWebSocketClientHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyWebSocketClientHandler.java index 02b69ff0..1f9eab4f 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyWebSocketClientHandler.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyWebSocketClientHandler.java @@ -1,7 +1,7 @@ -package org.dromara.webscoket.handler; +package org.dromara.websocket.handler; import lombok.extern.slf4j.Slf4j; -import org.dromara.webscoket.strategy.WebMessageContext; +import org.dromara.websocket.strategy.WebMessageContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Lazy; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/mapper/OriginDeviceMapper.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/mapper/OriginDeviceMapper.java similarity index 74% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/mapper/OriginDeviceMapper.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/mapper/OriginDeviceMapper.java index f7075749..99b81221 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/mapper/OriginDeviceMapper.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/mapper/OriginDeviceMapper.java @@ -1,8 +1,8 @@ -package org.dromara.webscoket.mapper; +package org.dromara.websocket.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.webscoket.domain.OriginDevice; +import org.dromara.websocket.domain.OriginDevice; /** *

description:

diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java similarity index 97% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java index 9dca727f..49961a15 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.schedule; +package org.dromara.websocket.schedule; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,8 +10,8 @@ import org.dromara.system.api.RemoteDeviceService; import org.dromara.system.api.domain.bo.RemoteDeptBo; import org.dromara.system.api.domain.bo.RemoteDeviceBo; import org.dromara.system.api.domain.vo.RemoteDeptVo; -import org.dromara.webscoket.domain.OriginDevice; -import org.dromara.webscoket.mapper.OriginDeviceMapper; +import org.dromara.websocket.domain.OriginDevice; +import org.dromara.websocket.mapper.OriginDeviceMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceStatusSchedule.java similarity index 95% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceStatusSchedule.java index 883c6988..7daa3a7d 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceStatusSchedule.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.schedule; +package org.dromara.websocket.schedule; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,8 +10,8 @@ import org.dromara.data2es.api.RemoteDataToEsService; import org.dromara.data2es.api.domain.RemoteGpsInfo; import org.dromara.system.api.RemoteDeviceService; import org.dromara.system.api.domain.vo.RemoteDeviceVo; -import org.dromara.webscoket.domain.OriginDevice; -import org.dromara.webscoket.mapper.OriginDeviceMapper; +import org.dromara.websocket.domain.OriginDevice; +import org.dromara.websocket.mapper.OriginDeviceMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/ChuZhouTextMessageHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/ChuZhouTextMessageHandler.java similarity index 96% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/ChuZhouTextMessageHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/ChuZhouTextMessageHandler.java index c32e98b1..cebe3bbd 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/ChuZhouTextMessageHandler.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/ChuZhouTextMessageHandler.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.strategy; +package org.dromara.websocket.strategy; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64Decoder; @@ -13,8 +13,8 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.domain.R; import org.dromara.data2es.api.RemoteDataToEsService; import org.dromara.data2es.api.domain.RemoteGpsInfo; -import org.dromara.webscoket.domain.LocationZfjlyEntityXml; -import org.dromara.webscoket.domain.XmlEntity; +import org.dromara.websocket.domain.LocationZfjlyEntityXml; +import org.dromara.websocket.domain.XmlEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; @@ -26,8 +26,8 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import static org.dromara.webscoket.constants.WebSocketMessageConstant.POSITION_DATA_TYPE_ORIGINAL; -import static org.dromara.webscoket.constants.WebSocketMessageConstant.POSITION_MSG_TYPE_ORIGINAL; +import static org.dromara.websocket.constants.WebSocketMessageConstant.POSITION_DATA_TYPE_ORIGINAL; +import static org.dromara.websocket.constants.WebSocketMessageConstant.POSITION_MSG_TYPE_ORIGINAL; /** diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/IMessageHandleStrategy.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/IMessageHandleStrategy.java similarity index 85% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/IMessageHandleStrategy.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/IMessageHandleStrategy.java index 00f28125..8eeae849 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/IMessageHandleStrategy.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/IMessageHandleStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.strategy; +package org.dromara.websocket.strategy; import org.springframework.web.socket.WebSocketMessage; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TextMessageHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/TextMessageHandler.java similarity index 97% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TextMessageHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/TextMessageHandler.java index 7c947f81..20992ffe 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TextMessageHandler.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/TextMessageHandler.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.strategy; +package org.dromara.websocket.strategy; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64Decoder; @@ -12,9 +12,9 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.domain.R; import org.dromara.data2es.api.RemoteDataToEsService; import org.dromara.data2es.api.domain.RemoteGpsInfo; -import org.dromara.webscoket.domain.LocationZfjlyEntity; -import org.dromara.webscoket.domain.LocationZfjlyEntityXml; -import org.dromara.webscoket.domain.XmlEntity; +import org.dromara.websocket.domain.LocationZfjlyEntity; +import org.dromara.websocket.domain.LocationZfjlyEntityXml; +import org.dromara.websocket.domain.XmlEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import org.springframework.web.socket.WebSocketMessage; import java.util.*; -import static org.dromara.webscoket.constants.WebSocketMessageConstant.*; +import static org.dromara.websocket.constants.WebSocketMessageConstant.*; /** diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TonglingTextMessageHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/TonglingTextMessageHandler.java similarity index 98% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TonglingTextMessageHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/TonglingTextMessageHandler.java index 138b46e0..8faaad58 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TonglingTextMessageHandler.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/TonglingTextMessageHandler.java @@ -1,4 +1,4 @@ -package org.dromara.webscoket.strategy; +package org.dromara.websocket.strategy; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; @@ -9,7 +9,7 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.domain.R; import org.dromara.data2es.api.RemoteDataToEsService; import org.dromara.data2es.api.domain.RemoteGpsInfo; -import org.dromara.webscoket.domain.LocationZfjlyEntity; +import org.dromara.websocket.domain.LocationZfjlyEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import static org.dromara.webscoket.constants.WebSocketMessageConstant.*; +import static org.dromara.websocket.constants.WebSocketMessageConstant.*; /** diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/WebMessageContext.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/WebMessageContext.java similarity index 94% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/WebMessageContext.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/WebMessageContext.java index 1e23360a..acfe408c 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/WebMessageContext.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/strategy/WebMessageContext.java @@ -1,7 +1,7 @@ -package org.dromara.webscoket.strategy; +package org.dromara.websocket.strategy; import lombok.extern.slf4j.Slf4j; -import org.dromara.webscoket.exception.MyBusinessException; +import org.dromara.websocket.exception.MyBusinessException; import org.springframework.stereotype.Service; import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.PongMessage; diff --git a/stwzhj-modules/wzhj-webscoket/src/main/resources/application.yml b/stwzhj-modules/wzhj-websocket/src/main/resources/application.yml similarity index 96% rename from stwzhj-modules/wzhj-webscoket/src/main/resources/application.yml rename to stwzhj-modules/wzhj-websocket/src/main/resources/application.yml index 8261485c..a3298e73 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/resources/application.yml +++ b/stwzhj-modules/wzhj-websocket/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: wzhj-webscoket + name: wzhj-websocket profiles: # 环境配置 active: @profiles.active@ diff --git a/stwzhj-modules/wzhj-websocket/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-websocket/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..0be6f549 --- /dev/null +++ b/stwzhj-modules/wzhj-websocket/src/main/resources/logback-plus.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + ${log.path}/info.${log.file}.log + + INFO + ACCEPT + DENY + + + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + diff --git a/stwzhj-modules/wzhj-webscoket/src/main/resources/mapper/OriginDeviceMapper.xml b/stwzhj-modules/wzhj-websocket/src/main/resources/mapper/OriginDeviceMapper.xml similarity index 72% rename from stwzhj-modules/wzhj-webscoket/src/main/resources/mapper/OriginDeviceMapper.xml rename to stwzhj-modules/wzhj-websocket/src/main/resources/mapper/OriginDeviceMapper.xml index ee66fad1..09aa4bd0 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/resources/mapper/OriginDeviceMapper.xml +++ b/stwzhj-modules/wzhj-websocket/src/main/resources/mapper/OriginDeviceMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/stwzhj-visual/stwzhj-monitor/src/main/resources/application.yml b/stwzhj-visual/stwzhj-monitor/src/main/resources/application.yml index 2bca46ac..7b6cc10d 100644 --- a/stwzhj-visual/stwzhj-monitor/src/main/resources/application.yml +++ b/stwzhj-visual/stwzhj-monitor/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-monitor + name: wzhj-monitor profiles: # 环境配置 active: @profiles.active@ diff --git a/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties index 58dafa10..e6658aa5 100644 --- a/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties +++ b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties @@ -41,7 +41,7 @@ db.num=1 ### Connect URL of DB: #db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true -db.url.0=jdbc:mysql://53.176.146.98:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +db.url.0=jdbc:mysql://53.176.146.102:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.user.0=root db.password.0=Ycgis!2509 diff --git a/stwzhj-gateway/Dockerfile b/wzhj-gateway/Dockerfile similarity index 100% rename from stwzhj-gateway/Dockerfile rename to wzhj-gateway/Dockerfile diff --git a/stwzhj-gateway/pom.xml b/wzhj-gateway/pom.xml similarity index 99% rename from stwzhj-gateway/pom.xml rename to wzhj-gateway/pom.xml index 727b15e6..4bc183c2 100644 --- a/stwzhj-gateway/pom.xml +++ b/wzhj-gateway/pom.xml @@ -8,7 +8,7 @@ 4.0.0 - stwzhj-gateway + wzhj-gateway stwzhj-gateway网关模块 diff --git a/stwzhj-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java b/wzhj-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java similarity index 100% rename from stwzhj-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java rename to wzhj-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java b/wzhj-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java b/wzhj-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java b/wzhj-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java b/wzhj-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java b/wzhj-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/WebSocketAuthFilter.java b/wzhj-gateway/src/main/java/org/dromara/gateway/filter/WebSocketAuthFilter.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/filter/WebSocketAuthFilter.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/filter/WebSocketAuthFilter.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java b/wzhj-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java b/wzhj-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java diff --git a/stwzhj-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java b/wzhj-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java similarity index 100% rename from stwzhj-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java rename to wzhj-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java diff --git a/stwzhj-gateway/src/main/resources/application.yml b/wzhj-gateway/src/main/resources/application.yml similarity index 100% rename from stwzhj-gateway/src/main/resources/application.yml rename to wzhj-gateway/src/main/resources/application.yml diff --git a/stwzhj-gateway/src/main/resources/banner.txt b/wzhj-gateway/src/main/resources/banner.txt similarity index 100% rename from stwzhj-gateway/src/main/resources/banner.txt rename to wzhj-gateway/src/main/resources/banner.txt diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml b/wzhj-gateway/src/main/resources/logback-plus.xml similarity index 75% rename from stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml rename to wzhj-gateway/src/main/resources/logback-plus.xml index 909b3020..525188bb 100644 --- a/stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml +++ b/wzhj-gateway/src/main/resources/logback-plus.xml @@ -2,24 +2,31 @@ + - - + + + ${log.path}/console.log + + + ${log.path}/console.%d{yyyy-MM-dd}.log + + 1 + + + ${log.pattern} + utf-8 + + + + INFO + + - - - - @@ -37,13 +44,13 @@ 如果同时有和，那么当天日志是，明天会自动把今天 的日志改名为今天的日期。即， 的日志都是当天的。 --> - ${LOG_PATH}${LOG_FILE} + ${log.path}${log.file} UTF-8 %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - ${LOG_PATH}info/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz + ${log.path}info/${log.file}.%d{yyyy-MM-dd}.%i.gz 50MB 20 @@ -59,11 +66,11 @@ 如果同时有和，那么当天日志是，明天会自动把今天 的日志改名为今天的日期。即， 的日志都是当天的。 --> - ${LOG_PATH}error.${LOG_FILE} + ${log.path}error.${log.file} - + - ${LOG_PATH}error/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz + ${log.path}error/${log.file}.%d{yyyy-MM-dd}.%i.gz 50MB 180 @@ -78,9 +85,15 @@ + + + + + - + +