From 2cbdb7364887a7c016623f52df03cace35da8dc2 Mon Sep 17 00:00:00 2001 From: hudongdong129 <34374227+hudongdong129@users.noreply.github.com> Date: Fri, 31 Mar 2023 23:35:57 +0800 Subject: [PATCH] [feature]change the package name (#825) change the package name to org.dromara.hertzbeat from com.usthe [doc] update domain change the package name to org.dromara.hertzbeat from com.usthe change the package name to org.dromara.hertzbeat from com.usthe change the package name to org.dromara.hertzbeat from com.usthe change the package name to org.dromara.hertzbeat from com.usthe catch aviator CompileExpressionErrorException ExpressionRuntimeException update favicon [script] update github workflow, add pr template (#819) [script]update github workflow, add pr template [script]update github workflow [script]update github workflow update update --------- Co-authored-by: hudongdong Co-authored-by: tomsun28 --- CONTRIBUTING.md | 12 +- README.md | 4 +- README_CN.md | 4 +- alerter/pom.xml | 4 +- .../hertzbeat}/alert/AlerterProperties.java | 2 +- .../hertzbeat}/alert/AlerterWorkerPool.java | 2 +- .../alert/calculate/CalculateAlarm.java | 44 +- .../config/AlerterAutoConfiguration.java | 4 +- .../controller/AlertDefineController.java | 12 +- .../controller/AlertDefinesController.java | 8 +- .../alert/controller/AlertsController.java | 12 +- .../hertzbeat}/alert/dao/AlertDao.java | 8 +- .../alert/dao/AlertDefineBindDao.java | 4 +- .../hertzbeat}/alert/dao/AlertDefineDao.java | 4 +- .../hertzbeat}/alert/dao/AlertMonitorDao.java | 4 +- .../alert/dto/AlertPriorityNum.java | 2 +- .../hertzbeat}/alert/dto/AlertSummary.java | 2 +- .../alert/service/AlertDefineService.java | 6 +- .../alert/service/AlertService.java | 8 +- .../service/impl/AlertDefineServiceImpl.java | 12 +- .../alert/service/impl/AlertServiceImpl.java | 20 +- .../alert/util/AlertTemplateUtil.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../alert/AlerterWorkerPoolTest.java | 2 +- .../controller/AlertDefineControllerTest.java | 16 +- .../AlertDefinesControllerTest.java | 10 +- .../controller/AlertsControllerTest.java | 16 +- .../alert/service/AlertDefineServiceTest.java | 16 +- .../alert/service/AlertServiceTest.java | 4 +- .../alert/util/AlertTemplateUtilTest.java | 2 +- collector/pom.xml | 4 +- .../collector/collect/AbstractCollect.java | 6 +- .../collect/AbstractParseResponse.java | 6 +- .../collect/common/cache/CacheCloseable.java | 2 +- .../collect/common/cache/CacheIdentifier.java | 2 +- .../collect/common/cache/CommonCache.java | 2 +- .../collect/common/cache/JdbcConnect.java | 2 +- .../collect/common/cache/JmxConnect.java | 2 +- .../collect/common/cache/MongodbConnect.java | 2 +- .../collect/common/cache/RedisConnect.java | 2 +- .../collect/common/http/CommonHttpClient.java | 2 +- .../collect/common/ssh/CommonSshClient.java | 2 +- .../collect/database/JdbcCommonCollect.java | 26 +- .../collect/database/JdbcSpiLoader.java | 2 +- .../collector/collect/ftp/FtpCollectImpl.java | 16 +- .../collect/http/HttpCollectImpl.java | 34 +- .../http/SslCertificateCollectImpl.java | 20 +- .../promethus/AbstractPrometheusParse.java | 6 +- .../http/promethus/ParseException.java | 2 +- .../http/promethus/PrometheusLastParser.java | 8 +- .../promethus/PrometheusMatrixParser.java | 16 +- .../promethus/PrometheusParseCreater.java | 2 +- .../promethus/PrometheusVectorParser.java | 16 +- .../promethus/exporter/ExporterParser.java | 6 +- .../http/promethus/exporter/MetricFamily.java | 2 +- .../http/promethus/exporter/MetricType.java | 2 +- .../collect/icmp/IcmpCollectImpl.java | 18 +- .../collector/collect/jmx/JmxCollectImpl.java | 24 +- .../mongodb/MongodbSingleCollectImpl.java | 25 +- .../collect/redis/RedisCommonCollectImpl.java | 41 +- .../collect/snmp/SnmpCollectImpl.java | 20 +- .../collector/collect/ssh/SshCollectImpl.java | 26 +- .../strategy/CollectStrategyFactory.java | 4 +- .../strategy/ParseStrategyFactory.java | 6 +- .../collect/telnet/TelnetCollectImpl.java | 18 +- .../config/CollectorAutoConfiguration.java | 4 +- .../dispatch/CollectDataDispatch.java | 8 +- .../collector/dispatch/CommonDispatcher.java | 22 +- .../collector/dispatch/DispatchConstants.java | 2 +- .../dispatch/DispatchProperties.java | 2 +- .../collector/dispatch/MetricsCollect.java | 27 +- .../dispatch/MetricsCollectorQueue.java | 2 +- .../dispatch/MetricsTaskDispatch.java | 4 +- .../collector/dispatch/WorkerPool.java | 2 +- .../entrance/internal/CollectJobService.java | 10 +- .../CollectResponseEventListener.java | 4 +- .../dispatch/timer/HashedWheelTimer.java | 2 +- .../collector/dispatch/timer/Timeout.java | 2 +- .../collector/dispatch/timer/Timer.java | 2 +- .../dispatch/timer/TimerDispatch.java | 8 +- .../dispatch/timer/TimerDispatcher.java | 8 +- .../collector/dispatch/timer/TimerTask.java | 2 +- .../dispatch/timer/WheelTimerTask.java | 18 +- .../collector/dispatch/unit/DataUnit.java | 2 +- .../collector/dispatch/unit/UnitConvert.java | 2 +- .../dispatch/unit/impl/DataSizeConvert.java | 6 +- .../collector/util/CollectUtil.java | 8 +- .../collector/util/CollectorConstants.java | 2 +- .../collector/util/JsonPathParser.java | 2 +- .../collector/util/KeyPairUtil.java | 2 +- ...om.usthe.collector.collect.AbstractCollect | 11 - ...ertzbeat.collector.collect.AbstractCollect | 11 + .../main/resources/META-INF/spring.factories | 2 +- .../collect/common/cache/CommonCacheTest.java | 4 +- .../common/http/CommonHttpClientTest.java | 5 +- .../common/ssh/CommonSshClientTest.java | 5 +- .../database/JdbcCommonCollectTest.java | 5 +- .../collect/database/JdbcSpiLoaderTest.java | 5 +- .../collect/http/HttpCollectImplTest.java | 5 +- .../http/SslCertificateCollectImplTest.java | 5 +- .../exporter/ExporterParserTest.java | 2 +- .../collect/icmp/IcmpCollectImplTest.java | 5 +- .../collect/jmx/JmxCollectImplTest.java | 5 +- .../redis/RedisClusterCollectImplTest.java | 8 +- .../redis/RedisSingleCollectImplTest.java | 8 +- .../collect/snmp/SnmpCollectImplTest.java | 5 +- .../collect/ssh/SshCollectImplTest.java | 5 +- .../collect/telnet/TelnetCollectImplTest.java | 3 +- .../dispatch/CommonDispatcherTest.java | 5 +- .../dispatch/MetricsCollectorQueueTest.java | 5 +- .../collector/dispatch/WorkerPoolTest.java | 5 +- .../internal/CollectJobServiceTest.java | 5 +- .../collector/util/CollectUtilTest.java | 6 +- .../collector/util/JsonPathParserTest.java | 2 +- .../collector/util/KeyPairUtilTest.java | 2 +- common/pom.xml | 2 +- .../common/config/AviatorConfiguration.java | 2 +- .../common/config/CommonConfig.java | 6 +- .../common/config/CommonProperties.java | 2 +- .../common/entity/alerter/Alert.java | 4 +- .../common/entity/alerter/AlertDefine.java | 2 +- .../alerter/AlertDefineMonitorBind.java | 4 +- .../alerter/JsonMapAttributeConverter.java | 4 +- .../common/entity/dto/AlertReport.java | 2 +- .../hertzbeat}/common/entity/dto/Field.java | 2 +- .../hertzbeat}/common/entity/dto/Message.java | 4 +- .../common/entity/dto/MetricsData.java | 2 +- .../common/entity/dto/MetricsHistoryData.java | 2 +- .../common/entity/dto/PromVectorOrMatrix.java | 2 +- .../hertzbeat}/common/entity/dto/Value.java | 2 +- .../common/entity/dto/ValueRow.java | 2 +- .../common/entity/job/Configmap.java | 2 +- .../hertzbeat}/common/entity/job/Job.java | 8 +- .../hertzbeat}/common/entity/job/Metrics.java | 6 +- .../entity/job/protocol/FtpProtocol.java | 2 +- .../entity/job/protocol/HttpProtocol.java | 2 +- .../entity/job/protocol/IcmpProtocol.java | 2 +- .../entity/job/protocol/JdbcProtocol.java | 2 +- .../entity/job/protocol/JmxProtocol.java | 2 +- .../entity/job/protocol/MongodbProtocol.java | 2 +- .../entity/job/protocol/RedisProtocol.java | 2 +- .../entity/job/protocol/SnmpProtocol.java | 2 +- .../entity/job/protocol/SshProtocol.java | 2 +- .../entity/job/protocol/TcpUdpProtocol.java | 2 +- .../entity/job/protocol/TelnetProtocol.java | 2 +- .../JsonByteListAttributeConverter.java | 4 +- .../JsonOptionListAttributeConverter.java | 4 +- .../JsonTagListAttributeConverter.java | 4 +- .../common/entity/manager/Monitor.java | 4 +- .../common/entity/manager/NoticeReceiver.java | 2 +- .../common/entity/manager/NoticeRule.java | 2 +- .../common/entity/manager/Param.java | 2 +- .../common/entity/manager/ParamDefine.java | 4 +- .../hertzbeat}/common/entity/manager/Tag.java | 2 +- .../common/entity/manager/TagMonitorBind.java | 2 +- .../common/entity/message/CollectRep.java | 560 +++++++++--------- .../common/entity/warehouse/History.java | 2 +- .../common/model/ServicePodModel.java | 2 +- .../common/queue/CommonDataQueue.java | 6 +- .../queue/impl/InMemoryCommonDataQueue.java | 8 +- .../common/service/TencentSmsClient.java | 6 +- .../support/ResourceBundleUtf8Control.java | 2 +- .../common/support/SpringContextHolder.java | 2 +- .../exception/SendMessageException.java | 2 +- .../support/valid/EmailParamValidator.java | 4 +- .../common/support/valid/EmailValid.java | 2 +- .../support/valid/HostParamValidator.java | 4 +- .../common/support/valid/HostValid.java | 2 +- .../support/valid/PhoneNumParamValidator.java | 4 +- .../common/support/valid/PhoneNumValid.java | 2 +- .../hertzbeat}/common/util/AesUtil.java | 2 +- .../hertzbeat}/common/util/Base64Util.java | 2 +- .../common/util/CommonConstants.java | 2 +- .../hertzbeat}/common/util/CommonUtil.java | 2 +- .../hertzbeat}/common/util/GsonUtil.java | 2 +- .../common/util/IntervalExpressionUtil.java | 2 +- .../hertzbeat}/common/util/IpDomainUtil.java | 2 +- .../hertzbeat}/common/util/LruHashMap.java | 2 +- .../hertzbeat}/common/util/MapCapUtil.java | 2 +- .../dromara/hertzbeat}/common/util/Pair.java | 2 +- .../hertzbeat}/common/util/ProtoJsonUtil.java | 2 +- .../common/util/ResourceBundleUtil.java | 4 +- .../hertzbeat}/common/util/SignConstants.java | 2 +- .../common/util/SnowFlakeIdGenerator.java | 2 +- .../common/util/SnowFlakeIdWorker.java | 2 +- .../hertzbeat}/common/util/StrBuffer.java | 2 +- .../common/util/TimePeriodUtil.java | 2 +- common/src/main/message/collect_rep.proto | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../common/queue/CommonDataQueueTest.java | 4 +- .../ResourceBundleUtf8ControlTest.java | 5 +- .../support/SpringContextHolderTest.java | 5 +- .../hertzbeat}/common/util/AesUtilTest.java | 5 +- .../common/util/Base64UtilTest.java | 5 +- .../common/util/CommonUtilTest.java | 3 +- .../hertzbeat}/common/util/GsonUtilTest.java | 5 +- .../util/IntervalExpressionUtilTest.java | 5 +- .../common/util/IpDomainUtilTest.java | 3 +- .../common/util/LruHashMapTest.java | 5 +- .../common/util/ProtoJsonUtilTest.java | 5 +- .../common/util/ResourceBundleUtilTest.java | 5 +- .../common/util/SnowFlakeIdGeneratorTest.java | 5 +- home/blog/2022-02-11-hertzbeat.md | 2 +- home/blog/2022-02-17-hertzbeat.md | 2 +- home/blog/2022-02-28-hertzbeat-v1.0-beta.4.md | 2 +- home/blog/2022-03-10-hertzbeat-v1.0-beta.5.md | 2 +- home/blog/2022-03-20-hertzbeat-v1.0-beta.6.md | 2 +- home/docs/others/contributing.md | 6 +- home/docs/start/iotdb-init.md | 2 +- .../version-v1.1.x/others/contributing.md | 2 +- .../2022-02-11-hertzbeat.md | 2 +- .../2022-02-17-hertzbeat.md | 2 +- .../2022-02-28-hertzbeat-v1.0-beta.4.md | 2 +- .../2022-03-10-hertzbeat-v1.0-beta.5.md | 2 +- .../2022-03-20-hertzbeat-v1.0-beta.6.md | 2 +- .../current/others/contributing.md | 6 +- .../version-v1.0.0/others/contact.md | 2 +- .../version-v1.0.0/others/contributing.md | 2 +- .../version-v1.1.x/others/contributing.md | 2 +- manager/pom.xml | 12 +- .../dromara/hertzbeat}/manager/Manager.java | 6 +- .../manager/cache/CacheFactory.java | 2 +- .../cache/CaffeineCacheServiceImpl.java | 2 +- .../manager/cache/ICacheService.java | 2 +- .../component/alerter/AlertNotifyHandler.java | 8 +- .../component/alerter/AlertStoreHandler.java | 4 +- .../component/alerter/DispatcherAlarm.java | 14 +- .../impl/AbstractAlertNotifyHandlerImpl.java | 12 +- .../alerter/impl/CommonRobotNotifyResp.java | 2 +- .../alerter/impl/DbAlertStoreHandlerImpl.java | 14 +- .../DingTalkRobotAlertNotifyHandlerImpl.java | 8 +- .../DiscordBotAlertNotifyHandlerImpl.java | 8 +- .../impl/EmailAlertNotifyHandlerImpl.java | 14 +- .../impl/FlyBookAlertNotifyHandlerImpl.java | 8 +- .../impl/SlackAlertNotifyHandlerImpl.java | 8 +- .../impl/SmsAlertNotifyHandlerImpl.java | 16 +- .../TelegramBotAlertNotifyHandlerImpl.java | 8 +- .../impl/WeChatAlertNotifyHandlerImpl.java | 8 +- .../WeWorkRobotAlertNotifyHandlerImpl.java | 10 +- .../impl/WebHookAlertNotifyHandlerImpl.java | 10 +- .../config/AngularErrorViewResolver.java | 2 +- .../config/HeaderRequestInterceptor.java | 2 +- .../manager/config/JpaAuditorConfig.java | 2 +- .../manager/config/RestTemplateConfig.java | 2 +- .../config/SecurityCorsConfiguration.java | 2 +- .../manager/config/SwaggerConfig.java | 2 +- .../manager/config/ThymeleafConfig.java | 2 +- .../manager/controller/AccountController.java | 21 +- .../manager/controller/AppController.java | 16 +- .../manager/controller/I18nController.java | 6 +- .../manager/controller/MetricsController.java | 8 +- .../manager/controller/MonitorController.java | 15 +- .../controller/MonitorsController.java | 8 +- .../controller/NoticeConfigController.java | 15 +- .../manager/controller/SummaryController.java | 10 +- .../manager/controller/TagController.java | 8 +- .../hertzbeat}/manager/dao/MonitorDao.java | 8 +- .../manager/dao/NoticeReceiverDao.java | 4 +- .../hertzbeat}/manager/dao/NoticeRuleDao.java | 4 +- .../hertzbeat}/manager/dao/ParamDao.java | 4 +- .../manager/dao/ParamDefineDao.java | 4 +- .../hertzbeat}/manager/dao/TagDao.java | 4 +- .../hertzbeat}/manager/pojo/dto/AppCount.java | 2 +- .../manager/pojo/dto/Dashboard.java | 2 +- .../manager/pojo/dto/Hierarchy.java | 2 +- .../hertzbeat}/manager/pojo/dto/LoginDto.java | 2 +- .../manager/pojo/dto/MonitorDefineDto.java | 2 +- .../manager/pojo/dto/MonitorDto.java | 6 +- .../manager/pojo/dto/ParamDefineDto.java | 4 +- .../manager/pojo/dto/WeWorkWebHookDto.java | 2 +- .../manager/service/AppService.java | 8 +- .../manager/service/JobSchedulerInit.java | 18 +- .../manager/service/MailService.java | 7 +- .../manager/service/MonitorService.java | 12 +- .../manager/service/NoticeConfigService.java | 8 +- .../service/NoticeDispatchService.java | 2 +- .../manager/service/TagService.java | 4 +- .../manager/service/impl/AppServiceImpl.java | 16 +- .../manager/service/impl/MailServiceImpl.java | 12 +- .../service/impl/MonitorServiceImpl.java | 52 +- .../service/impl/NoticeConfigServiceImpl.java | 24 +- .../manager/service/impl/TagServiceImpl.java | 8 +- .../support/GlobalExceptionHandler.java | 37 +- .../exception/AlertNoticeException.java | 2 +- .../exception/MonitorDatabaseException.java | 2 +- .../exception/MonitorDetectException.java | 2 +- .../exception/MonitorMetricsException.java | 2 +- manager/src/main/resources/application.yml | 7 +- .../AbstractSpringIntegrationTest.java | 2 +- .../hertzbeat}/manager/ManagerTest.java | 64 +- .../alerter/AlertNotifyHandlerTest.java | 5 +- .../alerter/DispatcherAlarmTest.java | 5 +- .../impl/DbAlertStoreHandlerImplTest.java | 5 +- ...ngTalkRobotAlertNotifyHandlerImplTest.java | 10 +- .../DiscordBotAlertNotifyHandlerImplTest.java | 10 +- .../impl/EmailAlertNotifyHandlerImplTest.java | 5 +- .../FlyBookAlertNotifyHandlerImplTest.java | 10 +- .../impl/SlackAlertNotifyHandlerImplTest.java | 10 +- ...TelegramBotAlertNotifyHandlerImplTest.java | 10 +- ...WeWorkRobotAlertNotifyHandlerImplTest.java | 10 +- .../WebHookAlertNotifyHandlerImplTest.java | 5 +- .../controller/AccountControllerTest.java | 8 +- .../manager/controller/AppControllerTest.java | 18 +- .../controller/I18nControllerTest.java | 8 +- .../controller/MonitorControllerTest.java | 18 +- .../controller/MonitorsControllerTest.java | 8 +- .../NoticeConfigControllerTest.java | 16 +- .../controller/SummaryControllerTest.java | 12 +- .../manager/controller/TagControllerTest.java | 11 +- .../manager/dao/MonitorDaoTest.java | 8 +- .../manager/dao/NoticeRuleDaoTest.java | 6 +- .../hertzbeat}/manager/dao/ParamDaoTest.java | 6 +- .../manager/dao/ParamDefineDaoTest.java | 6 +- .../hertzbeat}/manager/dao/TagDaoTest.java | 6 +- .../manager/service/AppServiceTest.java | 5 +- .../manager/service/MailServiceTest.java | 8 +- .../manager/service/MonitorServiceTest.java | 49 +- .../service/NoticeConfigServiceTest.java | 21 +- .../manager/service/TagServiceTest.java | 9 +- .../support/GlobalExceptionHandlerTest.java | 28 +- pom.xml | 2 +- script/application.yml | 3 +- .../conf/application.yml | 3 +- .../docker-compose-1.0.yaml | 11 +- .../hertzbeat-mysql-iotdb/docker-compose.yaml | 8 +- .../docker-compose.yaml | 8 +- warehouse/pom.xml | 4 +- .../warehouse/WarehouseWorkerPool.java | 2 +- .../warehouse/config/IotDbVersion.java | 2 +- .../config/WarehouseAutoConfiguration.java | 4 +- .../warehouse/config/WarehouseProperties.java | 2 +- .../controller/MetricsDataController.java | 28 +- .../hertzbeat}/warehouse/dao/HistoryDao.java | 4 +- .../store/AbstractHistoryDataStorage.java | 6 +- .../store/AbstractRealTimeDataStorage.java | 4 +- .../warehouse/store/DataStorageDispatch.java | 8 +- .../store/HistoryIotDbDataStorage.java | 12 +- .../store/HistoryJpaDatabaseDataStorage.java | 16 +- .../store/HistoryTdEngineDataStorage.java | 10 +- .../store/MetricsDataRedisCodec.java | 4 +- .../store/RealTimeMemoryDataStorage.java | 6 +- .../store/RealTimeRedisDataStorage.java | 6 +- .../main/resources/META-INF/spring.factories | 2 +- .../warehouse/WarehouseWorkerPoolTest.java | 2 +- .../controller/MetricsDataControllerTest.java | 12 +- .../store/HistoryTdEngineDataStorageTest.java | 2 +- .../store/MetricsDataRedisCodecTest.java | 4 +- .../store/RealTimeMemoryDataStorageTest.java | 2 +- .../store/RealTimeRedisDataStorageTest.java | 2 +- web-app/src/favicon.ico | Bin 1325 -> 5088 bytes 350 files changed, 1399 insertions(+), 1518 deletions(-) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/AlerterProperties.java (99%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/AlerterWorkerPool.java (98%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/calculate/CalculateAlarm.java (90%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/config/AlerterAutoConfiguration.java (90%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/controller/AlertDefineController.java (94%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/controller/AlertDefinesController.java (95%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/controller/AlertsController.java (95%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/dao/AlertDao.java (87%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/dao/AlertDefineBindDao.java (95%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/dao/AlertDefineDao.java (96%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/dao/AlertMonitorDao.java (93%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/dto/AlertPriorityNum.java (96%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/dto/AlertSummary.java (98%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/service/AlertDefineService.java (96%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/service/AlertService.java (92%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/service/impl/AlertDefineServiceImpl.java (92%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/service/impl/AlertServiceImpl.java (91%) rename alerter/src/main/java/{com/usthe => org/dromara/hertzbeat}/alert/util/AlertTemplateUtil.java (97%) rename alerter/src/test/java/{com/usthe => org/dromara/hertzbeat}/alert/AlerterWorkerPoolTest.java (96%) rename alerter/src/test/java/{com/usthe => org/dromara/hertzbeat}/alert/controller/AlertDefineControllerTest.java (93%) rename alerter/src/test/java/{com/usthe => org/dromara/hertzbeat}/alert/controller/AlertDefinesControllerTest.java (95%) rename alerter/src/test/java/{com/usthe => org/dromara/hertzbeat}/alert/controller/AlertsControllerTest.java (94%) rename alerter/src/test/java/{com/usthe => org/dromara/hertzbeat}/alert/service/AlertDefineServiceTest.java (92%) rename alerter/src/test/java/{com/usthe => org/dromara/hertzbeat}/alert/service/AlertServiceTest.java (85%) rename alerter/src/test/java/{com/usthe => org/dromara/hertzbeat}/alert/util/AlertTemplateUtilTest.java (98%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/AbstractCollect.java (90%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/AbstractParseResponse.java (77%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/CacheCloseable.java (94%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/CacheIdentifier.java (95%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/CommonCache.java (99%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/JdbcConnect.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/JmxConnect.java (92%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/MongodbConnect.java (92%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/RedisConnect.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/http/CommonHttpClient.java (99%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/ssh/CommonSshClient.java (95%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/database/JdbcCommonCollect.java (94%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/database/JdbcSpiLoader.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/ftp/FtpCollectImpl.java (91%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/HttpCollectImpl.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/SslCertificateCollectImpl.java (92%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/AbstractPrometheusParse.java (88%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/ParseException.java (72%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/PrometheusLastParser.java (75%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/PrometheusMatrixParser.java (86%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/PrometheusParseCreater.java (91%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/PrometheusVectorParser.java (85%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/exporter/ExporterParser.java (98%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/exporter/MetricFamily.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/exporter/MetricType.java (91%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/icmp/IcmpCollectImpl.java (87%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/jmx/JmxCollectImpl.java (91%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/mongodb/MongodbSingleCollectImpl.java (91%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/redis/RedisCommonCollectImpl.java (90%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/snmp/SnmpCollectImpl.java (95%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/ssh/SshCollectImpl.java (93%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/strategy/CollectStrategyFactory.java (91%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/strategy/ParseStrategyFactory.java (84%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/telnet/TelnetCollectImpl.java (88%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/config/CollectorAutoConfiguration.java (90%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/CollectDataDispatch.java (86%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/CommonDispatcher.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/DispatchConstants.java (98%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/DispatchProperties.java (99%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/MetricsCollect.java (95%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/MetricsCollectorQueue.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/MetricsTaskDispatch.java (90%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/WorkerPool.java (98%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/entrance/internal/CollectJobService.java (92%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/entrance/internal/CollectResponseEventListener.java (90%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/timer/HashedWheelTimer.java (99%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/timer/Timeout.java (97%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/timer/Timer.java (97%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/timer/TimerDispatch.java (89%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/timer/TimerDispatcher.java (93%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/timer/TimerTask.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/timer/WheelTimerTask.java (87%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/unit/DataUnit.java (95%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/unit/UnitConvert.java (93%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/unit/impl/DataSizeConvert.java (88%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/util/CollectUtil.java (98%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/util/CollectorConstants.java (96%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/util/JsonPathParser.java (98%) rename collector/src/main/java/{com/usthe => org/dromara/hertzbeat}/collector/util/KeyPairUtil.java (97%) delete mode 100644 collector/src/main/resources/META-INF/services/com.usthe.collector.collect.AbstractCollect create mode 100644 collector/src/main/resources/META-INF/services/org.dromara.hertzbeat.collector.collect.AbstractCollect rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/cache/CommonCacheTest.java (82%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/http/CommonHttpClientTest.java (70%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/common/ssh/CommonSshClientTest.java (67%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/database/JdbcCommonCollectTest.java (60%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/database/JdbcSpiLoaderTest.java (59%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/HttpCollectImplTest.java (70%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/SslCertificateCollectImplTest.java (65%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/http/promethus/exporter/ExporterParserTest.java (97%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/icmp/IcmpCollectImplTest.java (64%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/jmx/JmxCollectImplTest.java (70%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/redis/RedisClusterCollectImplTest.java (83%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/redis/RedisSingleCollectImplTest.java (83%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/snmp/SnmpCollectImplTest.java (70%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/ssh/SshCollectImplTest.java (70%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/collect/telnet/TelnetCollectImplTest.java (94%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/CommonDispatcherTest.java (66%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/MetricsCollectorQueueTest.java (71%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/WorkerPoolTest.java (70%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/dispatch/entrance/internal/CollectJobServiceTest.java (74%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/util/CollectUtilTest.java (96%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/util/JsonPathParserTest.java (99%) rename collector/src/test/java/{com/usthe => org/dromara/hertzbeat}/collector/util/KeyPairUtilTest.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/config/AviatorConfiguration.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/config/CommonConfig.java (89%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/config/CommonProperties.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/alerter/Alert.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/alerter/AlertDefine.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/alerter/AlertDefineMonitorBind.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/alerter/JsonMapAttributeConverter.java (93%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/AlertReport.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/Field.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/Message.java (93%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/MetricsData.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/MetricsHistoryData.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/PromVectorOrMatrix.java (94%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/Value.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/dto/ValueRow.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/Configmap.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/Job.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/Metrics.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/FtpProtocol.java (91%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/HttpProtocol.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/IcmpProtocol.java (95%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/JdbcProtocol.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/JmxProtocol.java (94%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/MongodbProtocol.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/RedisProtocol.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/SnmpProtocol.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/SshProtocol.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/TcpUdpProtocol.java (95%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/job/protocol/TelnetProtocol.java (95%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/JsonByteListAttributeConverter.java (93%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/JsonOptionListAttributeConverter.java (93%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/JsonTagListAttributeConverter.java (95%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/Monitor.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/NoticeReceiver.java (99%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/NoticeRule.java (99%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/Param.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/ParamDefine.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/Tag.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/manager/TagMonitorBind.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/message/CollectRep.java (81%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/entity/warehouse/History.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/model/ServicePodModel.java (94%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/queue/CommonDataQueue.java (92%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/queue/impl/InMemoryCommonDataQueue.java (94%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/service/TencentSmsClient.java (94%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/ResourceBundleUtf8Control.java (99%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/SpringContextHolder.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/exception/SendMessageException.java (79%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/valid/EmailParamValidator.java (92%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/valid/EmailValid.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/valid/HostParamValidator.java (92%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/valid/HostValid.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/valid/PhoneNumParamValidator.java (92%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/support/valid/PhoneNumValid.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/AesUtil.java (99%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/Base64Util.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/CommonConstants.java (99%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/CommonUtil.java (99%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/GsonUtil.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/IntervalExpressionUtil.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/IpDomainUtil.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/LruHashMap.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/MapCapUtil.java (88%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/Pair.java (92%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/ProtoJsonUtil.java (97%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/ResourceBundleUtil.java (95%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/SignConstants.java (84%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/SnowFlakeIdGenerator.java (96%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/SnowFlakeIdWorker.java (99%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/StrBuffer.java (98%) rename common/src/main/java/{com/usthe => org/dromara/hertzbeat}/common/util/TimePeriodUtil.java (93%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/queue/CommonDataQueueTest.java (87%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/support/ResourceBundleUtf8ControlTest.java (57%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/support/SpringContextHolderTest.java (74%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/AesUtilTest.java (81%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/Base64UtilTest.java (52%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/CommonUtilTest.java (96%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/GsonUtilTest.java (72%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/IntervalExpressionUtilTest.java (67%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/IpDomainUtilTest.java (96%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/LruHashMapTest.java (54%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/ProtoJsonUtilTest.java (68%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/ResourceBundleUtilTest.java (65%) rename common/src/test/java/{com/usthe => org/dromara/hertzbeat}/common/util/SnowFlakeIdGeneratorTest.java (92%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/Manager.java (90%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/cache/CacheFactory.java (96%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/cache/CaffeineCacheServiceImpl.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/cache/ICacheService.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/AlertNotifyHandler.java (84%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/AlertStoreHandler.java (90%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/DispatcherAlarm.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java (89%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/CommonRobotNotifyResp.java (95%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java (89%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java (93%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java (86%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java (95%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java (81%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java (93%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java (81%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java (89%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java (86%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/config/AngularErrorViewResolver.java (99%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/config/HeaderRequestInterceptor.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/config/JpaAuditorConfig.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/config/RestTemplateConfig.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/config/SecurityCorsConfiguration.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/config/SwaggerConfig.java (98%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/config/ThymeleafConfig.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/AccountController.java (90%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/AppController.java (92%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/I18nController.java (93%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/MetricsController.java (90%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/MonitorController.java (93%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/MonitorsController.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/NoticeConfigController.java (95%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/SummaryController.java (88%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/TagController.java (96%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/MonitorDao.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/NoticeReceiverDao.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/NoticeRuleDao.java (92%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/ParamDao.java (95%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/ParamDefineDao.java (93%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/TagDao.java (92%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/AppCount.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/Dashboard.java (96%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/Hierarchy.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/LoginDto.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/MonitorDefineDto.java (96%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/MonitorDto.java (92%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/ParamDefineDto.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/pojo/dto/WeWorkWebHookDto.java (97%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/AppService.java (93%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/JobSchedulerInit.java (85%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/MailService.java (85%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/MonitorService.java (94%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/NoticeConfigService.java (94%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/NoticeDispatchService.java (95%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/TagService.java (94%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/impl/AppServiceImpl.java (96%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/impl/MailServiceImpl.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/impl/MonitorServiceImpl.java (94%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/impl/NoticeConfigServiceImpl.java (91%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/service/impl/TagServiceImpl.java (90%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/support/GlobalExceptionHandler.java (87%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/support/exception/AlertNoticeException.java (94%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/support/exception/MonitorDatabaseException.java (94%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/support/exception/MonitorDetectException.java (94%) rename manager/src/main/java/{com/usthe => org/dromara/hertzbeat}/manager/support/exception/MonitorMetricsException.java (94%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/AbstractSpringIntegrationTest.java (89%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/ManagerTest.java (57%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/AlertNotifyHandlerTest.java (66%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/DispatcherAlarmTest.java (67%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java (63%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java (81%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java (83%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java (66%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java (81%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java (82%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java (83%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java (81%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java (66%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/AccountControllerTest.java (92%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/AppControllerTest.java (89%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/I18nControllerTest.java (86%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/MonitorControllerTest.java (94%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/MonitorsControllerTest.java (93%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/NoticeConfigControllerTest.java (95%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/SummaryControllerTest.java (83%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/controller/TagControllerTest.java (92%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/MonitorDaoTest.java (92%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/NoticeRuleDaoTest.java (92%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/ParamDaoTest.java (94%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/ParamDefineDaoTest.java (91%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/dao/TagDaoTest.java (91%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/service/AppServiceTest.java (89%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/service/MailServiceTest.java (85%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/service/MonitorServiceTest.java (95%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/service/NoticeConfigServiceTest.java (88%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/service/TagServiceTest.java (89%) rename manager/src/test/java/{com/usthe => org/dromara/hertzbeat}/manager/support/GlobalExceptionHandlerTest.java (92%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/WarehouseWorkerPool.java (98%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/config/IotDbVersion.java (95%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/config/WarehouseAutoConfiguration.java (91%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/config/WarehouseProperties.java (99%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/controller/MetricsDataController.java (90%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/dao/HistoryDao.java (94%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/AbstractHistoryDataStorage.java (93%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/AbstractRealTimeDataStorage.java (93%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/DataStorageDispatch.java (94%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/HistoryIotDbDataStorage.java (98%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/HistoryJpaDatabaseDataStorage.java (95%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/HistoryTdEngineDataStorage.java (98%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/MetricsDataRedisCodec.java (94%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/RealTimeMemoryDataStorage.java (94%) rename warehouse/src/main/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/RealTimeRedisDataStorage.java (96%) rename warehouse/src/test/java/{com/usthe => org/dromara/hertzbeat}/warehouse/WarehouseWorkerPoolTest.java (96%) rename warehouse/src/test/java/{com/usthe => org/dromara/hertzbeat}/warehouse/controller/MetricsDataControllerTest.java (95%) rename warehouse/src/test/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/HistoryTdEngineDataStorageTest.java (90%) rename warehouse/src/test/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/MetricsDataRedisCodecTest.java (81%) rename warehouse/src/test/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/RealTimeMemoryDataStorageTest.java (86%) rename warehouse/src/test/java/{com/usthe => org/dromara/hertzbeat}/warehouse/store/RealTimeRedisDataStorageTest.java (86%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2d8521c81cf..ff678be20f6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ Even small corrections to typos are very welcome :) 1. Deploy and start dependent services `MYSQL` and `TDengine` database 2. Requires `maven3+`, `java8+` and `lombok` environments 3. Modify the dependent service address and other information of the configuration file-`manager/src/main/resources/application.yml` -4. Start `springboot manager` service `manager/src/main/java/com/usthe/manager/Manager.java` +4. Start `springboot manager` service `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` - Front-web start @@ -113,13 +113,13 @@ With the above steps, you are a contributor to HertzBeat. Repeat the previous st [Gitter Channel](https://gitter.im/hertzbeat/community) -[Github Discussion](https://github.com/usthe/hertzbeat/discussions) +[Github Discussion](https://github.com/dromara/hertzbeat/discussions) [User Club](https://support.qq.com/products/379369) Add WeChat account `tan-cloud` to pull you into the WeChat group. -QQ group number `718618151`, verify code: `tancloud` +QQ group number `236915833`, verify code: `tancloud` Public WeChat: `tancloudtech` @@ -180,7 +180,7 @@ Public WeChat: `tancloudtech` 1. 部署启动依赖服务`MYSQL`和`TDengine`数据库 2. 需要`maven3+`, `java8+`和`lombok`环境 3. 修改配置文件的依赖服务地址等信息-`manager/src/main/resources/application.yml` -4. 启动`springboot manager`服务 `manager/src/main/java/com/usthe/manager/Manager.java` +4. 启动`springboot manager`服务 `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` - 前端启动 @@ -258,13 +258,13 @@ git pull upstream master [Gitter Channel](https://gitter.im/hertzbeat/community) -[Github Discussion](https://github.com/usthe/hertzbeat/discussions) +[Github Discussion](https://github.com/dromara/hertzbeat/discussions) [HertzBeat答疑网站](https://support.qq.com/products/379369) 加微信号 `tan-cloud` 拉您进微信交流群 -加QQ群号 `718618151` 进QQ交流群, 验证信息: `tancloud` +加QQ群号 `236915833` 进QQ交流群, 验证信息: `tancloud` 微信公众号: `tancloudtech` diff --git a/README.md b/README.md index efb1f256967..636690a76c1 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/custom-monitor.svg) ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/alert.svg) -**Home: [hertzbeat.com](https://hertzbeat.com)** +**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) | [hertzbeat.com](https://hertzbeat.com)** **Cloud: [tancloud.cn](https://tancloud.cn)** @@ -287,7 +287,7 @@ HertzBeat is a project under the [Dromara Open Source Community](https://dromara [Gitter Channel](https://gitter.im/hertzbeat/community) -[Github Discussion](https://github.com/usthe/hertzbeat/discussions) +[Github Discussion](https://github.com/dromara/hertzbeat/discussions) [User Club](https://support.qq.com/products/379369) diff --git a/README_CN.md b/README_CN.md index daeaebabdf9..6bb8f2466c6 100644 --- a/README_CN.md +++ b/README_CN.md @@ -24,7 +24,7 @@ ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/custom-monitor.svg) ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/alert.svg) -**官网: [hertzbeat.com](https://hertzbeat.com)** +**官网: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) | [hertzbeat.com](https://hertzbeat.com)** **云服务: [tancloud.cn](https://tancloud.cn)** @@ -292,7 +292,7 @@ HertzBeat 赫兹跳动是 [Dromara开源社区](https://dromara.org/) 下项目 [Gitter Channel](https://gitter.im/hertzbeat/community) -[Github Discussion](https://github.com/usthe/hertzbeat/discussions) +[Github Discussion](https://github.com/dromara/hertzbeat/discussions) [User Club](https://support.qq.com/products/379369) diff --git a/alerter/pom.xml b/alerter/pom.xml index 035e4e09bbb..4f9e62db728 100644 --- a/alerter/pom.xml +++ b/alerter/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - com.usthe.tancloud + org.dromara.hertzbeat 1.0 4.0.0 @@ -34,7 +34,7 @@ - com.usthe.tancloud + org.dromara.hertzbeat common ${common.version} provided diff --git a/alerter/src/main/java/com/usthe/alert/AlerterProperties.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterProperties.java similarity index 99% rename from alerter/src/main/java/com/usthe/alert/AlerterProperties.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterProperties.java index c16eb8dc77b..2c1354d8688 100644 --- a/alerter/src/main/java/com/usthe/alert/AlerterProperties.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.alert; +package org.dromara.hertzbeat.alert; import lombok.Getter; import lombok.Setter; diff --git a/alerter/src/main/java/com/usthe/alert/AlerterWorkerPool.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterWorkerPool.java similarity index 98% rename from alerter/src/main/java/com/usthe/alert/AlerterWorkerPool.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterWorkerPool.java index 2dc54cdba14..d59cd822580 100644 --- a/alerter/src/main/java/com/usthe/alert/AlerterWorkerPool.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterWorkerPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.alert; +package org.dromara.hertzbeat.alert; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/calculate/CalculateAlarm.java similarity index 90% rename from alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/calculate/CalculateAlarm.java index efa0f8996da..a755ca7e33c 100644 --- a/alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/calculate/CalculateAlarm.java @@ -15,23 +15,25 @@ * limitations under the License. */ -package com.usthe.alert.calculate; +package org.dromara.hertzbeat.alert.calculate; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; -import com.usthe.alert.AlerterProperties; -import com.usthe.alert.AlerterWorkerPool; -import com.usthe.common.queue.CommonDataQueue; -import com.usthe.alert.dao.AlertMonitorDao; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.alert.service.AlertDefineService; -import com.usthe.alert.util.AlertTemplateUtil; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; -import com.usthe.common.util.ResourceBundleUtil; +import com.googlecode.aviator.exception.CompileExpressionErrorException; +import com.googlecode.aviator.exception.ExpressionRuntimeException; +import org.dromara.hertzbeat.alert.AlerterProperties; +import org.dromara.hertzbeat.alert.AlerterWorkerPool; +import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.dromara.hertzbeat.alert.dao.AlertMonitorDao; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.alert.service.AlertDefineService; +import org.dromara.hertzbeat.alert.util.AlertTemplateUtil; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.ResourceBundleUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; @@ -212,8 +214,16 @@ private void calculate(CollectRep.MetricsData metricsData) { for (AlertDefine define : defines) { String expr = define.getExpr(); try { - Expression expression = AviatorEvaluator.compile(expr, true); - Boolean match = (Boolean) expression.execute(fieldValueMap); + Boolean match = false; + try { + Expression expression = AviatorEvaluator.compile(expr, true); + match = (Boolean) expression.execute(fieldValueMap); + } catch (CompileExpressionErrorException compileException) { + log.error("Alert Define Rule: {} Compile Error: {}.", expr, compileException.getMessage()); + } catch (ExpressionRuntimeException expressionRuntimeException) { + log.error("Alert Define Rule: {} Run Error: {}.", expr, expressionRuntimeException.getMessage()); + } + if (match != null && match) { // If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered // 阈值规则匹配，判断已触发阈值次数，触发告警 @@ -261,7 +271,7 @@ private void calculate(CollectRep.MetricsData metricsData) { break; } } catch (Exception e) { - log.warn(e.getMessage()); + log.warn(e.getMessage(), e); } } } diff --git a/alerter/src/main/java/com/usthe/alert/config/AlerterAutoConfiguration.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/config/AlerterAutoConfiguration.java similarity index 90% rename from alerter/src/main/java/com/usthe/alert/config/AlerterAutoConfiguration.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/config/AlerterAutoConfiguration.java index 2f0951f0de3..d3b0d09008e 100644 --- a/alerter/src/main/java/com/usthe/alert/config/AlerterAutoConfiguration.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/config/AlerterAutoConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.alert.config; +package org.dromara.hertzbeat.alert.config; import org.springframework.context.annotation.ComponentScan; @@ -24,6 +24,6 @@ * @version 2.1 * Created by Musk.Chen on 2023/1/14 */ -@ComponentScan(basePackages = "com.usthe.alert") +@ComponentScan(basePackages = "org.dromara.hertzbeat.alert") public class AlerterAutoConfiguration { } diff --git a/alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefineController.java similarity index 94% rename from alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefineController.java index ac2ff14e7d5..d16669285e0 100644 --- a/alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefineController.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.alert.controller; +package org.dromara.hertzbeat.alert.controller; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.common.entity.alerter.AlertDefineMonitorBind; -import com.usthe.alert.service.AlertDefineService; -import com.usthe.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.dromara.hertzbeat.alert.service.AlertDefineService; +import org.dromara.hertzbeat.common.entity.dto.Message; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -40,7 +40,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.usthe.common.util.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.MONITOR_NOT_EXIST_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** diff --git a/alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java similarity index 95% rename from alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java index 2685761b0e0..513b88224c9 100644 --- a/alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.alert.controller; +package org.dromara.hertzbeat.alert.controller; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.alert.service.AlertDefineService; -import com.usthe.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.alert.service.AlertDefineService; +import org.dromara.hertzbeat.common.entity.dto.Message; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/alerter/src/main/java/com/usthe/alert/controller/AlertsController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertsController.java similarity index 95% rename from alerter/src/main/java/com/usthe/alert/controller/AlertsController.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertsController.java index 7dc1320303f..599e0449bae 100644 --- a/alerter/src/main/java/com/usthe/alert/controller/AlertsController.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertsController.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.alert.controller; +package org.dromara.hertzbeat.alert.controller; -import com.usthe.alert.dto.AlertSummary; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.alert.service.AlertService; -import com.usthe.common.entity.dto.AlertReport; -import com.usthe.common.entity.dto.Message; +import org.dromara.hertzbeat.alert.dto.AlertSummary; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.alert.service.AlertService; +import org.dromara.hertzbeat.common.entity.dto.AlertReport; +import org.dromara.hertzbeat.common.entity.dto.Message; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/alerter/src/main/java/com/usthe/alert/dao/AlertDao.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDao.java similarity index 87% rename from alerter/src/main/java/com/usthe/alert/dao/AlertDao.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDao.java index 5876e0d3c4b..080a160a4f9 100644 --- a/alerter/src/main/java/com/usthe/alert/dao/AlertDao.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDao.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.alert.dao; +package org.dromara.hertzbeat.alert.dao; -import com.usthe.alert.dto.AlertPriorityNum; -import com.usthe.common.entity.alerter.Alert; +import org.dromara.hertzbeat.alert.dto.AlertPriorityNum; +import org.dromara.hertzbeat.common.entity.alerter.Alert; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -60,6 +60,6 @@ public interface AlertDao extends JpaRepository, JpaSpecificationEx * * @return Number of alerts 告警数量 */ - @Query("select new com.usthe.alert.dto.AlertPriorityNum(mo.priority, count(mo.id)) from Alert mo where mo.status = 0 group by mo.priority") + @Query("select new org.dromara.hertzbeat.alert.dto.AlertPriorityNum(mo.priority, count(mo.id)) from Alert mo where mo.status = 0 group by mo.priority") List findAlertPriorityNum(); } diff --git a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineBindDao.java similarity index 95% rename from alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineBindDao.java index 41c00b24921..1203952620b 100644 --- a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineBindDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.alert.dao; +package org.dromara.hertzbeat.alert.dao; -import com.usthe.common.entity.alerter.AlertDefineMonitorBind; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineDao.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineDao.java similarity index 96% rename from alerter/src/main/java/com/usthe/alert/dao/AlertDefineDao.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineDao.java index be9b1725e80..23cdc1c63d9 100644 --- a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineDao.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.alert.dao; +package org.dromara.hertzbeat.alert.dao; -import com.usthe.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; diff --git a/alerter/src/main/java/com/usthe/alert/dao/AlertMonitorDao.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertMonitorDao.java similarity index 93% rename from alerter/src/main/java/com/usthe/alert/dao/AlertMonitorDao.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertMonitorDao.java index 06d0696cabb..7fcf5deea5e 100644 --- a/alerter/src/main/java/com/usthe/alert/dao/AlertMonitorDao.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertMonitorDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.alert.dao; +package org.dromara.hertzbeat.alert.dao; -import com.usthe.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Monitor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/alerter/src/main/java/com/usthe/alert/dto/AlertPriorityNum.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertPriorityNum.java similarity index 96% rename from alerter/src/main/java/com/usthe/alert/dto/AlertPriorityNum.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertPriorityNum.java index 9c790c2c960..2874596c262 100644 --- a/alerter/src/main/java/com/usthe/alert/dto/AlertPriorityNum.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertPriorityNum.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.alert.dto; +package org.dromara.hertzbeat.alert.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/alerter/src/main/java/com/usthe/alert/dto/AlertSummary.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertSummary.java similarity index 98% rename from alerter/src/main/java/com/usthe/alert/dto/AlertSummary.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertSummary.java index 1eec636b202..0ebb84a33ea 100644 --- a/alerter/src/main/java/com/usthe/alert/dto/AlertSummary.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertSummary.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.alert.dto; +package org.dromara.hertzbeat.alert.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineService.java similarity index 96% rename from alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineService.java index 82b03c17b12..931d563e767 100644 --- a/alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.alert.service; +package org.dromara.hertzbeat.alert.service; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.common.entity.alerter.AlertDefineMonitorBind; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; diff --git a/alerter/src/main/java/com/usthe/alert/service/AlertService.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertService.java similarity index 92% rename from alerter/src/main/java/com/usthe/alert/service/AlertService.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertService.java index 6fb5b6d6748..e866602bef9 100644 --- a/alerter/src/main/java/com/usthe/alert/service/AlertService.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertService.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.alert.service; +package org.dromara.hertzbeat.alert.service; -import com.usthe.alert.dto.AlertSummary; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.dto.AlertReport; +import org.dromara.hertzbeat.alert.dto.AlertSummary; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.dto.AlertReport; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; diff --git a/alerter/src/main/java/com/usthe/alert/service/impl/AlertDefineServiceImpl.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java similarity index 92% rename from alerter/src/main/java/com/usthe/alert/service/impl/AlertDefineServiceImpl.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java index 84abc73931f..3b16362a944 100644 --- a/alerter/src/main/java/com/usthe/alert/service/impl/AlertDefineServiceImpl.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.alert.service.impl; +package org.dromara.hertzbeat.alert.service.impl; -import com.usthe.alert.dao.AlertDefineBindDao; -import com.usthe.alert.dao.AlertDefineDao; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.common.entity.alerter.AlertDefineMonitorBind; -import com.usthe.alert.service.AlertDefineService; +import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; +import org.dromara.hertzbeat.alert.dao.AlertDefineDao; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.dromara.hertzbeat.alert.service.AlertDefineService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java similarity index 91% rename from alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java index a391dd67278..02a72f42809 100644 --- a/alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.usthe.alert.service.impl; - -import com.usthe.common.queue.CommonDataQueue; -import com.usthe.alert.dao.AlertDao; -import com.usthe.alert.dto.AlertPriorityNum; -import com.usthe.alert.dto.AlertSummary; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.alert.service.AlertService; -import com.usthe.common.entity.dto.AlertReport; -import com.usthe.common.util.CommonConstants; +package org.dromara.hertzbeat.alert.service.impl; + +import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.dromara.hertzbeat.alert.dao.AlertDao; +import org.dromara.hertzbeat.alert.dto.AlertPriorityNum; +import org.dromara.hertzbeat.alert.dto.AlertSummary; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.alert.service.AlertService; +import org.dromara.hertzbeat.common.entity.dto.AlertReport; +import org.dromara.hertzbeat.common.util.CommonConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/alerter/src/main/java/com/usthe/alert/util/AlertTemplateUtil.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java similarity index 97% rename from alerter/src/main/java/com/usthe/alert/util/AlertTemplateUtil.java rename to alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java index 71077a927c7..d55bcc63eb7 100644 --- a/alerter/src/main/java/com/usthe/alert/util/AlertTemplateUtil.java +++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.alert.util; +package org.dromara.hertzbeat.alert.util; import lombok.extern.slf4j.Slf4j; diff --git a/alerter/src/main/resources/META-INF/spring.factories b/alerter/src/main/resources/META-INF/spring.factories index fde2583a99e..1bab83e6acc 100644 --- a/alerter/src/main/resources/META-INF/spring.factories +++ b/alerter/src/main/resources/META-INF/spring.factories @@ -14,4 +14,4 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.usthe.alert.config.AlerterAutoConfiguration \ No newline at end of file +org.dromara.hertzbeat.alert.config.AlerterAutoConfiguration \ No newline at end of file diff --git a/alerter/src/test/java/com/usthe/alert/AlerterWorkerPoolTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/AlerterWorkerPoolTest.java similarity index 96% rename from alerter/src/test/java/com/usthe/alert/AlerterWorkerPoolTest.java rename to alerter/src/test/java/org/dromara/hertzbeat/alert/AlerterWorkerPoolTest.java index ec80ca867ed..f61144b4e8e 100644 --- a/alerter/src/test/java/com/usthe/alert/AlerterWorkerPoolTest.java +++ b/alerter/src/test/java/org/dromara/hertzbeat/alert/AlerterWorkerPoolTest.java @@ -1,4 +1,4 @@ -package com.usthe.alert; +package org.dromara.hertzbeat.alert; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/alerter/src/test/java/com/usthe/alert/controller/AlertDefineControllerTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefineControllerTest.java similarity index 93% rename from alerter/src/test/java/com/usthe/alert/controller/AlertDefineControllerTest.java rename to alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefineControllerTest.java index 93442002148..42a46a1294a 100644 --- a/alerter/src/test/java/com/usthe/alert/controller/AlertDefineControllerTest.java +++ b/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefineControllerTest.java @@ -1,11 +1,11 @@ -package com.usthe.alert.controller; - -import com.usthe.alert.service.impl.AlertDefineServiceImpl; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.common.entity.alerter.AlertDefineMonitorBind; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; +package org.dromara.hertzbeat.alert.controller; + +import org.dromara.hertzbeat.alert.service.impl.AlertDefineServiceImpl; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/alerter/src/test/java/com/usthe/alert/controller/AlertDefinesControllerTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefinesControllerTest.java similarity index 95% rename from alerter/src/test/java/com/usthe/alert/controller/AlertDefinesControllerTest.java rename to alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefinesControllerTest.java index 01357eec0d1..80ea4839419 100644 --- a/alerter/src/test/java/com/usthe/alert/controller/AlertDefinesControllerTest.java +++ b/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefinesControllerTest.java @@ -1,9 +1,9 @@ -package com.usthe.alert.controller; +package org.dromara.hertzbeat.alert.controller; -import com.usthe.alert.service.AlertDefineService; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.alert.service.AlertDefineService; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/alerter/src/test/java/com/usthe/alert/controller/AlertsControllerTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertsControllerTest.java similarity index 94% rename from alerter/src/test/java/com/usthe/alert/controller/AlertsControllerTest.java rename to alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertsControllerTest.java index 6c817e90e6e..917f657d4c3 100644 --- a/alerter/src/test/java/com/usthe/alert/controller/AlertsControllerTest.java +++ b/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertsControllerTest.java @@ -1,11 +1,11 @@ -package com.usthe.alert.controller; - -import com.usthe.alert.dto.AlertSummary; -import com.usthe.alert.service.AlertService; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.dto.AlertReport; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; +package org.dromara.hertzbeat.alert.controller; + +import org.dromara.hertzbeat.alert.dto.AlertSummary; +import org.dromara.hertzbeat.alert.service.AlertService; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.dto.AlertReport; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/alerter/src/test/java/com/usthe/alert/service/AlertDefineServiceTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java similarity index 92% rename from alerter/src/test/java/com/usthe/alert/service/AlertDefineServiceTest.java rename to alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java index 5251068c086..d713675444d 100644 --- a/alerter/src/test/java/com/usthe/alert/service/AlertDefineServiceTest.java +++ b/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java @@ -1,11 +1,11 @@ -package com.usthe.alert.service; - -import com.usthe.alert.dao.AlertDefineBindDao; -import com.usthe.alert.dao.AlertDefineDao; -import com.usthe.alert.service.impl.AlertDefineServiceImpl; -import com.usthe.common.entity.alerter.AlertDefine; -import com.usthe.common.entity.alerter.AlertDefineMonitorBind; -import com.usthe.common.entity.manager.Monitor; +package org.dromara.hertzbeat.alert.service; + +import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; +import org.dromara.hertzbeat.alert.dao.AlertDefineDao; +import org.dromara.hertzbeat.alert.service.impl.AlertDefineServiceImpl; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.dromara.hertzbeat.common.entity.manager.Monitor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/alerter/src/test/java/com/usthe/alert/service/AlertServiceTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertServiceTest.java similarity index 85% rename from alerter/src/test/java/com/usthe/alert/service/AlertServiceTest.java rename to alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertServiceTest.java index c5cce11196c..c09be84fc1f 100644 --- a/alerter/src/test/java/com/usthe/alert/service/AlertServiceTest.java +++ b/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertServiceTest.java @@ -1,10 +1,8 @@ -package com.usthe.alert.service; +package org.dromara.hertzbeat.alert.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link AlertService} */ diff --git a/alerter/src/test/java/com/usthe/alert/util/AlertTemplateUtilTest.java b/alerter/src/test/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtilTest.java similarity index 98% rename from alerter/src/test/java/com/usthe/alert/util/AlertTemplateUtilTest.java rename to alerter/src/test/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtilTest.java index bbbe3e2c75a..76c5627934e 100644 --- a/alerter/src/test/java/com/usthe/alert/util/AlertTemplateUtilTest.java +++ b/alerter/src/test/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtilTest.java @@ -1,4 +1,4 @@ -package com.usthe.alert.util; +package org.dromara.hertzbeat.alert.util; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/pom.xml b/collector/pom.xml index f2b6f38245c..475bcee5d85 100644 --- a/collector/pom.xml +++ b/collector/pom.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - com.usthe.tancloud + org.dromara.hertzbeat 1.0 4.0.0 @@ -44,7 +44,7 @@ - com.usthe.tancloud + org.dromara.hertzbeat common 1.0 diff --git a/collector/src/main/java/com/usthe/collector/collect/AbstractCollect.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractCollect.java similarity index 90% rename from collector/src/main/java/com/usthe/collector/collect/AbstractCollect.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractCollect.java index bb4a80d1dca..379c3c22e24 100644 --- a/collector/src/main/java/com/usthe/collector/collect/AbstractCollect.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractCollect.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.collector.collect; +package org.dromara.hertzbeat.collector.collect; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.message.CollectRep; /** * Specific indicator group collection implementation abstract class diff --git a/collector/src/main/java/com/usthe/collector/collect/AbstractParseResponse.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractParseResponse.java similarity index 77% rename from collector/src/main/java/com/usthe/collector/collect/AbstractParseResponse.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractParseResponse.java index d92edb54da7..437ca376614 100644 --- a/collector/src/main/java/com/usthe/collector/collect/AbstractParseResponse.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractParseResponse.java @@ -1,7 +1,7 @@ -package com.usthe.collector.collect; +package org.dromara.hertzbeat.collector.collect; -import com.usthe.common.entity.job.protocol.HttpProtocol; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import org.springframework.beans.factory.InitializingBean; import java.util.List; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/cache/CacheCloseable.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheCloseable.java similarity index 94% rename from collector/src/main/java/com/usthe/collector/collect/common/cache/CacheCloseable.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheCloseable.java index e987ddd5fe6..3f7191cf206 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/cache/CacheCloseable.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheCloseable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; /** * 连接资源关闭回调接口 diff --git a/collector/src/main/java/com/usthe/collector/collect/common/cache/CacheIdentifier.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheIdentifier.java similarity index 95% rename from collector/src/main/java/com/usthe/collector/collect/common/cache/CacheIdentifier.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheIdentifier.java index 931ec2f9ccc..ebf1211db48 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/cache/CacheIdentifier.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheIdentifier.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; import lombok.Builder; import lombok.Data; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/cache/CommonCache.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCache.java similarity index 99% rename from collector/src/main/java/com/usthe/collector/collect/common/cache/CommonCache.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCache.java index d1381c1aa1d..50e2c4962f9 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/cache/CommonCache.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCache.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/cache/JdbcConnect.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JdbcConnect.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/collect/common/cache/JdbcConnect.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JdbcConnect.java index a58c61e7ad4..22cc2a99006 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/cache/JdbcConnect.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JdbcConnect.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/cache/JmxConnect.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JmxConnect.java similarity index 92% rename from collector/src/main/java/com/usthe/collector/collect/common/cache/JmxConnect.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JmxConnect.java index 814d38dbd5f..c91048b7482 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/cache/JmxConnect.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JmxConnect.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/cache/MongodbConnect.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/MongodbConnect.java similarity index 92% rename from collector/src/main/java/com/usthe/collector/collect/common/cache/MongodbConnect.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/MongodbConnect.java index 9de521531eb..09e51412ff9 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/cache/MongodbConnect.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/MongodbConnect.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; import com.mongodb.client.MongoClient; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/cache/RedisConnect.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/RedisConnect.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/collect/common/cache/RedisConnect.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/RedisConnect.java index f82a39c3bc8..70e0e47ae39 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/cache/RedisConnect.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/RedisConnect.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; import io.lettuce.core.api.StatefulConnection; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/http/CommonHttpClient.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClient.java similarity index 99% rename from collector/src/main/java/com/usthe/collector/collect/common/http/CommonHttpClient.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClient.java index 581a197af28..ac83a4199ae 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/http/CommonHttpClient.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.common.http; +package org.dromara.hertzbeat.collector.collect.common.http; import lombok.extern.slf4j.Slf4j; import org.apache.http.client.config.RequestConfig; diff --git a/collector/src/main/java/com/usthe/collector/collect/common/ssh/CommonSshClient.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClient.java similarity index 95% rename from collector/src/main/java/com/usthe/collector/collect/common/ssh/CommonSshClient.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClient.java index c9e6d604669..cad252def41 100644 --- a/collector/src/main/java/com/usthe/collector/collect/common/ssh/CommonSshClient.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClient.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.common.ssh; +package org.dromara.hertzbeat.collector.collect.common.ssh; import lombok.extern.slf4j.Slf4j; import org.apache.sshd.client.SshClient; diff --git a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollect.java similarity index 94% rename from collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollect.java index fd706731d3d..8169e478912 100644 --- a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollect.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.usthe.collector.collect.database; +package org.dromara.hertzbeat.collector.collect.database; import com.mysql.cj.jdbc.exceptions.CommunicationsException; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.collect.common.cache.CacheIdentifier; -import com.usthe.collector.collect.common.cache.CommonCache; -import com.usthe.collector.collect.common.cache.JdbcConnect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectUtil; -import com.usthe.collector.util.CollectorConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.JdbcProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; +import org.dromara.hertzbeat.collector.collect.common.cache.CommonCache; +import org.dromara.hertzbeat.collector.collect.common.cache.JdbcConnect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.collector.util.CollectorConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.JdbcProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.postgresql.util.PSQLException; diff --git a/collector/src/main/java/com/usthe/collector/collect/database/JdbcSpiLoader.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoader.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/collect/database/JdbcSpiLoader.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoader.java index 6b000c123ce..fa492512061 100644 --- a/collector/src/main/java/com/usthe/collector/collect/database/JdbcSpiLoader.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.database; +package org.dromara.hertzbeat.collector.collect.database; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; diff --git a/collector/src/main/java/com/usthe/collector/collect/ftp/FtpCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ftp/FtpCollectImpl.java similarity index 91% rename from collector/src/main/java/com/usthe/collector/collect/ftp/FtpCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/ftp/FtpCollectImpl.java index 17e36a0d7c0..cca82ea9f2a 100644 --- a/collector/src/main/java/com/usthe/collector/collect/ftp/FtpCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ftp/FtpCollectImpl.java @@ -1,12 +1,12 @@ -package com.usthe.collector.collect.ftp; +package org.dromara.hertzbeat.collector.collect.ftp; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.FtpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.FtpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.ftp.FTPClient; import org.springframework.util.Assert; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java index 034bd997d0e..e5359df6d3b 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java @@ -15,26 +15,28 @@ * limitations under the License. */ -package com.usthe.collector.collect.http; +package org.dromara.hertzbeat.collector.collect.http; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.collect.common.http.CommonHttpClient; -import com.usthe.collector.collect.http.promethus.exporter.ExporterParser; -import com.usthe.collector.collect.http.promethus.exporter.MetricFamily; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectUtil; -import com.usthe.collector.util.CollectorConstants; -import com.usthe.collector.util.JsonPathParser; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.HttpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; -import com.usthe.common.util.IpDomainUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.collect.common.http.CommonHttpClient; +import org.dromara.hertzbeat.collector.collect.http.promethus.exporter.ExporterParser; +import org.dromara.hertzbeat.collector.collect.http.promethus.exporter.MetricFamily; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.collector.util.CollectorConstants; +import org.dromara.hertzbeat.collector.util.JsonPathParser; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.IpDomainUtil; +import org.dromara.hertzbeat.collector.collect.http.promethus.AbstractPrometheusParse; +import org.dromara.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.util.Base64; import org.apache.http.HttpHeaders; @@ -62,8 +64,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.usthe.collector.collect.http.promethus.AbstractPrometheusParse; -import com.usthe.collector.collect.http.promethus.PrometheusParseCreater; import javax.net.ssl.SSLException; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/SslCertificateCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java similarity index 92% rename from collector/src/main/java/com/usthe/collector/collect/http/SslCertificateCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java index 5aa6c496c08..7bf57ac1126 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/SslCertificateCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.usthe.collector.collect.http; +package org.dromara.hertzbeat.collector.collect.http; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectorConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.HttpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; -import com.usthe.common.util.IpDomainUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectorConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.IpDomainUtil; import lombok.extern.slf4j.Slf4j; import javax.net.ssl.HttpsURLConnection; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/AbstractPrometheusParse.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java similarity index 88% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/AbstractPrometheusParse.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java index be0cb62d631..8b7c634f2dc 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/AbstractPrometheusParse.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java @@ -1,7 +1,7 @@ -package com.usthe.collector.collect.http.promethus; +package org.dromara.hertzbeat.collector.collect.http.promethus; -import com.usthe.common.entity.job.protocol.HttpProtocol; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import java.util.List; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/ParseException.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/ParseException.java similarity index 72% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/ParseException.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/ParseException.java index 5b6c6408eb6..5311f00f3b5 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/ParseException.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/ParseException.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.http.promethus; +package org.dromara.hertzbeat.collector.collect.http.promethus; /** * @author ceilzcx diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusLastParser.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java similarity index 75% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusLastParser.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java index 5b9b7e26f97..78ab90c31a3 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusLastParser.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java @@ -1,8 +1,8 @@ -package com.usthe.collector.collect.http.promethus; +package org.dromara.hertzbeat.collector.collect.http.promethus; -import com.usthe.common.entity.job.protocol.HttpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; +import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusMatrixParser.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java similarity index 86% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusMatrixParser.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java index b66ac6bc8f6..bcc78a78b24 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusMatrixParser.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java @@ -1,13 +1,13 @@ -package com.usthe.collector.collect.http.promethus; +package org.dromara.hertzbeat.collector.collect.http.promethus; import com.google.gson.JsonElement; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectUtil; -import com.usthe.common.entity.dto.PromVectorOrMatrix; -import com.usthe.common.entity.job.protocol.HttpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.common.entity.dto.PromVectorOrMatrix; +import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; import lombok.NoArgsConstructor; import java.math.BigDecimal; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusParseCreater.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java similarity index 91% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusParseCreater.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java index 21180c94698..7a66df3c784 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusParseCreater.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.http.promethus; +package org.dromara.hertzbeat.collector.collect.http.promethus; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusVectorParser.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java similarity index 85% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusVectorParser.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java index 3fa25321b9c..57cbceb8bb4 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/PrometheusVectorParser.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java @@ -1,13 +1,13 @@ -package com.usthe.collector.collect.http.promethus; +package org.dromara.hertzbeat.collector.collect.http.promethus; import com.google.gson.JsonElement; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectUtil; -import com.usthe.common.entity.dto.PromVectorOrMatrix; -import com.usthe.common.entity.job.protocol.HttpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.common.entity.dto.PromVectorOrMatrix; +import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; import lombok.NoArgsConstructor; import java.math.BigDecimal; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/ExporterParser.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java similarity index 98% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/ExporterParser.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java index 4f039e8f5a3..af41f036eaa 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/ExporterParser.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java @@ -1,7 +1,7 @@ -package com.usthe.collector.collect.http.promethus.exporter; +package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; -import com.usthe.collector.collect.http.promethus.ParseException; -import com.usthe.common.util.StrBuffer; +import org.dromara.hertzbeat.collector.collect.http.promethus.ParseException; +import org.dromara.hertzbeat.common.util.StrBuffer; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/MetricFamily.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/MetricFamily.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java index ab99d754b77..c9274e74cc9 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/MetricFamily.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.http.promethus.exporter; +package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; import lombok.Data; import lombok.ToString; diff --git a/collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/MetricType.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java similarity index 91% rename from collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/MetricType.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java index 0bdb7fcecdd..44fb9edf5d9 100644 --- a/collector/src/main/java/com/usthe/collector/collect/http/promethus/exporter/MetricType.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.http.promethus.exporter; +package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; /** * prometheus metrics type diff --git a/collector/src/main/java/com/usthe/collector/collect/icmp/IcmpCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java similarity index 87% rename from collector/src/main/java/com/usthe/collector/collect/icmp/IcmpCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java index 814e7f0082d..2c245062702 100644 --- a/collector/src/main/java/com/usthe/collector/collect/icmp/IcmpCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.usthe.collector.collect.icmp; +package org.dromara.hertzbeat.collector.collect.icmp; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectorConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.IcmpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectorConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.IcmpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/collector/src/main/java/com/usthe/collector/collect/jmx/JmxCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImpl.java similarity index 91% rename from collector/src/main/java/com/usthe/collector/collect/jmx/JmxCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImpl.java index cbb26eac2e3..0b0ff293e9c 100644 --- a/collector/src/main/java/com/usthe/collector/collect/jmx/JmxCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImpl.java @@ -1,15 +1,15 @@ -package com.usthe.collector.collect.jmx; - -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.collect.common.cache.CacheIdentifier; -import com.usthe.collector.collect.common.cache.CommonCache; -import com.usthe.collector.collect.common.cache.JmxConnect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.JmxProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +package org.dromara.hertzbeat.collector.collect.jmx; + +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; +import org.dromara.hertzbeat.collector.collect.common.cache.CommonCache; +import org.dromara.hertzbeat.collector.collect.common.cache.JmxConnect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.JmxProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; diff --git a/collector/src/main/java/com/usthe/collector/collect/mongodb/MongodbSingleCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java similarity index 91% rename from collector/src/main/java/com/usthe/collector/collect/mongodb/MongodbSingleCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java index b52cd1cf274..17cf68cf28c 100644 --- a/collector/src/main/java/com/usthe/collector/collect/mongodb/MongodbSingleCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.collect.mongodb; +package org.dromara.hertzbeat.collector.collect.mongodb; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -24,23 +24,22 @@ import com.mongodb.MongoServerUnavailableException; import com.mongodb.MongoTimeoutException; -import com.usthe.collector.collect.common.cache.CacheIdentifier; -import com.usthe.collector.collect.common.cache.CommonCache; -import com.usthe.collector.collect.common.cache.MongodbConnect; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; +import org.dromara.hertzbeat.collector.collect.common.cache.CommonCache; +import org.dromara.hertzbeat.collector.collect.common.cache.MongodbConnect; +import org.dromara.hertzbeat.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.MongodbProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; import org.bson.Document; import org.springframework.util.Assert; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.MongodbProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.entity.message.CollectRep.MetricsData.Builder; -import com.usthe.common.util.CommonConstants; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; import lombok.extern.slf4j.Slf4j; @@ -83,7 +82,7 @@ public class MongodbSingleCollectImpl extends AbstractCollect { }; @Override - public void collect(Builder builder, long appId, String app, Metrics metrics) { + public void collect(CollectRep.MetricsData.Builder builder, long appId, String app, Metrics metrics) { try { preCheck(metrics); } catch (Exception e) { diff --git a/collector/src/main/java/com/usthe/collector/collect/redis/RedisCommonCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java similarity index 90% rename from collector/src/main/java/com/usthe/collector/collect/redis/RedisCommonCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java index 0702872eeac..bb83abdb0e1 100644 --- a/collector/src/main/java/com/usthe/collector/collect/redis/RedisCommonCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java @@ -1,16 +1,18 @@ -package com.usthe.collector.collect.redis; +package org.dromara.hertzbeat.collector.collect.redis; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.collect.common.cache.CacheIdentifier; -import com.usthe.collector.collect.common.cache.CommonCache; -import com.usthe.collector.collect.common.cache.RedisConnect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectUtil; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.RedisProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; +import org.dromara.hertzbeat.collector.collect.common.cache.CommonCache; +import org.dromara.hertzbeat.collector.collect.common.cache.RedisConnect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.RedisProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.MapCapUtil; +import org.dromara.hertzbeat.common.util.SignConstants; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisConnectionException; import io.lettuce.core.RedisURI; @@ -29,9 +31,6 @@ import java.time.Duration; import java.util.*; -import static com.usthe.common.util.MapCapUtil.calInitMap; -import static com.usthe.common.util.SignConstants.*; - /** * Redis single cluster collector * @@ -269,11 +268,11 @@ private RedisURI redisUri(RedisProtocol redisProtocol) { } private String removeCr(String value) { - return value.replace(CARRIAGE_RETURN, ""); + return value.replace(SignConstants.CARRIAGE_RETURN, ""); } private String doUri(String ip, Integer port) { - return ip + DOUBLE_MARK + port; + return ip + SignConstants.DOUBLE_MARK + port; } private CacheIdentifier doIdentifier(RedisProtocol redisProtocol) { @@ -286,12 +285,12 @@ private CacheIdentifier doIdentifier(RedisProtocol redisProtocol) { } private Map parseInfo(String info) { - String[] lines = info.split(LINE_FEED); - Map result = new HashMap<>(calInitMap(lines.length)); + String[] lines = info.split(SignConstants.LINE_FEED); + Map result = new HashMap<>(MapCapUtil.calInitMap(lines.length)); Arrays.stream(lines) - .filter(it -> StringUtils.hasText(it) && !it.startsWith(WELL_NO) && it.contains(DOUBLE_MARK)) + .filter(it -> StringUtils.hasText(it) && !it.startsWith(SignConstants.WELL_NO) && it.contains(SignConstants.DOUBLE_MARK)) .map(this::removeCr) - .map(r -> r.split(DOUBLE_MARK)) + .map(r -> r.split(SignConstants.DOUBLE_MARK)) .forEach(it -> { if (it.length > 1) { result.put(it[0], it[1]); diff --git a/collector/src/main/java/com/usthe/collector/collect/snmp/SnmpCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java similarity index 95% rename from collector/src/main/java/com/usthe/collector/collect/snmp/SnmpCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java index 69b103ac403..504d2590d1b 100644 --- a/collector/src/main/java/com/usthe/collector/collect/snmp/SnmpCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.usthe.collector.collect.snmp; +package org.dromara.hertzbeat.collector.collect.snmp; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectUtil; -import com.usthe.collector.util.CollectorConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.SnmpProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.collector.util.CollectorConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.SnmpProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.snmp4j.PDU; import org.snmp4j.Snmp; diff --git a/collector/src/main/java/com/usthe/collector/collect/ssh/SshCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImpl.java similarity index 93% rename from collector/src/main/java/com/usthe/collector/collect/ssh/SshCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImpl.java index c5388ff39f7..22b9d0a5078 100644 --- a/collector/src/main/java/com/usthe/collector/collect/ssh/SshCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImpl.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.usthe.collector.collect.ssh; +package org.dromara.hertzbeat.collector.collect.ssh; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.collect.common.cache.CacheIdentifier; -import com.usthe.collector.collect.common.cache.CommonCache; -import com.usthe.collector.collect.common.ssh.CommonSshClient; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectorConstants; -import com.usthe.collector.util.KeyPairUtil; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.SshProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; +import org.dromara.hertzbeat.collector.collect.common.cache.CommonCache; +import org.dromara.hertzbeat.collector.collect.common.ssh.CommonSshClient; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectorConstants; +import org.dromara.hertzbeat.collector.util.KeyPairUtil; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.SshProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.apache.sshd.client.SshClient; import org.apache.sshd.client.channel.ClientChannel; diff --git a/collector/src/main/java/com/usthe/collector/collect/strategy/CollectStrategyFactory.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java similarity index 91% rename from collector/src/main/java/com/usthe/collector/collect/strategy/CollectStrategyFactory.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java index 8d99655df7c..2f33d43992f 100644 --- a/collector/src/main/java/com/usthe/collector/collect/strategy/CollectStrategyFactory.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java @@ -1,6 +1,6 @@ -package com.usthe.collector.collect.strategy; +package org.dromara.hertzbeat.collector.collect.strategy; -import com.usthe.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Configuration; diff --git a/collector/src/main/java/com/usthe/collector/collect/strategy/ParseStrategyFactory.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/ParseStrategyFactory.java similarity index 84% rename from collector/src/main/java/com/usthe/collector/collect/strategy/ParseStrategyFactory.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/ParseStrategyFactory.java index 60a629231f2..088c66865b8 100644 --- a/collector/src/main/java/com/usthe/collector/collect/strategy/ParseStrategyFactory.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/ParseStrategyFactory.java @@ -1,7 +1,7 @@ -package com.usthe.collector.collect.strategy; +package org.dromara.hertzbeat.collector.collect.strategy; -import com.usthe.collector.collect.AbstractParseResponse; -import com.usthe.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.collect.AbstractParseResponse; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; import org.springframework.util.StringUtils; import java.util.concurrent.ConcurrentHashMap; diff --git a/collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java similarity index 88% rename from collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java index 9bfc0828e08..6b0bd3bbadd 100644 --- a/collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.usthe.collector.collect.telnet; +package org.dromara.hertzbeat.collector.collect.telnet; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.dispatch.DispatchConstants; -import com.usthe.collector.util.CollectorConstants; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.TelnetProtocol; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; +import org.dromara.hertzbeat.collector.util.CollectorConstants; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.TelnetProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.telnet.TelnetClient; diff --git a/collector/src/main/java/com/usthe/collector/config/CollectorAutoConfiguration.java b/collector/src/main/java/org/dromara/hertzbeat/collector/config/CollectorAutoConfiguration.java similarity index 90% rename from collector/src/main/java/com/usthe/collector/config/CollectorAutoConfiguration.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/config/CollectorAutoConfiguration.java index 1387e112a30..21628b44252 100644 --- a/collector/src/main/java/com/usthe/collector/config/CollectorAutoConfiguration.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/config/CollectorAutoConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.config; +package org.dromara.hertzbeat.collector.config; import org.springframework.context.annotation.ComponentScan; @@ -24,6 +24,6 @@ * @version 2.1 * Created by Musk.Chen on 2023/1/14 */ -@ComponentScan(basePackages = "com.usthe.collector") +@ComponentScan(basePackages = "org.dromara.hertzbeat.collector") public class CollectorAutoConfiguration { } diff --git a/collector/src/main/java/com/usthe/collector/dispatch/CollectDataDispatch.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CollectDataDispatch.java similarity index 86% rename from collector/src/main/java/com/usthe/collector/dispatch/CollectDataDispatch.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CollectDataDispatch.java index d4201c0dc8b..1ca57452d8a 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/CollectDataDispatch.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CollectDataDispatch.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; -import com.usthe.collector.dispatch.timer.Timeout; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.message.CollectRep; /** * Collection data scheduler interface diff --git a/collector/src/main/java/com/usthe/collector/dispatch/CommonDispatcher.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcher.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/dispatch/CommonDispatcher.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcher.java index bb7d8f44f88..961a8674a84 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/CommonDispatcher.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcher.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.usthe.collector.dispatch.timer.Timeout; -import com.usthe.collector.dispatch.timer.TimerDispatch; -import com.usthe.collector.dispatch.timer.WheelTimerTask; -import com.usthe.collector.dispatch.unit.UnitConvert; -import com.usthe.collector.util.CollectUtil; -import com.usthe.common.entity.job.Configmap; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.queue.CommonDataQueue; +import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; +import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; +import org.dromara.hertzbeat.collector.dispatch.timer.WheelTimerTask; +import org.dromara.hertzbeat.collector.dispatch.unit.UnitConvert; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.common.entity.job.Configmap; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.queue.CommonDataQueue; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/DispatchConstants.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchConstants.java similarity index 98% rename from collector/src/main/java/com/usthe/collector/dispatch/DispatchConstants.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchConstants.java index 242912075d0..5a56402d24c 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/DispatchConstants.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; /** * dispatch constant 常量 diff --git a/collector/src/main/java/com/usthe/collector/dispatch/DispatchProperties.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchProperties.java similarity index 99% rename from collector/src/main/java/com/usthe/collector/dispatch/DispatchProperties.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchProperties.java index 01e163139f2..688ce39cbe9 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/DispatchProperties.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollect.java similarity index 95% rename from collector/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollect.java index 930ccc81dd3..20f03036342 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollect.java @@ -15,27 +15,26 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; -import com.usthe.collector.collect.AbstractCollect; -import com.usthe.collector.collect.strategy.CollectStrategyFactory; -import com.usthe.collector.dispatch.timer.Timeout; -import com.usthe.collector.dispatch.timer.WheelTimerTask; -import com.usthe.collector.dispatch.unit.UnitConvert; -import com.usthe.collector.util.CollectUtil; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.CommonUtil; -import com.usthe.common.util.Pair; +import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.dromara.hertzbeat.collector.collect.strategy.CollectStrategyFactory; +import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; +import org.dromara.hertzbeat.collector.dispatch.timer.WheelTimerTask; +import org.dromara.hertzbeat.collector.dispatch.unit.UnitConvert; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.Pair; import lombok.Data; import lombok.extern.slf4j.Slf4j; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** diff --git a/collector/src/main/java/com/usthe/collector/dispatch/MetricsCollectorQueue.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueue.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/dispatch/MetricsCollectorQueue.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueue.java index 977fcb0d1f6..eff1d7f790a 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/MetricsCollectorQueue.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueue.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/MetricsTaskDispatch.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsTaskDispatch.java similarity index 90% rename from collector/src/main/java/com/usthe/collector/dispatch/MetricsTaskDispatch.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsTaskDispatch.java index 2ad783d9e13..f71252abba5 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/MetricsTaskDispatch.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsTaskDispatch.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; -import com.usthe.collector.dispatch.timer.Timeout; +import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; /** * Metric group collection task scheduler interface diff --git a/collector/src/main/java/com/usthe/collector/dispatch/WorkerPool.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/WorkerPool.java similarity index 98% rename from collector/src/main/java/com/usthe/collector/dispatch/WorkerPool.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/WorkerPool.java index 3d37f48ae39..65b480bac7c 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/WorkerPool.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/WorkerPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/entrance/internal/CollectJobService.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java similarity index 92% rename from collector/src/main/java/com/usthe/collector/dispatch/entrance/internal/CollectJobService.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java index 7bdc5e2f3f9..3576b6fa6ad 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/entrance/internal/CollectJobService.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.entrance.internal; +package org.dromara.hertzbeat.collector.dispatch.entrance.internal; -import com.usthe.collector.dispatch.timer.TimerDispatch; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.SnowFlakeIdGenerator; +import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.SnowFlakeIdGenerator; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/entrance/internal/CollectResponseEventListener.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java similarity index 90% rename from collector/src/main/java/com/usthe/collector/dispatch/entrance/internal/CollectResponseEventListener.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java index 083272086c7..f0538460300 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/entrance/internal/CollectResponseEventListener.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.entrance.internal; +package org.dromara.hertzbeat.collector.dispatch.entrance.internal; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import java.util.EventListener; import java.util.List; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/HashedWheelTimer.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java similarity index 99% rename from collector/src/main/java/com/usthe/collector/dispatch/timer/HashedWheelTimer.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java index f5d55db5693..ace2113901a 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/timer/HashedWheelTimer.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.timer; +package org.dromara.hertzbeat.collector.dispatch.timer; import org.slf4j.Logger; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/Timeout.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timeout.java similarity index 97% rename from collector/src/main/java/com/usthe/collector/dispatch/timer/Timeout.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timeout.java index 859132d5b2e..7506a14fc02 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/timer/Timeout.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timeout.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.timer; +package org.dromara.hertzbeat.collector.dispatch.timer; /** * A handle associated with a {@link TimerTask} that is returned by a diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/Timer.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timer.java similarity index 97% rename from collector/src/main/java/com/usthe/collector/dispatch/timer/Timer.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timer.java index 545220b8f20..e056e96cc37 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/timer/Timer.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.timer; +package org.dromara.hertzbeat.collector.dispatch.timer; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/TimerDispatch.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatch.java similarity index 89% rename from collector/src/main/java/com/usthe/collector/dispatch/timer/TimerDispatch.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatch.java index 6f71544fd90..4a2a7f6b070 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/timer/TimerDispatch.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatch.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.timer; +package org.dromara.hertzbeat.collector.dispatch.timer; -import com.usthe.collector.dispatch.entrance.internal.CollectResponseEventListener; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/TimerDispatcher.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatcher.java similarity index 93% rename from collector/src/main/java/com/usthe/collector/dispatch/timer/TimerDispatcher.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatcher.java index cac451cbd2a..69e4acd48ae 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/timer/TimerDispatcher.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatcher.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.timer; +package org.dromara.hertzbeat.collector.dispatch.timer; -import com.usthe.collector.dispatch.entrance.internal.CollectResponseEventListener; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import org.springframework.stereotype.Component; import java.util.List; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/TimerTask.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerTask.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/dispatch/timer/TimerTask.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerTask.java index 45da745686c..5fcec9b77e1 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/timer/TimerTask.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerTask.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.timer; +package org.dromara.hertzbeat.collector.dispatch.timer; import java.util.concurrent.TimeUnit; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/WheelTimerTask.java similarity index 87% rename from collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/WheelTimerTask.java index df5c7175236..dee3382fd1f 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/WheelTimerTask.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.usthe.collector.dispatch.timer; +package org.dromara.hertzbeat.collector.dispatch.timer; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.usthe.collector.dispatch.MetricsTaskDispatch; -import com.usthe.collector.util.CollectUtil; -import com.usthe.common.entity.job.Configmap; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.support.SpringContextHolder; -import com.usthe.common.util.AesUtil; -import com.usthe.common.util.CommonConstants; +import org.dromara.hertzbeat.collector.dispatch.MetricsTaskDispatch; +import org.dromara.hertzbeat.collector.util.CollectUtil; +import org.dromara.hertzbeat.common.entity.job.Configmap; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.support.SpringContextHolder; +import org.dromara.hertzbeat.common.util.AesUtil; +import org.dromara.hertzbeat.common.util.CommonConstants; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; diff --git a/collector/src/main/java/com/usthe/collector/dispatch/unit/DataUnit.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/DataUnit.java similarity index 95% rename from collector/src/main/java/com/usthe/collector/dispatch/unit/DataUnit.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/DataUnit.java index 16f9a3349ec..00d09d8cb45 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/unit/DataUnit.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/DataUnit.java @@ -1,4 +1,4 @@ -package com.usthe.collector.dispatch.unit; +package org.dromara.hertzbeat.collector.dispatch.unit; /** * the enum of data size diff --git a/collector/src/main/java/com/usthe/collector/dispatch/unit/UnitConvert.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/UnitConvert.java similarity index 93% rename from collector/src/main/java/com/usthe/collector/dispatch/unit/UnitConvert.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/UnitConvert.java index 9ba54ffe5ec..1689d7fa8b7 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/unit/UnitConvert.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/UnitConvert.java @@ -1,4 +1,4 @@ -package com.usthe.collector.dispatch.unit; +package org.dromara.hertzbeat.collector.dispatch.unit; /** * the interface of unit convert diff --git a/collector/src/main/java/com/usthe/collector/dispatch/unit/impl/DataSizeConvert.java b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java similarity index 88% rename from collector/src/main/java/com/usthe/collector/dispatch/unit/impl/DataSizeConvert.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java index 777fac11db4..232c90c43ff 100644 --- a/collector/src/main/java/com/usthe/collector/dispatch/unit/impl/DataSizeConvert.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java @@ -1,7 +1,7 @@ -package com.usthe.collector.dispatch.unit.impl; +package org.dromara.hertzbeat.collector.dispatch.unit.impl; -import com.usthe.collector.dispatch.unit.DataUnit; -import com.usthe.collector.dispatch.unit.UnitConvert; +import org.dromara.hertzbeat.collector.dispatch.unit.DataUnit; +import org.dromara.hertzbeat.collector.dispatch.unit.UnitConvert; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/collector/src/main/java/com/usthe/collector/util/CollectUtil.java b/collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectUtil.java similarity index 98% rename from collector/src/main/java/com/usthe/collector/util/CollectUtil.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectUtil.java index 1d2779c6925..8852f1ba247 100644 --- a/collector/src/main/java/com/usthe/collector/util/CollectUtil.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectUtil.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.collector.util; +package org.dromara.hertzbeat.collector.util; import com.google.gson.*; import com.google.gson.reflect.TypeToken; -import com.usthe.common.entity.job.Configmap; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.common.entity.job.Configmap; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Type; diff --git a/collector/src/main/java/com/usthe/collector/util/CollectorConstants.java b/collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectorConstants.java similarity index 96% rename from collector/src/main/java/com/usthe/collector/util/CollectorConstants.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectorConstants.java index 8402e8204d9..8fe3195595d 100644 --- a/collector/src/main/java/com/usthe/collector/util/CollectorConstants.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectorConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.util; +package org.dromara.hertzbeat.collector.util; /** * collector 常量 diff --git a/collector/src/main/java/com/usthe/collector/util/JsonPathParser.java b/collector/src/main/java/org/dromara/hertzbeat/collector/util/JsonPathParser.java similarity index 98% rename from collector/src/main/java/com/usthe/collector/util/JsonPathParser.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/util/JsonPathParser.java index 2bb735fd921..0281136f7ce 100644 --- a/collector/src/main/java/com/usthe/collector/util/JsonPathParser.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/util/JsonPathParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.util; +package org.dromara.hertzbeat.collector.util; import com.jayway.jsonpath.*; import com.jayway.jsonpath.spi.cache.CacheProvider; diff --git a/collector/src/main/java/com/usthe/collector/util/KeyPairUtil.java b/collector/src/main/java/org/dromara/hertzbeat/collector/util/KeyPairUtil.java similarity index 97% rename from collector/src/main/java/com/usthe/collector/util/KeyPairUtil.java rename to collector/src/main/java/org/dromara/hertzbeat/collector/util/KeyPairUtil.java index 598376dc776..26a5b85e2ab 100644 --- a/collector/src/main/java/com/usthe/collector/util/KeyPairUtil.java +++ b/collector/src/main/java/org/dromara/hertzbeat/collector/util/KeyPairUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.collector.util; +package org.dromara.hertzbeat.collector.util; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/resources/META-INF/services/com.usthe.collector.collect.AbstractCollect b/collector/src/main/resources/META-INF/services/com.usthe.collector.collect.AbstractCollect deleted file mode 100644 index dea46c8afb4..00000000000 --- a/collector/src/main/resources/META-INF/services/com.usthe.collector.collect.AbstractCollect +++ /dev/null @@ -1,11 +0,0 @@ -com.usthe.collector.collect.http.HttpCollectImpl -com.usthe.collector.collect.http.SslCertificateCollectImpl -com.usthe.collector.collect.database.JdbcCommonCollect -com.usthe.collector.collect.icmp.IcmpCollectImpl -com.usthe.collector.collect.jmx.JmxCollectImpl -com.usthe.collector.collect.redis.RedisCommonCollectImpl -com.usthe.collector.collect.mongodb.MongodbSingleCollectImpl -com.usthe.collector.collect.snmp.SnmpCollectImpl -com.usthe.collector.collect.ssh.SshCollectImpl -com.usthe.collector.collect.telnet.TelnetCollectImpl -com.usthe.collector.collect.ftp.FtpCollectImpl diff --git a/collector/src/main/resources/META-INF/services/org.dromara.hertzbeat.collector.collect.AbstractCollect b/collector/src/main/resources/META-INF/services/org.dromara.hertzbeat.collector.collect.AbstractCollect new file mode 100644 index 00000000000..ed4a1cfbecb --- /dev/null +++ b/collector/src/main/resources/META-INF/services/org.dromara.hertzbeat.collector.collect.AbstractCollect @@ -0,0 +1,11 @@ +org.dromara.hertzbeat.collector.collect.http.HttpCollectImpl +org.dromara.hertzbeat.collector.collect.http.SslCertificateCollectImpl +org.dromara.hertzbeat.collector.collect.database.JdbcCommonCollect +org.dromara.hertzbeat.collector.collect.icmp.IcmpCollectImpl +org.dromara.hertzbeat.collector.collect.jmx.JmxCollectImpl +org.dromara.hertzbeat.collector.collect.redis.RedisCommonCollectImpl +org.dromara.hertzbeat.collector.collect.mongodb.MongodbSingleCollectImpl +org.dromara.hertzbeat.collector.collect.snmp.SnmpCollectImpl +org.dromara.hertzbeat.collector.collect.ssh.SshCollectImpl +org.dromara.hertzbeat.collector.collect.telnet.TelnetCollectImpl +org.dromara.hertzbeat.collector.collect.ftp.FtpCollectImpl diff --git a/collector/src/main/resources/META-INF/spring.factories b/collector/src/main/resources/META-INF/spring.factories index 07edad56331..f7593858cd6 100644 --- a/collector/src/main/resources/META-INF/spring.factories +++ b/collector/src/main/resources/META-INF/spring.factories @@ -14,5 +14,5 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.usthe.collector.config.CollectorAutoConfiguration +org.dromara.hertzbeat.collector.config.CollectorAutoConfiguration diff --git a/collector/src/test/java/com/usthe/collector/collect/common/cache/CommonCacheTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCacheTest.java similarity index 82% rename from collector/src/test/java/com/usthe/collector/collect/common/cache/CommonCacheTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCacheTest.java index 81b40d1392c..bc4f237a717 100644 --- a/collector/src/test/java/com/usthe/collector/collect/common/cache/CommonCacheTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCacheTest.java @@ -1,11 +1,9 @@ -package com.usthe.collector.collect.common.cache; +package org.dromara.hertzbeat.collector.collect.common.cache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link CommonCache} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/common/http/CommonHttpClientTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java similarity index 70% rename from collector/src/test/java/com/usthe/collector/collect/common/http/CommonHttpClientTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java index ba6cb6f3314..a29503dc9c3 100644 --- a/collector/src/test/java/com/usthe/collector/collect/common/http/CommonHttpClientTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.collect.common.http; +package org.dromara.hertzbeat.collector.collect.common.http; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link CommonHttpClient} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/common/ssh/CommonSshClientTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java similarity index 67% rename from collector/src/test/java/com/usthe/collector/collect/common/ssh/CommonSshClientTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java index 7575ae3fc6e..2e05eb56cd8 100644 --- a/collector/src/test/java/com/usthe/collector/collect/common/ssh/CommonSshClientTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.collect.common.ssh; +package org.dromara.hertzbeat.collector.collect.common.ssh; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link CommonSshClient} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/database/JdbcCommonCollectTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java similarity index 60% rename from collector/src/test/java/com/usthe/collector/collect/database/JdbcCommonCollectTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java index 4855972e4ad..3046050fd51 100644 --- a/collector/src/test/java/com/usthe/collector/collect/database/JdbcCommonCollectTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java @@ -1,11 +1,8 @@ -package com.usthe.collector.collect.database; +package org.dromara.hertzbeat.collector.collect.database; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link JdbcCommonCollect} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/database/JdbcSpiLoaderTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java similarity index 59% rename from collector/src/test/java/com/usthe/collector/collect/database/JdbcSpiLoaderTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java index 3e759b1f550..dfb31fdae50 100644 --- a/collector/src/test/java/com/usthe/collector/collect/database/JdbcSpiLoaderTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java @@ -1,11 +1,8 @@ -package com.usthe.collector.collect.database; +package org.dromara.hertzbeat.collector.collect.database; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link JdbcSpiLoader} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/http/HttpCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImplTest.java similarity index 70% rename from collector/src/test/java/com/usthe/collector/collect/http/HttpCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImplTest.java index d5bb753fa65..599a0fd5a37 100644 --- a/collector/src/test/java/com/usthe/collector/collect/http/HttpCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImplTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.collect.http; +package org.dromara.hertzbeat.collector.collect.http; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link HttpCollectImpl} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/http/SslCertificateCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java similarity index 65% rename from collector/src/test/java/com/usthe/collector/collect/http/SslCertificateCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java index a4acd3e95ec..29e72d65c00 100644 --- a/collector/src/test/java/com/usthe/collector/collect/http/SslCertificateCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java @@ -1,11 +1,8 @@ -package com.usthe.collector.collect.http; +package org.dromara.hertzbeat.collector.collect.http; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link SslCertificateCollectImpl} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/http/promethus/exporter/ExporterParserTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java similarity index 97% rename from collector/src/test/java/com/usthe/collector/collect/http/promethus/exporter/ExporterParserTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java index 513465f48e8..825c64c4c2a 100644 --- a/collector/src/test/java/com/usthe/collector/collect/http/promethus/exporter/ExporterParserTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java @@ -1,4 +1,4 @@ -package com.usthe.collector.collect.http.promethus.exporter; +package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/com/usthe/collector/collect/icmp/IcmpCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java similarity index 64% rename from collector/src/test/java/com/usthe/collector/collect/icmp/IcmpCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java index 7cd6ee97fef..c5ac47a3b86 100644 --- a/collector/src/test/java/com/usthe/collector/collect/icmp/IcmpCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java @@ -1,11 +1,8 @@ -package com.usthe.collector.collect.icmp; +package org.dromara.hertzbeat.collector.collect.icmp; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link IcmpCollectImpl} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/jmx/JmxCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java similarity index 70% rename from collector/src/test/java/com/usthe/collector/collect/jmx/JmxCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java index 458692ab531..902241c2a1c 100644 --- a/collector/src/test/java/com/usthe/collector/collect/jmx/JmxCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.collect.jmx; +package org.dromara.hertzbeat.collector.collect.jmx; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link JmxCollectImpl} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/redis/RedisClusterCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java similarity index 83% rename from collector/src/test/java/com/usthe/collector/collect/redis/RedisClusterCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java index 21356e8243e..4a3737ea106 100644 --- a/collector/src/test/java/com/usthe/collector/collect/redis/RedisClusterCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java @@ -1,8 +1,8 @@ -package com.usthe.collector.collect.redis; +package org.dromara.hertzbeat.collector.collect.redis; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.RedisProtocol; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.RedisProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/collector/src/test/java/com/usthe/collector/collect/redis/RedisSingleCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java similarity index 83% rename from collector/src/test/java/com/usthe/collector/collect/redis/RedisSingleCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java index 801222729b1..0b10f4c2372 100644 --- a/collector/src/test/java/com/usthe/collector/collect/redis/RedisSingleCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java @@ -1,8 +1,8 @@ -package com.usthe.collector.collect.redis; +package org.dromara.hertzbeat.collector.collect.redis; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.job.protocol.RedisProtocol; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.protocol.RedisProtocol; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/collector/src/test/java/com/usthe/collector/collect/snmp/SnmpCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java similarity index 70% rename from collector/src/test/java/com/usthe/collector/collect/snmp/SnmpCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java index 6cef5a57581..06939f48513 100644 --- a/collector/src/test/java/com/usthe/collector/collect/snmp/SnmpCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.collect.snmp; +package org.dromara.hertzbeat.collector.collect.snmp; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link SnmpCollectImpl} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/ssh/SshCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImplTest.java similarity index 70% rename from collector/src/test/java/com/usthe/collector/collect/ssh/SshCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImplTest.java index 57f8894858c..3ae88214968 100644 --- a/collector/src/test/java/com/usthe/collector/collect/ssh/SshCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImplTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.collect.ssh; +package org.dromara.hertzbeat.collector.collect.ssh; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link SshCollectImpl} */ diff --git a/collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java similarity index 94% rename from collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java index be8a531ee87..c403d6b076c 100644 --- a/collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package com.usthe.collector.collect.telnet; +package org.dromara.hertzbeat.collector.collect.telnet; -import com.usthe.collector.collect.common.cache.CommonCache; import org.apache.commons.net.telnet.TelnetClient; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/com/usthe/collector/dispatch/CommonDispatcherTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcherTest.java similarity index 66% rename from collector/src/test/java/com/usthe/collector/dispatch/CommonDispatcherTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcherTest.java index 2d1165f45b4..572db73817c 100644 --- a/collector/src/test/java/com/usthe/collector/dispatch/CommonDispatcherTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcherTest.java @@ -1,11 +1,8 @@ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link CommonDispatcher} */ diff --git a/collector/src/test/java/com/usthe/collector/dispatch/MetricsCollectorQueueTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java similarity index 71% rename from collector/src/test/java/com/usthe/collector/dispatch/MetricsCollectorQueueTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java index 735ff911f3f..3ebf7bc63ba 100644 --- a/collector/src/test/java/com/usthe/collector/dispatch/MetricsCollectorQueueTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link MetricsCollectorQueue} */ diff --git a/collector/src/test/java/com/usthe/collector/dispatch/WorkerPoolTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/WorkerPoolTest.java similarity index 70% rename from collector/src/test/java/com/usthe/collector/dispatch/WorkerPoolTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/WorkerPoolTest.java index c06919ccebd..7564eda7e56 100644 --- a/collector/src/test/java/com/usthe/collector/dispatch/WorkerPoolTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/WorkerPoolTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.dispatch; +package org.dromara.hertzbeat.collector.dispatch; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link WorkerPool} */ diff --git a/collector/src/test/java/com/usthe/collector/dispatch/entrance/internal/CollectJobServiceTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java similarity index 74% rename from collector/src/test/java/com/usthe/collector/dispatch/entrance/internal/CollectJobServiceTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java index 9daaa93722e..107f72aa323 100644 --- a/collector/src/test/java/com/usthe/collector/dispatch/entrance/internal/CollectJobServiceTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java @@ -1,12 +1,9 @@ -package com.usthe.collector.dispatch.entrance.internal; +package org.dromara.hertzbeat.collector.dispatch.entrance.internal; -import com.usthe.collector.collect.common.cache.CommonCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link CollectJobService} */ diff --git a/collector/src/test/java/com/usthe/collector/util/CollectUtilTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/util/CollectUtilTest.java similarity index 96% rename from collector/src/test/java/com/usthe/collector/util/CollectUtilTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/util/CollectUtilTest.java index 4dfeafe2295..6363fc38729 100644 --- a/collector/src/test/java/com/usthe/collector/util/CollectUtilTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/util/CollectUtilTest.java @@ -1,9 +1,9 @@ -package com.usthe.collector.util; +package org.dromara.hertzbeat.collector.util; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.usthe.common.entity.job.Configmap; -import com.usthe.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.job.Configmap; +import org.dromara.hertzbeat.common.entity.job.Metrics; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/com/usthe/collector/util/JsonPathParserTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/util/JsonPathParserTest.java similarity index 99% rename from collector/src/test/java/com/usthe/collector/util/JsonPathParserTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/util/JsonPathParserTest.java index 8976a41a55a..6c2a5038eea 100644 --- a/collector/src/test/java/com/usthe/collector/util/JsonPathParserTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/util/JsonPathParserTest.java @@ -1,4 +1,4 @@ -package com.usthe.collector.util; +package org.dromara.hertzbeat.collector.util; import com.jayway.jsonpath.TypeRef; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/com/usthe/collector/util/KeyPairUtilTest.java b/collector/src/test/java/org/dromara/hertzbeat/collector/util/KeyPairUtilTest.java similarity index 98% rename from collector/src/test/java/com/usthe/collector/util/KeyPairUtilTest.java rename to collector/src/test/java/org/dromara/hertzbeat/collector/util/KeyPairUtilTest.java index 51c1bf1ac87..8929bb6b185 100644 --- a/collector/src/test/java/com/usthe/collector/util/KeyPairUtilTest.java +++ b/collector/src/test/java/org/dromara/hertzbeat/collector/util/KeyPairUtilTest.java @@ -1,4 +1,4 @@ -package com.usthe.collector.util; +package org.dromara.hertzbeat.collector.util; import org.apache.commons.codec.binary.Base64; import org.junit.jupiter.api.BeforeEach; diff --git a/common/pom.xml b/common/pom.xml index c42ed7e6320..66aaa0e8330 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - com.usthe.tancloud + org.dromara.hertzbeat 1.0 diff --git a/common/src/main/java/com/usthe/common/config/AviatorConfiguration.java b/common/src/main/java/org/dromara/hertzbeat/common/config/AviatorConfiguration.java similarity index 98% rename from common/src/main/java/com/usthe/common/config/AviatorConfiguration.java rename to common/src/main/java/org/dromara/hertzbeat/common/config/AviatorConfiguration.java index 7f69c57cd5a..0d5a3253adb 100644 --- a/common/src/main/java/com/usthe/common/config/AviatorConfiguration.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/config/AviatorConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.config; +package org.dromara.hertzbeat.common.config; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.lexer.token.OperatorType; diff --git a/common/src/main/java/com/usthe/common/config/CommonConfig.java b/common/src/main/java/org/dromara/hertzbeat/common/config/CommonConfig.java similarity index 89% rename from common/src/main/java/com/usthe/common/config/CommonConfig.java rename to common/src/main/java/org/dromara/hertzbeat/common/config/CommonConfig.java index 632c8cec703..9faf79367fe 100644 --- a/common/src/main/java/com/usthe/common/config/CommonConfig.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/config/CommonConfig.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.config; +package org.dromara.hertzbeat.common.config; -import com.usthe.common.util.AesUtil; +import org.dromara.hertzbeat.common.util.AesUtil; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -26,7 +26,7 @@ * @author tom * @date 2022/6/30 09:23 */ -@ComponentScan(basePackages = "com.usthe.common") +@ComponentScan(basePackages = "org.dromara.hertzbeat.common") @EnableConfigurationProperties(CommonProperties.class) @Configuration public class CommonConfig { diff --git a/common/src/main/java/com/usthe/common/config/CommonProperties.java b/common/src/main/java/org/dromara/hertzbeat/common/config/CommonProperties.java similarity index 98% rename from common/src/main/java/com/usthe/common/config/CommonProperties.java rename to common/src/main/java/org/dromara/hertzbeat/common/config/CommonProperties.java index 2cdd5f6c9e3..165d953bfcb 100644 --- a/common/src/main/java/com/usthe/common/config/CommonProperties.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/config/CommonProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.config; +package org.dromara.hertzbeat.common.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/common/src/main/java/com/usthe/common/entity/alerter/Alert.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/Alert.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/alerter/Alert.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/Alert.java index 16b1579d5f4..7c86714621b 100644 --- a/common/src/main/java/com/usthe/common/entity/alerter/Alert.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/Alert.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.entity.alerter; +package org.dromara.hertzbeat.common.entity.alerter; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.common.util.GsonUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/alerter/AlertDefine.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefine.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/alerter/AlertDefine.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefine.java index a6eee256308..c3ae06e01cf 100644 --- a/common/src/main/java/com/usthe/common/entity/alerter/AlertDefine.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefine.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.alerter; +package org.dromara.hertzbeat.common.entity.alerter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineMonitorBind.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/alerter/AlertDefineMonitorBind.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java index 6ebae161bd3..a0b5b769056 100644 --- a/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineMonitorBind.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.entity.alerter; +package org.dromara.hertzbeat.common.entity.alerter; -import com.usthe.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Monitor; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/alerter/JsonMapAttributeConverter.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java similarity index 93% rename from common/src/main/java/com/usthe/common/entity/alerter/JsonMapAttributeConverter.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java index 9b867a670ff..b9e27defeb1 100644 --- a/common/src/main/java/com/usthe/common/entity/alerter/JsonMapAttributeConverter.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.common.entity.alerter; +package org.dromara.hertzbeat.common.entity.alerter; import com.google.gson.reflect.TypeToken; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.common.util.GsonUtil; import javax.persistence.AttributeConverter; import java.lang.reflect.Type; diff --git a/common/src/main/java/com/usthe/common/entity/dto/AlertReport.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/dto/AlertReport.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java index e34e7b0df3e..e1617c9b1aa 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/AlertReport.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/dto/Field.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Field.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/dto/Field.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Field.java index 960973f066d..e0766865104 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/Field.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Field.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/dto/Message.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Message.java similarity index 93% rename from common/src/main/java/com/usthe/common/entity/dto/Message.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Message.java index 4e207fce2b3..af4266fb76b 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/Message.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Message.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -23,7 +23,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import static com.usthe.common.util.CommonConstants.SUCCESS_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.SUCCESS_CODE; /** * Unified message structure definition for front and back ends diff --git a/common/src/main/java/com/usthe/common/entity/dto/MetricsData.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsData.java similarity index 97% rename from common/src/main/java/com/usthe/common/entity/dto/MetricsData.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsData.java index f9f0712222f..234a9a4541c 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/MetricsData.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/dto/MetricsHistoryData.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsHistoryData.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/dto/MetricsHistoryData.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsHistoryData.java index 7751b9f2bf5..8881b106845 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/MetricsHistoryData.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsHistoryData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/dto/PromVectorOrMatrix.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/PromVectorOrMatrix.java similarity index 94% rename from common/src/main/java/com/usthe/common/entity/dto/PromVectorOrMatrix.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/PromVectorOrMatrix.java index 164d191847c..bd6056db8f0 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/PromVectorOrMatrix.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/PromVectorOrMatrix.java @@ -1,4 +1,4 @@ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import com.google.gson.JsonObject; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/dto/Value.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Value.java similarity index 97% rename from common/src/main/java/com/usthe/common/entity/dto/Value.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Value.java index 7a61c68c2ba..467765c3617 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/Value.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Value.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/dto/ValueRow.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/ValueRow.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/dto/ValueRow.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/dto/ValueRow.java index df6465dcdc3..50bdd896396 100644 --- a/common/src/main/java/com/usthe/common/entity/dto/ValueRow.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/ValueRow.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.dto; +package org.dromara.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/job/Configmap.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Configmap.java similarity index 97% rename from common/src/main/java/com/usthe/common/entity/job/Configmap.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/Configmap.java index 4a8bc636ec8..170f5bf5941 100644 --- a/common/src/main/java/com/usthe/common/entity/job/Configmap.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Configmap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job; +package org.dromara.hertzbeat.common.entity.job; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/Job.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java similarity index 97% rename from common/src/main/java/com/usthe/common/entity/job/Job.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java index 07894cb285d..8bc9208aa27 100644 --- a/common/src/main/java/com/usthe/common/entity/job/Job.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.common.entity.job; +package org.dromara.hertzbeat.common.entity.job; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.usthe.common.entity.manager.ParamDefine; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.GsonUtil; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/common/src/main/java/com/usthe/common/entity/job/Metrics.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Metrics.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/job/Metrics.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/Metrics.java index ff5dcb013c9..1f2932c4d0d 100644 --- a/common/src/main/java/com/usthe/common/entity/job/Metrics.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Metrics.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.usthe.common.entity.job; +package org.dromara.hertzbeat.common.entity.job; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.usthe.common.entity.job.protocol.*; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.hertzbeat.common.entity.job.protocol.*; import java.util.List; import java.util.Objects; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/FtpProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/FtpProtocol.java similarity index 91% rename from common/src/main/java/com/usthe/common/entity/job/protocol/FtpProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/FtpProtocol.java index 91d2f9ed4b8..c718ec00b68 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/FtpProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/FtpProtocol.java @@ -1,4 +1,4 @@ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/HttpProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpProtocol.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/job/protocol/HttpProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpProtocol.java index 0c167a30043..de4fbb4b995 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/HttpProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/IcmpProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/IcmpProtocol.java similarity index 95% rename from common/src/main/java/com/usthe/common/entity/job/protocol/IcmpProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/IcmpProtocol.java index 797e7985efd..b54a0351fd1 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/IcmpProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/IcmpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/JdbcProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JdbcProtocol.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/job/protocol/JdbcProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JdbcProtocol.java index a15704a11e5..18bf1836915 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/JdbcProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JdbcProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/JmxProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JmxProtocol.java similarity index 94% rename from common/src/main/java/com/usthe/common/entity/job/protocol/JmxProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JmxProtocol.java index a2a3b9876c1..5cfc6c8ef51 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/JmxProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JmxProtocol.java @@ -1,4 +1,4 @@ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/MongodbProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MongodbProtocol.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/job/protocol/MongodbProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MongodbProtocol.java index 289aa6542b6..3fbee65a06d 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/MongodbProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MongodbProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/RedisProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RedisProtocol.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/job/protocol/RedisProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RedisProtocol.java index a973c78f3a6..52327838a46 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/RedisProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RedisProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/SnmpProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SnmpProtocol.java similarity index 97% rename from common/src/main/java/com/usthe/common/entity/job/protocol/SnmpProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SnmpProtocol.java index 78cc8ea815e..955fee01796 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/SnmpProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SnmpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SshProtocol.java similarity index 96% rename from common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SshProtocol.java index 0bac0328857..56efc6d772f 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SshProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/TcpUdpProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TcpUdpProtocol.java similarity index 95% rename from common/src/main/java/com/usthe/common/entity/job/protocol/TcpUdpProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TcpUdpProtocol.java index 1f4cb67d6cd..e94b6cc0d55 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/TcpUdpProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TcpUdpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/TelnetProtocol.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TelnetProtocol.java similarity index 95% rename from common/src/main/java/com/usthe/common/entity/job/protocol/TelnetProtocol.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TelnetProtocol.java index 88f86414d8f..41df2d62f84 100644 --- a/common/src/main/java/com/usthe/common/entity/job/protocol/TelnetProtocol.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TelnetProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.job.protocol; +package org.dromara.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/manager/JsonByteListAttributeConverter.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java similarity index 93% rename from common/src/main/java/com/usthe/common/entity/manager/JsonByteListAttributeConverter.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java index 7b051ee9775..df18c327713 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/JsonByteListAttributeConverter.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import com.google.gson.reflect.TypeToken; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.common.util.GsonUtil; import javax.persistence.AttributeConverter; import java.lang.reflect.Type; diff --git a/common/src/main/java/com/usthe/common/entity/manager/JsonOptionListAttributeConverter.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java similarity index 93% rename from common/src/main/java/com/usthe/common/entity/manager/JsonOptionListAttributeConverter.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java index 0f28cc640cd..9969b158fbf 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/JsonOptionListAttributeConverter.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import com.google.gson.reflect.TypeToken; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.common.util.GsonUtil; import javax.persistence.AttributeConverter; import java.lang.reflect.Type; diff --git a/common/src/main/java/com/usthe/common/entity/manager/JsonTagListAttributeConverter.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java similarity index 95% rename from common/src/main/java/com/usthe/common/entity/manager/JsonTagListAttributeConverter.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java index 5375e72ad1e..45215532c46 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/JsonTagListAttributeConverter.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import com.google.gson.reflect.TypeToken; -import com.usthe.common.util.GsonUtil; +import org.dromara.hertzbeat.common.util.GsonUtil; import javax.persistence.AttributeConverter; import java.lang.reflect.Type; diff --git a/common/src/main/java/com/usthe/common/entity/manager/Monitor.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Monitor.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/manager/Monitor.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Monitor.java index e91c88c3540..ac3558a5cf4 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/Monitor.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Monitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; -import com.usthe.common.support.valid.HostValid; +import org.dromara.hertzbeat.common.support.valid.HostValid; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeReceiver.java similarity index 99% rename from common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeReceiver.java index 95ed93b1029..434524c1d99 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeReceiver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeRule.java similarity index 99% rename from common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeRule.java index 86f54b5102b..a688018fdee 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/manager/Param.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Param.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/manager/Param.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Param.java index 6009cded10c..12edc134318 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/Param.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Param.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/manager/ParamDefine.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/ParamDefine.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/manager/ParamDefine.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/ParamDefine.java index aaf7283a51d..7e12b879a51 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/ParamDefine.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/ParamDefine.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; -import com.usthe.common.entity.alerter.JsonMapAttributeConverter; +import org.dromara.hertzbeat.common.entity.alerter.JsonMapAttributeConverter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/usthe/common/entity/manager/Tag.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/manager/Tag.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java index 6fba33ad8b2..5733a70bd7f 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/Tag.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/manager/TagMonitorBind.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagMonitorBind.java similarity index 98% rename from common/src/main/java/com/usthe/common/entity/manager/TagMonitorBind.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagMonitorBind.java index d386311c93c..f7bed47c5cf 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/TagMonitorBind.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagMonitorBind.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.entity.manager; +package org.dromara.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/entity/message/CollectRep.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/message/CollectRep.java similarity index 81% rename from common/src/main/java/com/usthe/common/entity/message/CollectRep.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/message/CollectRep.java index 47426cb74d9..f82b66a340e 100644 --- a/common/src/main/java/com/usthe/common/entity/message/CollectRep.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/message/CollectRep.java @@ -18,7 +18,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: collect_rep.proto -package com.usthe.common.entity.message; +package org.dromara.hertzbeat.common.entity.message; @SuppressWarnings("PMD") public final class CollectRep { @@ -33,7 +33,7 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } /** - * Protobuf enum {@code com.usthe.common.entity.message.Code} + * Protobuf enum {@code org.dromara.hertzbeat.common.entity.message.Code} */ public enum Code implements com.google.protobuf.ProtocolMessageEnum { @@ -198,7 +198,7 @@ public Code findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.usthe.common.entity.message.CollectRep.getDescriptor().getEnumTypes().get(0); + return CollectRep.getDescriptor().getEnumTypes().get(0); } private static final Code[] VALUES = values(); @@ -303,7 +303,7 @@ public interface MetricsDataOrBuilder extends * 采集响应码 * * - * .com.usthe.common.entity.message.Code code = 6; + * .org.dromara.hertzbeat.common.entity.message.Code code = 6; * @return The enum numeric value on the wire for code. */ int getCodeValue(); @@ -312,10 +312,10 @@ public interface MetricsDataOrBuilder extends * 采集响应码 * * - * .com.usthe.common.entity.message.Code code = 6; + * .org.dromara.hertzbeat.common.entity.message.Code code = 6; * @return The code. */ - com.usthe.common.entity.message.CollectRep.Code getCode(); + CollectRep.Code getCode(); /** * 
@@ -342,24 +342,24 @@ public interface MetricsDataOrBuilder extends
      * 采集指标名
      *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - java.util.List + java.util.List getFieldsList(); /** * 
      * 采集指标名
      *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - com.usthe.common.entity.message.CollectRep.Field getFields(int index); + CollectRep.Field getFields(int index); /** * 
      * 采集指标名
      *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ int getFieldsCount(); /** @@ -367,18 +367,18 @@ public interface MetricsDataOrBuilder extends * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - java.util.List + java.util.List getFieldsOrBuilderList(); /** * 
      * 采集指标名
      *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - com.usthe.common.entity.message.CollectRep.FieldOrBuilder getFieldsOrBuilder( + CollectRep.FieldOrBuilder getFieldsOrBuilder( int index); /** @@ -386,24 +386,24 @@ com.usthe.common.entity.message.CollectRep.FieldOrBuilder getFieldsOrBuilder( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - java.util.List + java.util.List getValuesList(); /** * 
      * 采集指标值集合(fields作为字段名称与ValueRow映射)
      *
* - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - com.usthe.common.entity.message.CollectRep.ValueRow getValues(int index); + CollectRep.ValueRow getValues(int index); /** * 
      * 采集指标值集合(fields作为字段名称与ValueRow映射)
      *
* - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ int getValuesCount(); /** @@ -411,22 +411,22 @@ com.usthe.common.entity.message.CollectRep.FieldOrBuilder getFieldsOrBuilder( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - java.util.List + java.util.List getValuesOrBuilderList(); /** * 
      * 采集指标值集合(fields作为字段名称与ValueRow映射)
      *
* - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder getValuesOrBuilder( + CollectRep.ValueRowOrBuilder getValuesOrBuilder( int index); } /** - * Protobuf type {@code com.usthe.common.entity.message.MetricsData} + * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.MetricsData} */ public static final class MetricsData extends com.google.protobuf.GeneratedMessageV3 implements @@ -518,20 +518,20 @@ private MetricsData( } case 66: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - fields_ = new java.util.ArrayList(); + fields_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } fields_.add( - input.readMessage(com.usthe.common.entity.message.CollectRep.Field.parser(), extensionRegistry)); + input.readMessage(CollectRep.Field.parser(), extensionRegistry)); break; } case 74: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - values_ = new java.util.ArrayList(); + values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } values_.add( - input.readMessage(com.usthe.common.entity.message.CollectRep.ValueRow.parser(), extensionRegistry)); + input.readMessage(CollectRep.ValueRow.parser(), extensionRegistry)); break; } default: { @@ -563,15 +563,15 @@ private MetricsData( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_fieldAccessorTable + return CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.usthe.common.entity.message.CollectRep.MetricsData.class, com.usthe.common.entity.message.CollectRep.MetricsData.Builder.class); + CollectRep.MetricsData.class, CollectRep.MetricsData.Builder.class); } public static final int ID_FIELD_NUMBER = 1; @@ -729,13 +729,13 @@ public long getTime() { * 采集响应码 * * - * .com.usthe.common.entity.message.Code code = 6; + * .org.dromara.hertzbeat.common.entity.message.Code code = 6; * @return The code. */ - @java.lang.Override public com.usthe.common.entity.message.CollectRep.Code getCode() { + @java.lang.Override public CollectRep.Code getCode() { @SuppressWarnings("deprecation") - com.usthe.common.entity.message.CollectRep.Code result = com.usthe.common.entity.message.CollectRep.Code.valueOf(code_); - return result == null ? com.usthe.common.entity.message.CollectRep.Code.UNRECOGNIZED : result; + CollectRep.Code result = CollectRep.Code.valueOf(code_); + return result == null ? CollectRep.Code.UNRECOGNIZED : result; } public static final int MSG_FIELD_NUMBER = 7; @@ -785,16 +785,16 @@ public java.lang.String getMsg() { } public static final int FIELDS_FIELD_NUMBER = 8; - private java.util.List fields_; + private java.util.List fields_; /** * 
      * 采集指标名
      *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ @java.lang.Override - public java.util.List getFieldsList() { + public java.util.List getFieldsList() { return fields_; } /** @@ -802,10 +802,10 @@ public java.util.List getField * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ @java.lang.Override - public java.util.List + public java.util.List getFieldsOrBuilderList() { return fields_; } @@ -814,7 +814,7 @@ public java.util.List getField * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ @java.lang.Override public int getFieldsCount() { @@ -825,10 +825,10 @@ public int getFieldsCount() { * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ @java.lang.Override - public com.usthe.common.entity.message.CollectRep.Field getFields(int index) { + public CollectRep.Field getFields(int index) { return fields_.get(index); } /** @@ -836,25 +836,25 @@ public com.usthe.common.entity.message.CollectRep.Field getFields(int index) { * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ @java.lang.Override - public com.usthe.common.entity.message.CollectRep.FieldOrBuilder getFieldsOrBuilder( + public CollectRep.FieldOrBuilder getFieldsOrBuilder( int index) { return fields_.get(index); } public static final int VALUES_FIELD_NUMBER = 9; - private java.util.List values_; + private java.util.List values_; /** * 
      * 采集指标值集合(fields作为字段名称与ValueRow映射)
      *
* - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ @java.lang.Override - public java.util.List getValuesList() { + public java.util.List getValuesList() { return values_; } /** @@ -862,10 +862,10 @@ public java.util.List getVa * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ @java.lang.Override - public java.util.List + public java.util.List getValuesOrBuilderList() { return values_; } @@ -874,7 +874,7 @@ public java.util.List getVa * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ @java.lang.Override public int getValuesCount() { @@ -885,10 +885,10 @@ public int getValuesCount() { * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ @java.lang.Override - public com.usthe.common.entity.message.CollectRep.ValueRow getValues(int index) { + public CollectRep.ValueRow getValues(int index) { return values_.get(index); } /** @@ -896,10 +896,10 @@ public com.usthe.common.entity.message.CollectRep.ValueRow getValues(int index) * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ @java.lang.Override - public com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder getValuesOrBuilder( + public CollectRep.ValueRowOrBuilder getValuesOrBuilder( int index) { return values_.get(index); } @@ -933,7 +933,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (time_ != 0L) { output.writeUInt64(5, time_); } - if (code_ != com.usthe.common.entity.message.CollectRep.Code.SUCCESS.getNumber()) { + if (code_ != CollectRep.Code.SUCCESS.getNumber()) { output.writeEnum(6, code_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) { @@ -972,7 +972,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(5, time_); } - if (code_ != com.usthe.common.entity.message.CollectRep.Code.SUCCESS.getNumber()) { + if (code_ != CollectRep.Code.SUCCESS.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(6, code_); } @@ -997,10 +997,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.usthe.common.entity.message.CollectRep.MetricsData)) { + if (!(obj instanceof CollectRep.MetricsData)) { return super.equals(obj); } - com.usthe.common.entity.message.CollectRep.MetricsData other = (com.usthe.common.entity.message.CollectRep.MetricsData) obj; + CollectRep.MetricsData other = (CollectRep.MetricsData) obj; if (getId() != other.getId()) return false; @@ -1059,69 +1059,69 @@ public int hashCode() { return hash; } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom(byte[] data) + public static CollectRep.MetricsData parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom(java.io.InputStream input) + public static CollectRep.MetricsData parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseDelimitedFrom(java.io.InputStream input) + public static CollectRep.MetricsData parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseDelimitedFrom( + public static CollectRep.MetricsData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( + public static CollectRep.MetricsData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1134,7 +1134,7 @@ public static com.usthe.common.entity.message.CollectRep.MetricsData parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.usthe.common.entity.message.CollectRep.MetricsData prototype) { + public static Builder newBuilder(CollectRep.MetricsData prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -1150,26 +1150,26 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code com.usthe.common.entity.message.MetricsData} + * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.MetricsData} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:com.usthe.common.entity.message.MetricsData) - com.usthe.common.entity.message.CollectRep.MetricsDataOrBuilder { + CollectRep.MetricsDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_fieldAccessorTable + return CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.usthe.common.entity.message.CollectRep.MetricsData.class, com.usthe.common.entity.message.CollectRep.MetricsData.Builder.class); + CollectRep.MetricsData.class, CollectRep.MetricsData.Builder.class); } - // Construct using com.usthe.common.entity.message.CollectRep.MetricsData.newBuilder() + // Construct using org.dromara.hertzbeat.common.entity.message.CollectRep.MetricsData.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1221,17 +1221,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_MetricsData_descriptor; } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.MetricsData getDefaultInstanceForType() { - return com.usthe.common.entity.message.CollectRep.MetricsData.getDefaultInstance(); + public CollectRep.MetricsData getDefaultInstanceForType() { + return CollectRep.MetricsData.getDefaultInstance(); } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.MetricsData build() { - com.usthe.common.entity.message.CollectRep.MetricsData result = buildPartial(); + public CollectRep.MetricsData build() { + CollectRep.MetricsData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -1239,8 +1239,8 @@ public com.usthe.common.entity.message.CollectRep.MetricsData build() { } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.MetricsData buildPartial() { - com.usthe.common.entity.message.CollectRep.MetricsData result = new com.usthe.common.entity.message.CollectRep.MetricsData(this); + public CollectRep.MetricsData buildPartial() { + CollectRep.MetricsData result = new CollectRep.MetricsData(this); int from_bitField0_ = bitField0_; result.id_ = id_; result.app_ = app_; @@ -1305,16 +1305,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.usthe.common.entity.message.CollectRep.MetricsData) { - return mergeFrom((com.usthe.common.entity.message.CollectRep.MetricsData)other); + if (other instanceof CollectRep.MetricsData) { + return mergeFrom((CollectRep.MetricsData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.usthe.common.entity.message.CollectRep.MetricsData other) { - if (other == com.usthe.common.entity.message.CollectRep.MetricsData.getDefaultInstance()) return this; + public Builder mergeFrom(CollectRep.MetricsData other) { + if (other == CollectRep.MetricsData.getDefaultInstance()) return this; if (other.getId() != 0L) { setId(other.getId()); } @@ -1406,11 +1406,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.usthe.common.entity.message.CollectRep.MetricsData parsedMessage = null; + CollectRep.MetricsData parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.usthe.common.entity.message.CollectRep.MetricsData) e.getUnfinishedMessage(); + parsedMessage = (CollectRep.MetricsData) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -1759,7 +1759,7 @@ public Builder clearTime() { * 采集响应码 * * - * .com.usthe.common.entity.message.Code code = 6; + * .org.dromara.hertzbeat.common.entity.message.Code code = 6; * @param value The enum numeric value on the wire for code to set. * @return This builder for chaining. */ @@ -1774,25 +1774,25 @@ public Builder setCodeValue(int value) { * 采集响应码 * * - * .com.usthe.common.entity.message.Code code = 6; + * .org.dromara.hertzbeat.common.entity.message.Code code = 6; * @return The code. */ @java.lang.Override - public com.usthe.common.entity.message.CollectRep.Code getCode() { + public CollectRep.Code getCode() { @SuppressWarnings("deprecation") - com.usthe.common.entity.message.CollectRep.Code result = com.usthe.common.entity.message.CollectRep.Code.valueOf(code_); - return result == null ? com.usthe.common.entity.message.CollectRep.Code.UNRECOGNIZED : result; + CollectRep.Code result = CollectRep.Code.valueOf(code_); + return result == null ? CollectRep.Code.UNRECOGNIZED : result; } /** * 
        * 采集响应码
        *
* - * .com.usthe.common.entity.message.Code code = 6; + * .org.dromara.hertzbeat.common.entity.message.Code code = 6; * @param value The code to set. * @return This builder for chaining. */ - public Builder setCode(com.usthe.common.entity.message.CollectRep.Code value) { + public Builder setCode(CollectRep.Code value) { if (value == null) { throw new NullPointerException(); } @@ -1806,7 +1806,7 @@ public Builder setCode(com.usthe.common.entity.message.CollectRep.Code value) { * 采集响应码 * * - * .com.usthe.common.entity.message.Code code = 6; + * .org.dromara.hertzbeat.common.entity.message.Code code = 6; * @return This builder for chaining. */ public Builder clearCode() { @@ -1912,26 +1912,26 @@ public Builder setMsgBytes( return this; } - private java.util.List fields_ = + private java.util.List fields_ = java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - fields_ = new java.util.ArrayList(fields_); + fields_ = new java.util.ArrayList(fields_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.usthe.common.entity.message.CollectRep.Field, com.usthe.common.entity.message.CollectRep.Field.Builder, com.usthe.common.entity.message.CollectRep.FieldOrBuilder> fieldsBuilder_; + CollectRep.Field, CollectRep.Field.Builder, CollectRep.FieldOrBuilder> fieldsBuilder_; /** * 
        * 采集指标名
        *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public java.util.List getFieldsList() { + public java.util.List getFieldsList() { if (fieldsBuilder_ == null) { return java.util.Collections.unmodifiableList(fields_); } else { @@ -1943,7 +1943,7 @@ public java.util.List getField * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public int getFieldsCount() { if (fieldsBuilder_ == null) { @@ -1957,9 +1957,9 @@ public int getFieldsCount() { * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public com.usthe.common.entity.message.CollectRep.Field getFields(int index) { + public CollectRep.Field getFields(int index) { if (fieldsBuilder_ == null) { return fields_.get(index); } else { @@ -1971,10 +1971,10 @@ public com.usthe.common.entity.message.CollectRep.Field getFields(int index) { * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder setFields( - int index, com.usthe.common.entity.message.CollectRep.Field value) { + int index, CollectRep.Field value) { if (fieldsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1992,10 +1992,10 @@ public Builder setFields( * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder setFields( - int index, com.usthe.common.entity.message.CollectRep.Field.Builder builderForValue) { + int index, CollectRep.Field.Builder builderForValue) { if (fieldsBuilder_ == null) { ensureFieldsIsMutable(); fields_.set(index, builderForValue.build()); @@ -2010,9 +2010,9 @@ public Builder setFields( * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public Builder addFields(com.usthe.common.entity.message.CollectRep.Field value) { + public Builder addFields(CollectRep.Field value) { if (fieldsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2030,10 +2030,10 @@ public Builder addFields(com.usthe.common.entity.message.CollectRep.Field value) * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder addFields( - int index, com.usthe.common.entity.message.CollectRep.Field value) { + int index, CollectRep.Field value) { if (fieldsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2051,10 +2051,10 @@ public Builder addFields( * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder addFields( - com.usthe.common.entity.message.CollectRep.Field.Builder builderForValue) { + CollectRep.Field.Builder builderForValue) { if (fieldsBuilder_ == null) { ensureFieldsIsMutable(); fields_.add(builderForValue.build()); @@ -2069,10 +2069,10 @@ public Builder addFields( * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder addFields( - int index, com.usthe.common.entity.message.CollectRep.Field.Builder builderForValue) { + int index, CollectRep.Field.Builder builderForValue) { if (fieldsBuilder_ == null) { ensureFieldsIsMutable(); fields_.add(index, builderForValue.build()); @@ -2087,10 +2087,10 @@ public Builder addFields( * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder addAllFields( - java.lang.Iterable values) { + java.lang.Iterable values) { if (fieldsBuilder_ == null) { ensureFieldsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -2106,7 +2106,7 @@ public Builder addAllFields( * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder clearFields() { if (fieldsBuilder_ == null) { @@ -2123,7 +2123,7 @@ public Builder clearFields() { * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ public Builder removeFields(int index) { if (fieldsBuilder_ == null) { @@ -2140,9 +2140,9 @@ public Builder removeFields(int index) { * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public com.usthe.common.entity.message.CollectRep.Field.Builder getFieldsBuilder( + public CollectRep.Field.Builder getFieldsBuilder( int index) { return getFieldsFieldBuilder().getBuilder(index); } @@ -2151,9 +2151,9 @@ public com.usthe.common.entity.message.CollectRep.Field.Builder getFieldsBuilder * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public com.usthe.common.entity.message.CollectRep.FieldOrBuilder getFieldsOrBuilder( + public CollectRep.FieldOrBuilder getFieldsOrBuilder( int index) { if (fieldsBuilder_ == null) { return fields_.get(index); } else { @@ -2165,9 +2165,9 @@ public com.usthe.common.entity.message.CollectRep.FieldOrBuilder getFieldsOrBuil * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public java.util.List + public java.util.List getFieldsOrBuilderList() { if (fieldsBuilder_ != null) { return fieldsBuilder_.getMessageOrBuilderList(); @@ -2180,41 +2180,41 @@ public com.usthe.common.entity.message.CollectRep.FieldOrBuilder getFieldsOrBuil * 采集指标名 * * - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public com.usthe.common.entity.message.CollectRep.Field.Builder addFieldsBuilder() { + public CollectRep.Field.Builder addFieldsBuilder() { return getFieldsFieldBuilder().addBuilder( - com.usthe.common.entity.message.CollectRep.Field.getDefaultInstance()); + CollectRep.Field.getDefaultInstance()); } /** * 
        * 采集指标名
        *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public com.usthe.common.entity.message.CollectRep.Field.Builder addFieldsBuilder( + public CollectRep.Field.Builder addFieldsBuilder( int index) { return getFieldsFieldBuilder().addBuilder( - index, com.usthe.common.entity.message.CollectRep.Field.getDefaultInstance()); + index, CollectRep.Field.getDefaultInstance()); } /** * 
        * 采集指标名
        *
* - * repeated .com.usthe.common.entity.message.Field fields = 8; + * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 8; */ - public java.util.List + public java.util.List getFieldsBuilderList() { return getFieldsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.usthe.common.entity.message.CollectRep.Field, com.usthe.common.entity.message.CollectRep.Field.Builder, com.usthe.common.entity.message.CollectRep.FieldOrBuilder> + CollectRep.Field, CollectRep.Field.Builder, CollectRep.FieldOrBuilder> getFieldsFieldBuilder() { if (fieldsBuilder_ == null) { fieldsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.usthe.common.entity.message.CollectRep.Field, com.usthe.common.entity.message.CollectRep.Field.Builder, com.usthe.common.entity.message.CollectRep.FieldOrBuilder>( + CollectRep.Field, CollectRep.Field.Builder, CollectRep.FieldOrBuilder>( fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), @@ -2224,26 +2224,26 @@ public com.usthe.common.entity.message.CollectRep.Field.Builder addFieldsBuilder return fieldsBuilder_; } - private java.util.List values_ = + private java.util.List values_ = java.util.Collections.emptyList(); private void ensureValuesIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - values_ = new java.util.ArrayList(values_); + values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.usthe.common.entity.message.CollectRep.ValueRow, com.usthe.common.entity.message.CollectRep.ValueRow.Builder, com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder> valuesBuilder_; + CollectRep.ValueRow, CollectRep.ValueRow.Builder, CollectRep.ValueRowOrBuilder> valuesBuilder_; /** * 
        * 采集指标值集合(fields作为字段名称与ValueRow映射)
        *
* - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public java.util.List getValuesList() { + public java.util.List getValuesList() { if (valuesBuilder_ == null) { return java.util.Collections.unmodifiableList(values_); } else { @@ -2255,7 +2255,7 @@ public java.util.List getVa * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public int getValuesCount() { if (valuesBuilder_ == null) { @@ -2269,9 +2269,9 @@ public int getValuesCount() { * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public com.usthe.common.entity.message.CollectRep.ValueRow getValues(int index) { + public CollectRep.ValueRow getValues(int index) { if (valuesBuilder_ == null) { return values_.get(index); } else { @@ -2283,10 +2283,10 @@ public com.usthe.common.entity.message.CollectRep.ValueRow getValues(int index) * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder setValues( - int index, com.usthe.common.entity.message.CollectRep.ValueRow value) { + int index, CollectRep.ValueRow value) { if (valuesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2304,10 +2304,10 @@ public Builder setValues( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder setValues( - int index, com.usthe.common.entity.message.CollectRep.ValueRow.Builder builderForValue) { + int index, CollectRep.ValueRow.Builder builderForValue) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); values_.set(index, builderForValue.build()); @@ -2322,9 +2322,9 @@ public Builder setValues( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public Builder addValues(com.usthe.common.entity.message.CollectRep.ValueRow value) { + public Builder addValues(CollectRep.ValueRow value) { if (valuesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2342,10 +2342,10 @@ public Builder addValues(com.usthe.common.entity.message.CollectRep.ValueRow val * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder addValues( - int index, com.usthe.common.entity.message.CollectRep.ValueRow value) { + int index, CollectRep.ValueRow value) { if (valuesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2363,10 +2363,10 @@ public Builder addValues( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder addValues( - com.usthe.common.entity.message.CollectRep.ValueRow.Builder builderForValue) { + CollectRep.ValueRow.Builder builderForValue) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); values_.add(builderForValue.build()); @@ -2381,10 +2381,10 @@ public Builder addValues( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder addValues( - int index, com.usthe.common.entity.message.CollectRep.ValueRow.Builder builderForValue) { + int index, CollectRep.ValueRow.Builder builderForValue) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); values_.add(index, builderForValue.build()); @@ -2399,10 +2399,10 @@ public Builder addValues( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder addAllValues( - java.lang.Iterable values) { + java.lang.Iterable values) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -2418,7 +2418,7 @@ public Builder addAllValues( * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder clearValues() { if (valuesBuilder_ == null) { @@ -2435,7 +2435,7 @@ public Builder clearValues() { * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ public Builder removeValues(int index) { if (valuesBuilder_ == null) { @@ -2452,9 +2452,9 @@ public Builder removeValues(int index) { * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public com.usthe.common.entity.message.CollectRep.ValueRow.Builder getValuesBuilder( + public CollectRep.ValueRow.Builder getValuesBuilder( int index) { return getValuesFieldBuilder().getBuilder(index); } @@ -2463,9 +2463,9 @@ public com.usthe.common.entity.message.CollectRep.ValueRow.Builder getValuesBuil * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder getValuesOrBuilder( + public CollectRep.ValueRowOrBuilder getValuesOrBuilder( int index) { if (valuesBuilder_ == null) { return values_.get(index); } else { @@ -2477,9 +2477,9 @@ public com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder getValuesOrB * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public java.util.List + public java.util.List getValuesOrBuilderList() { if (valuesBuilder_ != null) { return valuesBuilder_.getMessageOrBuilderList(); @@ -2492,41 +2492,41 @@ public com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder getValuesOrB * 采集指标值集合(fields作为字段名称与ValueRow映射) * * - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public com.usthe.common.entity.message.CollectRep.ValueRow.Builder addValuesBuilder() { + public CollectRep.ValueRow.Builder addValuesBuilder() { return getValuesFieldBuilder().addBuilder( - com.usthe.common.entity.message.CollectRep.ValueRow.getDefaultInstance()); + CollectRep.ValueRow.getDefaultInstance()); } /** * 
        * 采集指标值集合(fields作为字段名称与ValueRow映射)
        *
* - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public com.usthe.common.entity.message.CollectRep.ValueRow.Builder addValuesBuilder( + public CollectRep.ValueRow.Builder addValuesBuilder( int index) { return getValuesFieldBuilder().addBuilder( - index, com.usthe.common.entity.message.CollectRep.ValueRow.getDefaultInstance()); + index, CollectRep.ValueRow.getDefaultInstance()); } /** * 
        * 采集指标值集合(fields作为字段名称与ValueRow映射)
        *
* - * repeated .com.usthe.common.entity.message.ValueRow values = 9; + * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 9; */ - public java.util.List + public java.util.List getValuesBuilderList() { return getValuesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.usthe.common.entity.message.CollectRep.ValueRow, com.usthe.common.entity.message.CollectRep.ValueRow.Builder, com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder> + CollectRep.ValueRow, CollectRep.ValueRow.Builder, CollectRep.ValueRowOrBuilder> getValuesFieldBuilder() { if (valuesBuilder_ == null) { valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.usthe.common.entity.message.CollectRep.ValueRow, com.usthe.common.entity.message.CollectRep.ValueRow.Builder, com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder>( + CollectRep.ValueRow, CollectRep.ValueRow.Builder, CollectRep.ValueRowOrBuilder>( values_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), @@ -2552,12 +2552,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:com.usthe.common.entity.message.MetricsData) - private static final com.usthe.common.entity.message.CollectRep.MetricsData DEFAULT_INSTANCE; + private static final CollectRep.MetricsData DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.usthe.common.entity.message.CollectRep.MetricsData(); + DEFAULT_INSTANCE = new CollectRep.MetricsData(); } - public static com.usthe.common.entity.message.CollectRep.MetricsData getDefaultInstance() { + public static CollectRep.MetricsData getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -2582,7 +2582,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.MetricsData getDefaultInstanceForType() { + public CollectRep.MetricsData getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2643,11 +2643,11 @@ public interface FieldOrBuilder extends getUnitBytes(); } /** - * Protobuf type {@code com.usthe.common.entity.message.Field} + * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.Field} */ public static final class Field extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.usthe.common.entity.message.Field) + // @@protoc_insertion_point(message_implements:org.dromara.hertzbeat.common.entity.message.Field) FieldOrBuilder { private static final long serialVersionUID = 0L; // Use Field.newBuilder() to construct. @@ -2729,15 +2729,15 @@ private Field( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_Field_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_Field_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_Field_fieldAccessorTable + return CollectRep.internal_static_com_usthe_common_entity_message_Field_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.usthe.common.entity.message.CollectRep.Field.class, com.usthe.common.entity.message.CollectRep.Field.Builder.class); + CollectRep.Field.class, CollectRep.Field.Builder.class); } public static final int NAME_FIELD_NUMBER = 1; @@ -2899,10 +2899,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.usthe.common.entity.message.CollectRep.Field)) { + if (!(obj instanceof CollectRep.Field)) { return super.equals(obj); } - com.usthe.common.entity.message.CollectRep.Field other = (com.usthe.common.entity.message.CollectRep.Field) obj; + CollectRep.Field other = (CollectRep.Field) obj; if (!getName() .equals(other.getName())) return false; @@ -2932,69 +2932,69 @@ public int hashCode() { return hash; } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom(byte[] data) + public static CollectRep.Field parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom(java.io.InputStream input) + public static CollectRep.Field parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.Field parseDelimitedFrom(java.io.InputStream input) + public static CollectRep.Field parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.Field parseDelimitedFrom( + public static CollectRep.Field parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.Field parseFrom( + public static CollectRep.Field parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3007,7 +3007,7 @@ public static com.usthe.common.entity.message.CollectRep.Field parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.usthe.common.entity.message.CollectRep.Field prototype) { + public static Builder newBuilder(CollectRep.Field prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -3023,26 +3023,26 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code com.usthe.common.entity.message.Field} + * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.Field} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.usthe.common.entity.message.Field) - com.usthe.common.entity.message.CollectRep.FieldOrBuilder { + // @@protoc_insertion_point(builder_implements:org.dromara.hertzbeat.common.entity.message.Field) + CollectRep.FieldOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_Field_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_Field_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_Field_fieldAccessorTable + return CollectRep.internal_static_com_usthe_common_entity_message_Field_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.usthe.common.entity.message.CollectRep.Field.class, com.usthe.common.entity.message.CollectRep.Field.Builder.class); + CollectRep.Field.class, CollectRep.Field.Builder.class); } - // Construct using com.usthe.common.entity.message.CollectRep.Field.newBuilder() + // Construct using org.dromara.hertzbeat.common.entity.message.CollectRep.Field.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3072,17 +3072,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_Field_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_Field_descriptor; } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.Field getDefaultInstanceForType() { - return com.usthe.common.entity.message.CollectRep.Field.getDefaultInstance(); + public CollectRep.Field getDefaultInstanceForType() { + return CollectRep.Field.getDefaultInstance(); } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.Field build() { - com.usthe.common.entity.message.CollectRep.Field result = buildPartial(); + public CollectRep.Field build() { + CollectRep.Field result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -3090,8 +3090,8 @@ public com.usthe.common.entity.message.CollectRep.Field build() { } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.Field buildPartial() { - com.usthe.common.entity.message.CollectRep.Field result = new com.usthe.common.entity.message.CollectRep.Field(this); + public CollectRep.Field buildPartial() { + CollectRep.Field result = new CollectRep.Field(this); result.name_ = name_; result.type_ = type_; result.unit_ = unit_; @@ -3133,16 +3133,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.usthe.common.entity.message.CollectRep.Field) { - return mergeFrom((com.usthe.common.entity.message.CollectRep.Field)other); + if (other instanceof CollectRep.Field) { + return mergeFrom((CollectRep.Field)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.usthe.common.entity.message.CollectRep.Field other) { - if (other == com.usthe.common.entity.message.CollectRep.Field.getDefaultInstance()) return this; + public Builder mergeFrom(CollectRep.Field other) { + if (other == CollectRep.Field.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; onChanged(); @@ -3169,11 +3169,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.usthe.common.entity.message.CollectRep.Field parsedMessage = null; + CollectRep.Field parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.usthe.common.entity.message.CollectRep.Field) e.getUnfinishedMessage(); + parsedMessage = (CollectRep.Field) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -3430,16 +3430,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:com.usthe.common.entity.message.Field) + // @@protoc_insertion_point(builder_scope:org.dromara.hertzbeat.common.entity.message.Field) } - // @@protoc_insertion_point(class_scope:com.usthe.common.entity.message.Field) - private static final com.usthe.common.entity.message.CollectRep.Field DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.dromara.hertzbeat.common.entity.message.Field) + private static final CollectRep.Field DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.usthe.common.entity.message.CollectRep.Field(); + DEFAULT_INSTANCE = new CollectRep.Field(); } - public static com.usthe.common.entity.message.CollectRep.Field getDefaultInstance() { + public static CollectRep.Field getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -3464,14 +3464,14 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.Field getDefaultInstanceForType() { + public CollectRep.Field getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public interface ValueRowOrBuilder extends - // @@protoc_insertion_point(interface_extends:com.usthe.common.entity.message.ValueRow) + // @@protoc_insertion_point(interface_extends:org.dromara.hertzbeat.common.entity.message.ValueRow) com.google.protobuf.MessageOrBuilder { /** @@ -3536,11 +3536,11 @@ public interface ValueRowOrBuilder extends getColumnsBytes(int index); } /** - * Protobuf type {@code com.usthe.common.entity.message.ValueRow} + * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.ValueRow} */ public static final class ValueRow extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:com.usthe.common.entity.message.ValueRow) + // @@protoc_insertion_point(message_implements:org.dromara.hertzbeat.common.entity.message.ValueRow) ValueRowOrBuilder { private static final long serialVersionUID = 0L; // Use ValueRow.newBuilder() to construct. @@ -3624,15 +3624,15 @@ private ValueRow( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_fieldAccessorTable + return CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.usthe.common.entity.message.CollectRep.ValueRow.class, com.usthe.common.entity.message.CollectRep.ValueRow.Builder.class); + CollectRep.ValueRow.class, CollectRep.ValueRow.Builder.class); } public static final int INSTANCE_FIELD_NUMBER = 1; @@ -3782,10 +3782,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.usthe.common.entity.message.CollectRep.ValueRow)) { + if (!(obj instanceof CollectRep.ValueRow)) { return super.equals(obj); } - com.usthe.common.entity.message.CollectRep.ValueRow other = (com.usthe.common.entity.message.CollectRep.ValueRow) obj; + CollectRep.ValueRow other = (CollectRep.ValueRow) obj; if (!getInstance() .equals(other.getInstance())) return false; @@ -3813,69 +3813,69 @@ public int hashCode() { return hash; } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom(byte[] data) + public static CollectRep.ValueRow parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom(java.io.InputStream input) + public static CollectRep.ValueRow parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseDelimitedFrom(java.io.InputStream input) + public static CollectRep.ValueRow parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseDelimitedFrom( + public static CollectRep.ValueRow parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( + public static CollectRep.ValueRow parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3888,7 +3888,7 @@ public static com.usthe.common.entity.message.CollectRep.ValueRow parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.usthe.common.entity.message.CollectRep.ValueRow prototype) { + public static Builder newBuilder(CollectRep.ValueRow prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -3904,26 +3904,26 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code com.usthe.common.entity.message.ValueRow} + * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.ValueRow} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:com.usthe.common.entity.message.ValueRow) - com.usthe.common.entity.message.CollectRep.ValueRowOrBuilder { + // @@protoc_insertion_point(builder_implements:org.dromara.hertzbeat.common.entity.message.ValueRow) + CollectRep.ValueRowOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_fieldAccessorTable + return CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.usthe.common.entity.message.CollectRep.ValueRow.class, com.usthe.common.entity.message.CollectRep.ValueRow.Builder.class); + CollectRep.ValueRow.class, CollectRep.ValueRow.Builder.class); } - // Construct using com.usthe.common.entity.message.CollectRep.ValueRow.newBuilder() + // Construct using org.dromara.hertzbeat.common.entity.message.CollectRep.ValueRow.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3951,17 +3951,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.usthe.common.entity.message.CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_descriptor; + return CollectRep.internal_static_com_usthe_common_entity_message_ValueRow_descriptor; } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.ValueRow getDefaultInstanceForType() { - return com.usthe.common.entity.message.CollectRep.ValueRow.getDefaultInstance(); + public CollectRep.ValueRow getDefaultInstanceForType() { + return CollectRep.ValueRow.getDefaultInstance(); } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.ValueRow build() { - com.usthe.common.entity.message.CollectRep.ValueRow result = buildPartial(); + public CollectRep.ValueRow build() { + CollectRep.ValueRow result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -3969,8 +3969,8 @@ public com.usthe.common.entity.message.CollectRep.ValueRow build() { } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.ValueRow buildPartial() { - com.usthe.common.entity.message.CollectRep.ValueRow result = new com.usthe.common.entity.message.CollectRep.ValueRow(this); + public CollectRep.ValueRow buildPartial() { + CollectRep.ValueRow result = new CollectRep.ValueRow(this); int from_bitField0_ = bitField0_; result.instance_ = instance_; if (((bitField0_ & 0x00000001) != 0)) { @@ -4016,16 +4016,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.usthe.common.entity.message.CollectRep.ValueRow) { - return mergeFrom((com.usthe.common.entity.message.CollectRep.ValueRow)other); + if (other instanceof CollectRep.ValueRow) { + return mergeFrom((CollectRep.ValueRow)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.usthe.common.entity.message.CollectRep.ValueRow other) { - if (other == com.usthe.common.entity.message.CollectRep.ValueRow.getDefaultInstance()) return this; + public Builder mergeFrom(CollectRep.ValueRow other) { + if (other == CollectRep.ValueRow.getDefaultInstance()) return this; if (!other.getInstance().isEmpty()) { instance_ = other.instance_; onChanged(); @@ -4055,11 +4055,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.usthe.common.entity.message.CollectRep.ValueRow parsedMessage = null; + CollectRep.ValueRow parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.usthe.common.entity.message.CollectRep.ValueRow) e.getUnfinishedMessage(); + parsedMessage = (CollectRep.ValueRow) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -4324,16 +4324,16 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:com.usthe.common.entity.message.ValueRow) + // @@protoc_insertion_point(builder_scope:org.dromara.hertzbeat.common.entity.message.ValueRow) } - // @@protoc_insertion_point(class_scope:com.usthe.common.entity.message.ValueRow) - private static final com.usthe.common.entity.message.CollectRep.ValueRow DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.dromara.hertzbeat.common.entity.message.ValueRow) + private static final CollectRep.ValueRow DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.usthe.common.entity.message.CollectRep.ValueRow(); + DEFAULT_INSTANCE = new CollectRep.ValueRow(); } - public static com.usthe.common.entity.message.CollectRep.ValueRow getDefaultInstance() { + public static CollectRep.ValueRow getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -4358,7 +4358,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public com.usthe.common.entity.message.CollectRep.ValueRow getDefaultInstanceForType() { + public CollectRep.ValueRow getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -4388,14 +4388,14 @@ public com.usthe.common.entity.message.CollectRep.ValueRow getDefaultInstanceFor descriptor; static { java.lang.String[] descriptorData = { - "\n\021collect_rep.proto\022\037com.usthe.common.en" + + "\n\021collect_rep.proto\022\037org.dromara.hertzbeat.common.en" + "tity.message\"\214\002\n\013MetricsData\022\n\n\002id\030\001 \001(\004" + "\022\013\n\003app\030\002 \001(\t\022\017\n\007metrics\030\003 \001(\t\022\020\n\010priori" + "ty\030\004 \001(\r\022\014\n\004time\030\005 \001(\004\0223\n\004code\030\006 \001(\0162%.c" + "om.usthe.common.entity.message.Code\022\013\n\003m" + - "sg\030\007 \001(\t\0226\n\006fields\030\010 \003(\0132&.com.usthe.com" + + "sg\030\007 \001(\t\0226\n\006fields\030\010 \003(\0132&.org.dromara.hertzbeat.com" + "mon.entity.message.Field\0229\n\006values\030\t \003(\013" + - "2).com.usthe.common.entity.message.Value" + + "2).org.dromara.hertzbeat.common.entity.message.Value" + "Row\"1\n\005Field\022\014\n\004name\030\001 \001(\t\022\014\n\004type\030\002 \001(\r" + "\022\014\n\004unit\030\003 \001(\t\"-\n\010ValueRow\022\020\n\010instance\030\001" + " \001(\t\022\017\n\007columns\030\002 \003(\t*b\n\004Code\022\013\n\007SUCCESS" + diff --git a/common/src/main/java/com/usthe/common/entity/warehouse/History.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/warehouse/History.java similarity index 97% rename from common/src/main/java/com/usthe/common/entity/warehouse/History.java rename to common/src/main/java/org/dromara/hertzbeat/common/entity/warehouse/History.java index e5f2181702e..6a96ef5fe98 100644 --- a/common/src/main/java/com/usthe/common/entity/warehouse/History.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/entity/warehouse/History.java @@ -1,4 +1,4 @@ -package com.usthe.common.entity.warehouse; +package org.dromara.hertzbeat.common.entity.warehouse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/com/usthe/common/model/ServicePodModel.java b/common/src/main/java/org/dromara/hertzbeat/common/model/ServicePodModel.java similarity index 94% rename from common/src/main/java/com/usthe/common/model/ServicePodModel.java rename to common/src/main/java/org/dromara/hertzbeat/common/model/ServicePodModel.java index 95e91117267..a66ef9aacfa 100644 --- a/common/src/main/java/com/usthe/common/model/ServicePodModel.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/model/ServicePodModel.java @@ -1,4 +1,4 @@ -package com.usthe.common.model; +package org.dromara.hertzbeat.common.model; import lombok.Getter; import lombok.Setter; diff --git a/common/src/main/java/com/usthe/common/queue/CommonDataQueue.java b/common/src/main/java/org/dromara/hertzbeat/common/queue/CommonDataQueue.java similarity index 92% rename from common/src/main/java/com/usthe/common/queue/CommonDataQueue.java rename to common/src/main/java/org/dromara/hertzbeat/common/queue/CommonDataQueue.java index 3288bfdc680..398ade8b28f 100644 --- a/common/src/main/java/com/usthe/common/queue/CommonDataQueue.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/queue/CommonDataQueue.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.common.queue; +package org.dromara.hertzbeat.common.queue; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.message.CollectRep; /** * common data queue diff --git a/common/src/main/java/com/usthe/common/queue/impl/InMemoryCommonDataQueue.java b/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java similarity index 94% rename from common/src/main/java/com/usthe/common/queue/impl/InMemoryCommonDataQueue.java rename to common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java index b675934f5c9..23db098376f 100644 --- a/common/src/main/java/com/usthe/common/queue/impl/InMemoryCommonDataQueue.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.common.queue.impl; +package org.dromara.hertzbeat.common.queue.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.queue.CommonDataQueue; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.queue.CommonDataQueue; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.DisposableBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/common/src/main/java/com/usthe/common/service/TencentSmsClient.java b/common/src/main/java/org/dromara/hertzbeat/common/service/TencentSmsClient.java similarity index 94% rename from common/src/main/java/com/usthe/common/service/TencentSmsClient.java rename to common/src/main/java/org/dromara/hertzbeat/common/service/TencentSmsClient.java index b3731fd02b6..dcec6a6d52a 100644 --- a/common/src/main/java/com/usthe/common/service/TencentSmsClient.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/service/TencentSmsClient.java @@ -1,12 +1,12 @@ -package com.usthe.common.service; +package org.dromara.hertzbeat.common.service; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.sms.v20210111.SmsClient; import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; import com.tencentcloudapi.sms.v20210111.models.SendStatus; -import com.usthe.common.config.CommonProperties; -import com.usthe.common.support.exception.SendMessageException; +import org.dromara.hertzbeat.common.config.CommonProperties; +import org.dromara.hertzbeat.common.support.exception.SendMessageException; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/com/usthe/common/support/ResourceBundleUtf8Control.java b/common/src/main/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8Control.java similarity index 99% rename from common/src/main/java/com/usthe/common/support/ResourceBundleUtf8Control.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8Control.java index 8973a0835ce..9ace6373940 100644 --- a/common/src/main/java/com/usthe/common/support/ResourceBundleUtf8Control.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8Control.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.support; +package org.dromara.hertzbeat.common.support; import java.io.IOException; import java.io.InputStream; diff --git a/common/src/main/java/com/usthe/common/support/SpringContextHolder.java b/common/src/main/java/org/dromara/hertzbeat/common/support/SpringContextHolder.java similarity index 98% rename from common/src/main/java/com/usthe/common/support/SpringContextHolder.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/SpringContextHolder.java index d9b47b5838a..b77e2c0a7ba 100644 --- a/common/src/main/java/com/usthe/common/support/SpringContextHolder.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/SpringContextHolder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.support; +package org.dromara.hertzbeat.common.support; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/common/src/main/java/com/usthe/common/support/exception/SendMessageException.java b/common/src/main/java/org/dromara/hertzbeat/common/support/exception/SendMessageException.java similarity index 79% rename from common/src/main/java/com/usthe/common/support/exception/SendMessageException.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/exception/SendMessageException.java index 821aadac6dc..d0b77cf6315 100644 --- a/common/src/main/java/com/usthe/common/support/exception/SendMessageException.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/exception/SendMessageException.java @@ -1,4 +1,4 @@ -package com.usthe.common.support.exception; +package org.dromara.hertzbeat.common.support.exception; /** * send message exception diff --git a/common/src/main/java/com/usthe/common/support/valid/EmailParamValidator.java b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailParamValidator.java similarity index 92% rename from common/src/main/java/com/usthe/common/support/valid/EmailParamValidator.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailParamValidator.java index 9c08a2b79c8..825c015de46 100644 --- a/common/src/main/java/com/usthe/common/support/valid/EmailParamValidator.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailParamValidator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.support.valid; +package org.dromara.hertzbeat.common.support.valid; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.CommonUtil; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/common/src/main/java/com/usthe/common/support/valid/EmailValid.java b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailValid.java similarity index 96% rename from common/src/main/java/com/usthe/common/support/valid/EmailValid.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailValid.java index 07661f38929..a33aee9e394 100644 --- a/common/src/main/java/com/usthe/common/support/valid/EmailValid.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailValid.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.support.valid; +package org.dromara.hertzbeat.common.support.valid; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/common/src/main/java/com/usthe/common/support/valid/HostParamValidator.java b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostParamValidator.java similarity index 92% rename from common/src/main/java/com/usthe/common/support/valid/HostParamValidator.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostParamValidator.java index da1c3489eec..c20998969c1 100644 --- a/common/src/main/java/com/usthe/common/support/valid/HostParamValidator.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostParamValidator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.support.valid; +package org.dromara.hertzbeat.common.support.valid; -import com.usthe.common.util.IpDomainUtil; +import org.dromara.hertzbeat.common.util.IpDomainUtil; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/common/src/main/java/com/usthe/common/support/valid/HostValid.java b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostValid.java similarity index 96% rename from common/src/main/java/com/usthe/common/support/valid/HostValid.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostValid.java index 53a3a732cc1..8c9787d8848 100644 --- a/common/src/main/java/com/usthe/common/support/valid/HostValid.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostValid.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.support.valid; +package org.dromara.hertzbeat.common.support.valid; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/common/src/main/java/com/usthe/common/support/valid/PhoneNumParamValidator.java b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumParamValidator.java similarity index 92% rename from common/src/main/java/com/usthe/common/support/valid/PhoneNumParamValidator.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumParamValidator.java index be41cdaa831..a59d3e23d11 100644 --- a/common/src/main/java/com/usthe/common/support/valid/PhoneNumParamValidator.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumParamValidator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.support.valid; +package org.dromara.hertzbeat.common.support.valid; -import com.usthe.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.CommonUtil; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/common/src/main/java/com/usthe/common/support/valid/PhoneNumValid.java b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumValid.java similarity index 96% rename from common/src/main/java/com/usthe/common/support/valid/PhoneNumValid.java rename to common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumValid.java index a53cfa93495..1c3428005bd 100644 --- a/common/src/main/java/com/usthe/common/support/valid/PhoneNumValid.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumValid.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.support.valid; +package org.dromara.hertzbeat.common.support.valid; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/common/src/main/java/com/usthe/common/util/AesUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/AesUtil.java similarity index 99% rename from common/src/main/java/com/usthe/common/util/AesUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/AesUtil.java index 34aec0af3c7..24fd0deb5d7 100644 --- a/common/src/main/java/com/usthe/common/util/AesUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/AesUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/usthe/common/util/Base64Util.java b/common/src/main/java/org/dromara/hertzbeat/common/util/Base64Util.java similarity index 96% rename from common/src/main/java/com/usthe/common/util/Base64Util.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/Base64Util.java index 563e0da4055..e10359c7514 100644 --- a/common/src/main/java/com/usthe/common/util/Base64Util.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/Base64Util.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import java.util.Base64; diff --git a/common/src/main/java/com/usthe/common/util/CommonConstants.java b/common/src/main/java/org/dromara/hertzbeat/common/util/CommonConstants.java similarity index 99% rename from common/src/main/java/com/usthe/common/util/CommonConstants.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/CommonConstants.java index f84d727d86a..6c46fe9ba35 100644 --- a/common/src/main/java/com/usthe/common/util/CommonConstants.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/CommonConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; /** * Public Constant diff --git a/common/src/main/java/com/usthe/common/util/CommonUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/CommonUtil.java similarity index 99% rename from common/src/main/java/com/usthe/common/util/CommonUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/CommonUtil.java index 9fa5e1d5220..204a14aafb7 100644 --- a/common/src/main/java/com/usthe/common/util/CommonUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/CommonUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/usthe/common/util/GsonUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/GsonUtil.java similarity index 97% rename from common/src/main/java/com/usthe/common/util/GsonUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/GsonUtil.java index c728c91a19f..349b346b49b 100644 --- a/common/src/main/java/com/usthe/common/util/GsonUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/GsonUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/common/src/main/java/com/usthe/common/util/IntervalExpressionUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtil.java similarity index 98% rename from common/src/main/java/com/usthe/common/util/IntervalExpressionUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtil.java index 85052ef1872..d5a0fce7a3e 100644 --- a/common/src/main/java/com/usthe/common/util/IntervalExpressionUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/usthe/common/util/IpDomainUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/IpDomainUtil.java similarity index 98% rename from common/src/main/java/com/usthe/common/util/IpDomainUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/IpDomainUtil.java index 90a184194a5..903a5a79d3f 100644 --- a/common/src/main/java/com/usthe/common/util/IpDomainUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/IpDomainUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; import org.apache.http.conn.util.InetAddressUtils; diff --git a/common/src/main/java/com/usthe/common/util/LruHashMap.java b/common/src/main/java/org/dromara/hertzbeat/common/util/LruHashMap.java similarity index 96% rename from common/src/main/java/com/usthe/common/util/LruHashMap.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/LruHashMap.java index d6394af82d8..14430531f8f 100644 --- a/common/src/main/java/com/usthe/common/util/LruHashMap.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/LruHashMap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/common/src/main/java/com/usthe/common/util/MapCapUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/MapCapUtil.java similarity index 88% rename from common/src/main/java/com/usthe/common/util/MapCapUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/MapCapUtil.java index 3d7485cb014..3acaed10f42 100644 --- a/common/src/main/java/com/usthe/common/util/MapCapUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/MapCapUtil.java @@ -1,4 +1,4 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; /** * map initial capacity calculation diff --git a/common/src/main/java/com/usthe/common/util/Pair.java b/common/src/main/java/org/dromara/hertzbeat/common/util/Pair.java similarity index 92% rename from common/src/main/java/com/usthe/common/util/Pair.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/Pair.java index 012aefc15f6..911a37584f5 100644 --- a/common/src/main/java/com/usthe/common/util/Pair.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/Pair.java @@ -1,4 +1,4 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; /** * Pair类(简写)，类似java.util.Map.Entry，只包含一个K、V diff --git a/common/src/main/java/com/usthe/common/util/ProtoJsonUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/ProtoJsonUtil.java similarity index 97% rename from common/src/main/java/com/usthe/common/util/ProtoJsonUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/ProtoJsonUtil.java index 511a87587a4..1e45d3931b3 100644 --- a/common/src/main/java/com/usthe/common/util/ProtoJsonUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/ProtoJsonUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import com.google.protobuf.Message; import com.google.protobuf.util.JsonFormat; diff --git a/common/src/main/java/com/usthe/common/util/ResourceBundleUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/ResourceBundleUtil.java similarity index 95% rename from common/src/main/java/com/usthe/common/util/ResourceBundleUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/ResourceBundleUtil.java index f48137af3a1..9786df11a7a 100644 --- a/common/src/main/java/com/usthe/common/util/ResourceBundleUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/ResourceBundleUtil.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.support.ResourceBundleUtf8Control; +import org.dromara.hertzbeat.common.support.ResourceBundleUtf8Control; import lombok.extern.slf4j.Slf4j; import java.util.Locale; diff --git a/common/src/main/java/com/usthe/common/util/SignConstants.java b/common/src/main/java/org/dromara/hertzbeat/common/util/SignConstants.java similarity index 84% rename from common/src/main/java/com/usthe/common/util/SignConstants.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/SignConstants.java index 357ca56a8ce..56b48cb4aed 100644 --- a/common/src/main/java/com/usthe/common/util/SignConstants.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/SignConstants.java @@ -1,4 +1,4 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; /** * 特殊服务常量 diff --git a/common/src/main/java/com/usthe/common/util/SnowFlakeIdGenerator.java b/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGenerator.java similarity index 96% rename from common/src/main/java/com/usthe/common/util/SnowFlakeIdGenerator.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGenerator.java index 887154350f6..298a198d53f 100644 --- a/common/src/main/java/com/usthe/common/util/SnowFlakeIdGenerator.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; /** * Snowflake Algorithm Generator Tool diff --git a/common/src/main/java/com/usthe/common/util/SnowFlakeIdWorker.java b/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdWorker.java similarity index 99% rename from common/src/main/java/com/usthe/common/util/SnowFlakeIdWorker.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdWorker.java index 5803d4738ba..6bcb59a4b81 100644 --- a/common/src/main/java/com/usthe/common/util/SnowFlakeIdWorker.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdWorker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/usthe/common/util/StrBuffer.java b/common/src/main/java/org/dromara/hertzbeat/common/util/StrBuffer.java similarity index 98% rename from common/src/main/java/com/usthe/common/util/StrBuffer.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/StrBuffer.java index 294ac4dffc9..af69347c964 100644 --- a/common/src/main/java/com/usthe/common/util/StrBuffer.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/StrBuffer.java @@ -1,4 +1,4 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; /** * @author ceilzcx diff --git a/common/src/main/java/com/usthe/common/util/TimePeriodUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/TimePeriodUtil.java similarity index 93% rename from common/src/main/java/com/usthe/common/util/TimePeriodUtil.java rename to common/src/main/java/org/dromara/hertzbeat/common/util/TimePeriodUtil.java index 0078c6fd829..c7e4739c9c1 100644 --- a/common/src/main/java/com/usthe/common/util/TimePeriodUtil.java +++ b/common/src/main/java/org/dromara/hertzbeat/common/util/TimePeriodUtil.java @@ -1,4 +1,4 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; import java.time.Duration; import java.time.Period; diff --git a/common/src/main/message/collect_rep.proto b/common/src/main/message/collect_rep.proto index 5b9dbfcc6a0..bdd4b51340b 100644 --- a/common/src/main/message/collect_rep.proto +++ b/common/src/main/message/collect_rep.proto @@ -16,7 +16,7 @@ */ syntax = "proto3"; -package com.usthe.common.entity.message; +package org.dromara.hertzbeat.common.entity.message; message MetricsData { diff --git a/common/src/main/resources/META-INF/spring.factories b/common/src/main/resources/META-INF/spring.factories index 3672b3602cf..f8693a5e993 100644 --- a/common/src/main/resources/META-INF/spring.factories +++ b/common/src/main/resources/META-INF/spring.factories @@ -15,4 +15,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.usthe.common.config.CommonConfig +org.dromara.hertzbeat.common.config.CommonConfig diff --git a/common/src/test/java/com/usthe/common/queue/CommonDataQueueTest.java b/common/src/test/java/org/dromara/hertzbeat/common/queue/CommonDataQueueTest.java similarity index 87% rename from common/src/test/java/com/usthe/common/queue/CommonDataQueueTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/queue/CommonDataQueueTest.java index 67f9f3abff1..ac207d12576 100644 --- a/common/src/test/java/com/usthe/common/queue/CommonDataQueueTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/queue/CommonDataQueueTest.java @@ -1,11 +1,9 @@ -package com.usthe.common.queue; +package org.dromara.hertzbeat.common.queue; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link CommonDataQueue} */ diff --git a/common/src/test/java/com/usthe/common/support/ResourceBundleUtf8ControlTest.java b/common/src/test/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java similarity index 57% rename from common/src/test/java/com/usthe/common/support/ResourceBundleUtf8ControlTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java index ee0916d7c57..666e771a6e4 100644 --- a/common/src/test/java/com/usthe/common/support/ResourceBundleUtf8ControlTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java @@ -1,10 +1,7 @@ -package com.usthe.common.support; +package org.dromara.hertzbeat.common.support; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link ResourceBundleUtf8Control} */ diff --git a/common/src/test/java/com/usthe/common/support/SpringContextHolderTest.java b/common/src/test/java/org/dromara/hertzbeat/common/support/SpringContextHolderTest.java similarity index 74% rename from common/src/test/java/com/usthe/common/support/SpringContextHolderTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/support/SpringContextHolderTest.java index 954f3ef17ad..5a6d1c25881 100644 --- a/common/src/test/java/com/usthe/common/support/SpringContextHolderTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/support/SpringContextHolderTest.java @@ -1,11 +1,8 @@ -package com.usthe.common.support; +package org.dromara.hertzbeat.common.support; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link SpringContextHolder} */ diff --git a/common/src/test/java/com/usthe/common/util/AesUtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/AesUtilTest.java similarity index 81% rename from common/src/test/java/com/usthe/common/util/AesUtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/AesUtilTest.java index c53adf70fa5..9c00bb25bb5 100644 --- a/common/src/test/java/com/usthe/common/util/AesUtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/AesUtilTest.java @@ -1,12 +1,9 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link AesUtil} */ diff --git a/common/src/test/java/com/usthe/common/util/Base64UtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/Base64UtilTest.java similarity index 52% rename from common/src/test/java/com/usthe/common/util/Base64UtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/Base64UtilTest.java index 5825a3ac5d4..4f423532ee0 100644 --- a/common/src/test/java/com/usthe/common/util/Base64UtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/Base64UtilTest.java @@ -1,10 +1,7 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link Base64Util} */ diff --git a/common/src/test/java/com/usthe/common/util/CommonUtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/CommonUtilTest.java similarity index 96% rename from common/src/test/java/com/usthe/common/util/CommonUtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/CommonUtilTest.java index 30be07da4be..b394810f1d1 100644 --- a/common/src/test/java/com/usthe/common/util/CommonUtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/CommonUtilTest.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/common/src/test/java/com/usthe/common/util/GsonUtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/GsonUtilTest.java similarity index 72% rename from common/src/test/java/com/usthe/common/util/GsonUtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/GsonUtilTest.java index 148b01f193c..3cb12bc05f0 100644 --- a/common/src/test/java/com/usthe/common/util/GsonUtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/GsonUtilTest.java @@ -1,11 +1,8 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link GsonUtil} */ diff --git a/common/src/test/java/com/usthe/common/util/IntervalExpressionUtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtilTest.java similarity index 67% rename from common/src/test/java/com/usthe/common/util/IntervalExpressionUtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtilTest.java index f7d30cf4e90..4d92a456e89 100644 --- a/common/src/test/java/com/usthe/common/util/IntervalExpressionUtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtilTest.java @@ -1,11 +1,8 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link IntervalExpressionUtil} */ diff --git a/common/src/test/java/com/usthe/common/util/IpDomainUtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/IpDomainUtilTest.java similarity index 96% rename from common/src/test/java/com/usthe/common/util/IpDomainUtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/IpDomainUtilTest.java index e3e6bd2025a..9357727b6f9 100644 --- a/common/src/test/java/com/usthe/common/util/IpDomainUtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/IpDomainUtilTest.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/common/src/test/java/com/usthe/common/util/LruHashMapTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/LruHashMapTest.java similarity index 54% rename from common/src/test/java/com/usthe/common/util/LruHashMapTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/LruHashMapTest.java index 520a3a385f2..afcb70fbbff 100644 --- a/common/src/test/java/com/usthe/common/util/LruHashMapTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/LruHashMapTest.java @@ -1,10 +1,7 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link LruHashMap} */ diff --git a/common/src/test/java/com/usthe/common/util/ProtoJsonUtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/ProtoJsonUtilTest.java similarity index 68% rename from common/src/test/java/com/usthe/common/util/ProtoJsonUtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/ProtoJsonUtilTest.java index 017e3a68c3c..d152124199d 100644 --- a/common/src/test/java/com/usthe/common/util/ProtoJsonUtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/ProtoJsonUtilTest.java @@ -1,11 +1,8 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link ProtoJsonUtil} */ diff --git a/common/src/test/java/com/usthe/common/util/ResourceBundleUtilTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/ResourceBundleUtilTest.java similarity index 65% rename from common/src/test/java/com/usthe/common/util/ResourceBundleUtilTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/ResourceBundleUtilTest.java index b749b5390f6..dc29331ea07 100644 --- a/common/src/test/java/com/usthe/common/util/ResourceBundleUtilTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/ResourceBundleUtilTest.java @@ -1,11 +1,8 @@ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link ResourceBundleUtil} */ diff --git a/common/src/test/java/com/usthe/common/util/SnowFlakeIdGeneratorTest.java b/common/src/test/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java similarity index 92% rename from common/src/test/java/com/usthe/common/util/SnowFlakeIdGeneratorTest.java rename to common/src/test/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java index 67da9f9b456..512165ff3b4 100644 --- a/common/src/test/java/com/usthe/common/util/SnowFlakeIdGeneratorTest.java +++ b/common/src/test/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java @@ -15,14 +15,11 @@ * limitations under the License. */ -package com.usthe.common.util; +package org.dromara.hertzbeat.common.util; -import com.usthe.common.queue.CommonDataQueue; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link SnowFlakeIdGenerator} */ diff --git a/home/blog/2022-02-11-hertzbeat.md b/home/blog/2022-02-11-hertzbeat.md index 756750efc24..4601a2b03e4 100644 --- a/home/blog/2022-02-11-hertzbeat.md +++ b/home/blog/2022-02-11-hertzbeat.md @@ -111,7 +111,7 @@ HertzBeat赫兹跳动为 [Dromara开源社区](https://dromara.org/) 孵化项 ##### QQ交流群 -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/blog/2022-02-17-hertzbeat.md b/home/blog/2022-02-17-hertzbeat.md index 0e96b3106c1..e858adfd593 100644 --- a/home/blog/2022-02-17-hertzbeat.md +++ b/home/blog/2022-02-17-hertzbeat.md @@ -57,7 +57,7 @@ HertzBeat 也是模块化的，`manager, collector, scheduler, warehouse, alerte **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/blog/2022-02-28-hertzbeat-v1.0-beta.4.md b/home/blog/2022-02-28-hertzbeat-v1.0-beta.4.md index c16315abef0..2e0e01879fe 100644 --- a/home/blog/2022-02-28-hertzbeat-v1.0-beta.4.md +++ b/home/blog/2022-02-28-hertzbeat-v1.0-beta.4.md @@ -73,7 +73,7 @@ ALTER TABLE notice_receiver ADD access_token varchar(255); **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/blog/2022-03-10-hertzbeat-v1.0-beta.5.md b/home/blog/2022-03-10-hertzbeat-v1.0-beta.5.md index 8978d249929..2964cb8b05e 100644 --- a/home/blog/2022-03-10-hertzbeat-v1.0-beta.5.md +++ b/home/blog/2022-03-10-hertzbeat-v1.0-beta.5.md @@ -59,7 +59,7 @@ BUG修复 **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/blog/2022-03-20-hertzbeat-v1.0-beta.6.md b/home/blog/2022-03-20-hertzbeat-v1.0-beta.6.md index 66deb01777c..43c01acd6c2 100644 --- a/home/blog/2022-03-20-hertzbeat-v1.0-beta.6.md +++ b/home/blog/2022-03-20-hertzbeat-v1.0-beta.6.md @@ -58,7 +58,7 @@ BUG修复 **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/docs/others/contributing.md b/home/docs/others/contributing.md index cdd5c7fe7cc..cf747f9910a 100644 --- a/home/docs/others/contributing.md +++ b/home/docs/others/contributing.md @@ -38,7 +38,7 @@ Even small corrections to typos are very welcome :) 1. Requires `maven3+`, `java8+` and `lombok` environments 2. Modify the dependent service address and other information of the configuration file-`manager/src/main/resources/application.yml` -3. Start `springboot manager` service `manager/src/main/java/com/usthe/manager/Manager.java` +3. Start `springboot manager` service `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` - Front-web start @@ -116,13 +116,13 @@ With the above steps, you are a contributor to HertzBeat. Repeat the previous st [Gitter Channel](https://gitter.im/hertzbeat/community) -[Github Discussion](https://github.com/usthe/hertzbeat/discussions) +[Github Discussion](https://github.com/dromara/hertzbeat/discussions) [User Club](https://support.qq.com/products/379369) Add WeChat account `tan-cloud` to pull you into the WeChat group. -QQ group number `718618151`, verify code: `tancloud` +QQ group number `236915833`, verify code: `tancloud` Public WeChat: `tancloudtech` diff --git a/home/docs/start/iotdb-init.md b/home/docs/start/iotdb-init.md index f2e8523d5c9..d7b3de6acd3 100644 --- a/home/docs/start/iotdb-init.md +++ b/home/docs/start/iotdb-init.md @@ -53,7 +53,7 @@ warehouse: rpc-port: 6667 username: root password: root - # com.usthe.warehouse.config.IotDbVersion: V_0_13 || V_1_00 + # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 version: V_0_13 query-timeout-in-ms: -1 # default '7776000000'（90days,unit:ms,-1:no-expire） diff --git a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/others/contributing.md b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/others/contributing.md index 80bf4c24e20..d1fa3792212 100644 --- a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/others/contributing.md +++ b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.1.x/others/contributing.md @@ -122,7 +122,7 @@ With the above steps, you are a contributor to HertzBeat. Repeat the previous st Add WeChat account `tan-cloud` to pull you into the WeChat group. -QQ group number `718618151`, verify code: `tancloud` +QQ group number `236915833`, verify code: `tancloud` Public WeChat: `tancloudtech` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-11-hertzbeat.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-11-hertzbeat.md index db10cdfe2dd..ad38056e881 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-11-hertzbeat.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-11-hertzbeat.md @@ -112,7 +112,7 @@ HertzBeat赫兹跳动为 [Dromara开源社区](https://dromara.org/) 孵化项 ##### QQ交流群 -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-17-hertzbeat.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-17-hertzbeat.md index 0e96b3106c1..e858adfd593 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-17-hertzbeat.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-17-hertzbeat.md @@ -57,7 +57,7 @@ HertzBeat 也是模块化的，`manager, collector, scheduler, warehouse, alerte **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-28-hertzbeat-v1.0-beta.4.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-28-hertzbeat-v1.0-beta.4.md index c16315abef0..2e0e01879fe 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-28-hertzbeat-v1.0-beta.4.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-02-28-hertzbeat-v1.0-beta.4.md @@ -73,7 +73,7 @@ ALTER TABLE notice_receiver ADD access_token varchar(255); **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-10-hertzbeat-v1.0-beta.5.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-10-hertzbeat-v1.0-beta.5.md index 8978d249929..2964cb8b05e 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-10-hertzbeat-v1.0-beta.5.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-10-hertzbeat-v1.0-beta.5.md @@ -59,7 +59,7 @@ BUG修复 **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-20-hertzbeat-v1.0-beta.6.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-20-hertzbeat-v1.0-beta.6.md index 66deb01777c..43c01acd6c2 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-20-hertzbeat-v1.0-beta.6.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-03-20-hertzbeat-v1.0-beta.6.md @@ -58,7 +58,7 @@ BUG修复 **QQ交流群** -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md index 6c1a828f43d..09558f6585a 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md @@ -37,7 +37,7 @@ sidebar_label: 贡献者指南 1. 需要`maven3+`, `java11+`和`lombok`环境 2. 修改配置文件的依赖服务地址等信息-`manager/src/main/resources/application.yml` -3. 启动`springboot manager`服务 `manager/src/main/java/com/usthe/manager/Manager.java` +3. 启动`springboot manager`服务 `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` - 前端启动 @@ -115,13 +115,13 @@ git pull upstream master [Gitter Channel](https://gitter.im/hertzbeat/community) -[Github Discussion](https://github.com/usthe/hertzbeat/discussions) +[Github Discussion](https://github.com/dromara/hertzbeat/discussions) [HertzBeat答疑网站](https://support.qq.com/products/379369) 加微信号 `tan-cloud` 拉您进微信交流群 -加QQ群号 `718618151` 进QQ交流群, 验证信息: `tancloud` +加QQ群号 `236915833` 进QQ交流群, 验证信息: `tancloud` 微信公众号: `tancloudtech` diff --git a/home/versioned_docs/version-v1.0.0/others/contact.md b/home/versioned_docs/version-v1.0.0/others/contact.md index 6b24706e01a..6ed2cda0779 100644 --- a/home/versioned_docs/version-v1.0.0/others/contact.md +++ b/home/versioned_docs/version-v1.0.0/others/contact.md @@ -17,7 +17,7 @@ sidebar_label: 交流联系 ## QQ交流群 -加QQ群号 718618151 或 扫描下面的群二维码进群, 验证信息: tancloud +加QQ群号 236915833 或 扫描下面的群二维码进群, 验证信息: tancloud tan-cloud diff --git a/home/versioned_docs/version-v1.0.0/others/contributing.md b/home/versioned_docs/version-v1.0.0/others/contributing.md index 582abdbe871..c0be3b11c6e 100644 --- a/home/versioned_docs/version-v1.0.0/others/contributing.md +++ b/home/versioned_docs/version-v1.0.0/others/contributing.md @@ -122,7 +122,7 @@ git pull upstream master 加微信号 `tan-cloud` 拉您进微信交流群 -加QQ群号 `718618151` 进QQ交流群, 验证信息: `tancloud` +加QQ群号 `236915833` 进QQ交流群, 验证信息: `tancloud` 微信公众号: `tancloudtech` diff --git a/home/versioned_docs/version-v1.1.x/others/contributing.md b/home/versioned_docs/version-v1.1.x/others/contributing.md index 6c1a828f43d..14e5d46b576 100644 --- a/home/versioned_docs/version-v1.1.x/others/contributing.md +++ b/home/versioned_docs/version-v1.1.x/others/contributing.md @@ -121,7 +121,7 @@ git pull upstream master 加微信号 `tan-cloud` 拉您进微信交流群 -加QQ群号 `718618151` 进QQ交流群, 验证信息: `tancloud` +加QQ群号 `236915833` 进QQ交流群, 验证信息: `tancloud` 微信公众号: `tancloudtech` diff --git a/manager/pom.xml b/manager/pom.xml index 0a15b481bb9..aece0512f29 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - com.usthe.tancloud + org.dromara.hertzbeat 1.0 4.0.0 @@ -43,25 +43,25 @@ - com.usthe.tancloud + org.dromara.hertzbeat common ${common.version} - com.usthe.tancloud + org.dromara.hertzbeat warehouse ${warehouse.version} - com.usthe.tancloud + org.dromara.hertzbeat alerter ${alerter.version} - com.usthe.tancloud + org.dromara.hertzbeat collector ${collector.version} @@ -175,7 +175,7 @@ false - com.usthe.manager.Manager + org.dromara.hertzbeat.manager.Manager false true diff --git a/manager/src/main/java/com/usthe/manager/Manager.java b/manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java similarity index 90% rename from manager/src/main/java/com/usthe/manager/Manager.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java index 7a28722c940..f28786129de 100644 --- a/manager/src/main/java/com/usthe/manager/Manager.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager; +package org.dromara.hertzbeat.manager; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -32,8 +32,8 @@ @SpringBootApplication @EnableJpaAuditing @EnableScheduling -@EnableJpaRepositories(basePackages = {"com.usthe"}) -@EntityScan(basePackages = {"com.usthe"}) +@EnableJpaRepositories(basePackages = {"org.dromara.hertzbeat"}) +@EntityScan(basePackages = {"org.dromara.hertzbeat"}) public class Manager { public static void main(String[] args) { diff --git a/manager/src/main/java/com/usthe/manager/cache/CacheFactory.java b/manager/src/main/java/org/dromara/hertzbeat/manager/cache/CacheFactory.java similarity index 96% rename from manager/src/main/java/com/usthe/manager/cache/CacheFactory.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/cache/CacheFactory.java index 4f536754706..d8d786d0b48 100644 --- a/manager/src/main/java/com/usthe/manager/cache/CacheFactory.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/cache/CacheFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.cache; +package org.dromara.hertzbeat.manager.cache; /** * @author ceilzcx diff --git a/manager/src/main/java/com/usthe/manager/cache/CaffeineCacheServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/cache/CaffeineCacheServiceImpl.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/cache/CaffeineCacheServiceImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/cache/CaffeineCacheServiceImpl.java index 441b344ecdc..105656c98b7 100644 --- a/manager/src/main/java/com/usthe/manager/cache/CaffeineCacheServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/cache/CaffeineCacheServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.cache; +package org.dromara.hertzbeat.manager.cache; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.benmanes.caffeine.cache.Cache; diff --git a/manager/src/main/java/com/usthe/manager/cache/ICacheService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/cache/ICacheService.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/cache/ICacheService.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/cache/ICacheService.java index 7d04053c888..2804b01bbfb 100644 --- a/manager/src/main/java/com/usthe/manager/cache/ICacheService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/cache/ICacheService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.cache; +package org.dromara.hertzbeat.manager.cache; /** * common cache diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/AlertNotifyHandler.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandler.java similarity index 84% rename from manager/src/main/java/com/usthe/manager/component/alerter/AlertNotifyHandler.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandler.java index 1fbb83fefb4..d222e0fb5c5 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/AlertNotifyHandler.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandler.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter; +package org.dromara.hertzbeat.manager.component.alerter; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; /** * @author Musk.Chen diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/AlertStoreHandler.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertStoreHandler.java similarity index 90% rename from manager/src/main/java/com/usthe/manager/component/alerter/AlertStoreHandler.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertStoreHandler.java index 4f99dde10e9..809bd6aef82 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/AlertStoreHandler.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertStoreHandler.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter; +package org.dromara.hertzbeat.manager.component.alerter; -import com.usthe.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.alerter.Alert; /** * 报警持久化 diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/DispatcherAlarm.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarm.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/component/alerter/DispatcherAlarm.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarm.java index 65404c4c165..a4d086311f4 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/DispatcherAlarm.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarm.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter; +package org.dromara.hertzbeat.manager.component.alerter; import com.google.common.collect.Maps; -import com.usthe.common.queue.CommonDataQueue; -import com.usthe.alert.AlerterWorkerPool; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.service.NoticeConfigService; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.dromara.hertzbeat.alert.AlerterWorkerPool; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.service.NoticeConfigService; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java similarity index 89% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java index 8d2f08ee5a2..a98d58bf40f 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.alert.AlerterProperties; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.util.CommonUtil; -import com.usthe.common.util.ResourceBundleUtil; -import com.usthe.manager.component.alerter.AlertNotifyHandler; +import org.dromara.hertzbeat.alert.AlerterProperties; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.util.CommonUtil; +import org.dromara.hertzbeat.common.util.ResourceBundleUtil; +import org.dromara.hertzbeat.manager.component.alerter.AlertNotifyHandler; import org.springframework.web.client.RestTemplate; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/CommonRobotNotifyResp.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java similarity index 95% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/CommonRobotNotifyResp.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java index 3f43e33ce4d..6aba2d23998 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/CommonRobotNotifyResp.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java similarity index 89% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java index 14652f1261d..526507cd7e9 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.alert.service.AlertService; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.component.alerter.AlertStoreHandler; -import com.usthe.manager.service.MonitorService; +import org.dromara.hertzbeat.alert.service.AlertService; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.component.alerter.AlertStoreHandler; +import org.dromara.hertzbeat.manager.service.MonitorService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java similarity index 93% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java index 07e7ca4fadb..402b76f889a 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java index e080018f95d..b14c63a2f4f 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java @@ -1,9 +1,9 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.Builder; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java similarity index 86% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java index abb6047f622..c8ffbc52e1d 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.util.ResourceBundleUtil; -import com.usthe.manager.component.alerter.AlertNotifyHandler; -import com.usthe.manager.service.MailService; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.util.ResourceBundleUtil; +import org.dromara.hertzbeat.manager.component.alerter.AlertNotifyHandler; +import org.dromara.hertzbeat.manager.service.MailService; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java similarity index 95% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java index d83ba523e08..ad32a8883b5 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java index 9699693a1ac..66e56af3050 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.Builder; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java similarity index 81% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java index b5bd0aff6af..f2018583ff9 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.service.TencentSmsClient; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.ResourceBundleUtil; -import com.usthe.manager.component.alerter.AlertNotifyHandler; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.service.TencentSmsClient; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.ResourceBundleUtil; +import org.dromara.hertzbeat.manager.component.alerter.AlertNotifyHandler; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java similarity index 93% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java index 4335d752dc1..e91c59ea0a8 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java similarity index 81% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java index bafb3764a00..ae32abe8df4 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.component.alerter.AlertNotifyHandler; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.component.alerter.AlertNotifyHandler; /** * @author Musk.Chen diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java similarity index 89% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java index ba7338fb6f1..750f5d1bcc2 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.pojo.dto.WeWorkWebHookDto; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.pojo.dto.WeWorkWebHookDto; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java similarity index 86% rename from manager/src/main/java/com/usthe/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java index 4a0558e0e50..dcc6e0cf67e 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.manager.component.alerter.AlertNotifyHandler; -import com.usthe.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.manager.component.alerter.AlertNotifyHandler; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/manager/src/main/java/com/usthe/manager/config/AngularErrorViewResolver.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/AngularErrorViewResolver.java similarity index 99% rename from manager/src/main/java/com/usthe/manager/config/AngularErrorViewResolver.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/config/AngularErrorViewResolver.java index 113b15a309e..7b26632d09f 100644 --- a/manager/src/main/java/com/usthe/manager/config/AngularErrorViewResolver.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/config/AngularErrorViewResolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.config; +package org.dromara.hertzbeat.manager.config; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProviders; diff --git a/manager/src/main/java/com/usthe/manager/config/HeaderRequestInterceptor.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/config/HeaderRequestInterceptor.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java index 1d3d0ccbc34..be2fad775bf 100644 --- a/manager/src/main/java/com/usthe/manager/config/HeaderRequestInterceptor.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.config; +package org.dromara.hertzbeat.manager.config; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; diff --git a/manager/src/main/java/com/usthe/manager/config/JpaAuditorConfig.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/JpaAuditorConfig.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/config/JpaAuditorConfig.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/config/JpaAuditorConfig.java index 5847b428dfe..97c25176d29 100644 --- a/manager/src/main/java/com/usthe/manager/config/JpaAuditorConfig.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/config/JpaAuditorConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.config; +package org.dromara.hertzbeat.manager.config; import com.usthe.sureness.subject.SubjectSum; import com.usthe.sureness.util.SurenessContextHolder; diff --git a/manager/src/main/java/com/usthe/manager/config/RestTemplateConfig.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/RestTemplateConfig.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/config/RestTemplateConfig.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/config/RestTemplateConfig.java index 2d50d24a8e5..693fc4797bb 100644 --- a/manager/src/main/java/com/usthe/manager/config/RestTemplateConfig.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/config/RestTemplateConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.config; +package org.dromara.hertzbeat.manager.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/manager/src/main/java/com/usthe/manager/config/SecurityCorsConfiguration.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/SecurityCorsConfiguration.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/config/SecurityCorsConfiguration.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/config/SecurityCorsConfiguration.java index 9f665068ebc..c43ba521961 100644 --- a/manager/src/main/java/com/usthe/manager/config/SecurityCorsConfiguration.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/config/SecurityCorsConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.config; +package org.dromara.hertzbeat.manager.config; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/manager/src/main/java/com/usthe/manager/config/SwaggerConfig.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/SwaggerConfig.java similarity index 98% rename from manager/src/main/java/com/usthe/manager/config/SwaggerConfig.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/config/SwaggerConfig.java index 75098ffd52a..92370d766d5 100644 --- a/manager/src/main/java/com/usthe/manager/config/SwaggerConfig.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/config/SwaggerConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.config; +package org.dromara.hertzbeat.manager.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/manager/src/main/java/com/usthe/manager/config/ThymeleafConfig.java b/manager/src/main/java/org/dromara/hertzbeat/manager/config/ThymeleafConfig.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/config/ThymeleafConfig.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/config/ThymeleafConfig.java index 42d5e796082..181a3c32356 100644 --- a/manager/src/main/java/com/usthe/manager/config/ThymeleafConfig.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/config/ThymeleafConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.config; +package org.dromara.hertzbeat.manager.config; import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafProperties; import org.springframework.context.annotation.Bean; diff --git a/manager/src/main/java/com/usthe/manager/controller/AccountController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java similarity index 90% rename from manager/src/main/java/com/usthe/manager/controller/AccountController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java index f4dd03a0d77..1cfdc12c7a2 100644 --- a/manager/src/main/java/com/usthe/manager/controller/AccountController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java @@ -15,15 +15,16 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.manager.pojo.dto.LoginDto; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.manager.pojo.dto.LoginDto; import com.usthe.sureness.provider.SurenessAccount; import com.usthe.sureness.provider.SurenessAccountProvider; import com.usthe.sureness.provider.ducument.DocumentAccountProvider; import com.usthe.sureness.util.JsonWebTokenUtil; import com.usthe.sureness.util.Md5Util; +import org.dromara.hertzbeat.common.util.CommonConstants; import io.jsonwebtoken.Claims; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -40,7 +41,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.usthe.common.util.CommonConstants.MONITOR_LOGIN_FAILED_CODE; + import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** @@ -69,7 +70,7 @@ public ResponseEntity>> authGetToken(@RequestBody Lo SurenessAccount account = accountProvider.loadAccount(loginDto.getIdentifier()); if (account == null || account.getPassword() == null) { Message> message = Message.>builder().msg("账户密码错误") - .code(MONITOR_LOGIN_FAILED_CODE).build(); + .code(CommonConstants.MONITOR_LOGIN_FAILED_CODE).build(); return ResponseEntity.ok(message); } else { String password = loginDto.getCredential(); @@ -78,12 +79,12 @@ public ResponseEntity>> authGetToken(@RequestBody Lo } if (!account.getPassword().equals(password)) { Message> message = Message.>builder().msg("账户密码错误") - .code(MONITOR_LOGIN_FAILED_CODE).build(); + .code(CommonConstants.MONITOR_LOGIN_FAILED_CODE).build(); return ResponseEntity.ok(message); } if (account.isDisabledAccount() || account.isExcessiveAttempts()) { Message> message = Message.>builder().msg("账户过期或被锁定") - .code(MONITOR_LOGIN_FAILED_CODE).build(); + .code(CommonConstants.MONITOR_LOGIN_FAILED_CODE).build(); return ResponseEntity.ok(message); } } @@ -114,18 +115,18 @@ public ResponseEntity>> refreshToken( } catch (Exception e) { log.info(e.getMessage()); Message> message = Message.>builder().msg("刷新TOKEN过期或错误") - .code(MONITOR_LOGIN_FAILED_CODE).build(); + .code(CommonConstants.MONITOR_LOGIN_FAILED_CODE).build(); return ResponseEntity.ok(message); } if (userId == null || !isRefresh) { Message> message = Message.>builder().msg("非法的刷新TOKEN") - .code(MONITOR_LOGIN_FAILED_CODE).build(); + .code(CommonConstants.MONITOR_LOGIN_FAILED_CODE).build(); return ResponseEntity.ok(message); } SurenessAccount account = accountProvider.loadAccount(userId); if (account == null) { Message> message = Message.>builder().msg("TOKEN对应的账户不存在") - .code(MONITOR_LOGIN_FAILED_CODE).build(); + .code(CommonConstants.MONITOR_LOGIN_FAILED_CODE).build(); return ResponseEntity.ok(message); } List roles = account.getOwnRoles(); diff --git a/manager/src/main/java/com/usthe/manager/controller/AppController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AppController.java similarity index 92% rename from manager/src/main/java/com/usthe/manager/controller/AppController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/AppController.java index 7fbbbe5bf44..e33d4c2fd5a 100644 --- a/manager/src/main/java/com/usthe/manager/controller/AppController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AppController.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.manager.ParamDefine; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.pojo.dto.Hierarchy; -import com.usthe.manager.pojo.dto.MonitorDefineDto; -import com.usthe.manager.service.AppService; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; +import org.dromara.hertzbeat.manager.pojo.dto.MonitorDefineDto; +import org.dromara.hertzbeat.manager.service.AppService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/manager/src/main/java/com/usthe/manager/controller/I18nController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/I18nController.java similarity index 93% rename from manager/src/main/java/com/usthe/manager/controller/I18nController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/I18nController.java index 930b4121f27..f794b2de4f7 100644 --- a/manager/src/main/java/com/usthe/manager/controller/I18nController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/I18nController.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.manager.service.AppService; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.manager.service.AppService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/manager/src/main/java/com/usthe/manager/controller/MetricsController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MetricsController.java similarity index 90% rename from manager/src/main/java/com/usthe/manager/controller/MetricsController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/MetricsController.java index bbfeaa8a93a..f2ab412d298 100644 --- a/manager/src/main/java/com/usthe/manager/controller/MetricsController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MetricsController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.common.queue.CommonDataQueue; -import com.usthe.common.queue.impl.InMemoryCommonDataQueue; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.dromara.hertzbeat.common.queue.impl.InMemoryCommonDataQueue; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/manager/src/main/java/com/usthe/manager/controller/MonitorController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorController.java similarity index 93% rename from manager/src/main/java/com/usthe/manager/controller/MonitorController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorController.java index 65f1b9746d9..9634461ca95 100644 --- a/manager/src/main/java/com/usthe/manager/controller/MonitorController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorController.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.manager.pojo.dto.MonitorDto; -import com.usthe.manager.service.MonitorService; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; +import org.dromara.hertzbeat.manager.service.MonitorService; +import org.dromara.hertzbeat.common.util.CommonConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -36,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; -import static com.usthe.common.util.CommonConstants.MONITOR_NOT_EXIST_CODE; + import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** @@ -88,7 +89,7 @@ public ResponseEntity> getMonitor( MonitorDto monitorDto = monitorService.getMonitorDto(id); Message.MessageBuilder messageBuilder = Message.builder(); if (monitorDto == null) { - messageBuilder.code(MONITOR_NOT_EXIST_CODE).msg("Monitor not exist."); + messageBuilder.code(CommonConstants.MONITOR_NOT_EXIST_CODE).msg("Monitor not exist."); } else { messageBuilder.data(monitorDto); } diff --git a/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/controller/MonitorsController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java index 5291caf0b16..0b25bf4acab 100644 --- a/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.manager.service.MonitorService; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.manager.service.MonitorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/NoticeConfigController.java similarity index 95% rename from manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/NoticeConfigController.java index 8148909476d..930e788247a 100644 --- a/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/NoticeConfigController.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.entity.manager.NoticeRule; -import com.usthe.manager.service.NoticeConfigService; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.entity.manager.NoticeRule; +import org.dromara.hertzbeat.manager.service.NoticeConfigService; +import org.dromara.hertzbeat.common.util.CommonConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -39,7 +40,7 @@ import javax.persistence.criteria.Predicate; import javax.validation.Valid; import java.util.List; -import static com.usthe.common.util.CommonConstants.FAIL_CODE; + import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** @@ -155,7 +156,7 @@ public ResponseEntity> sendTestMsg(@Valid @RequestBody NoticeRecei } Message message = Message.builder() .msg("Notify service not available, please check config!") - .code(FAIL_CODE) + .code(CommonConstants.FAIL_CODE) .build(); return ResponseEntity.ok(message); } diff --git a/manager/src/main/java/com/usthe/manager/controller/SummaryController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/SummaryController.java similarity index 88% rename from manager/src/main/java/com/usthe/manager/controller/SummaryController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/SummaryController.java index da0c2bd26c8..6cd0f04d3bd 100644 --- a/manager/src/main/java/com/usthe/manager/controller/SummaryController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/SummaryController.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.manager.pojo.dto.AppCount; -import com.usthe.manager.pojo.dto.Dashboard; -import com.usthe.manager.service.MonitorService; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.manager.pojo.dto.AppCount; +import org.dromara.hertzbeat.manager.pojo.dto.Dashboard; +import org.dromara.hertzbeat.manager.service.MonitorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/manager/src/main/java/com/usthe/manager/controller/TagController.java b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/TagController.java similarity index 96% rename from manager/src/main/java/com/usthe/manager/controller/TagController.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/controller/TagController.java index 61bcbd36bf5..c6dfb5afba6 100644 --- a/manager/src/main/java/com/usthe/manager/controller/TagController.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/controller/TagController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.dto.Message; -import com.usthe.common.entity.manager.Tag; -import com.usthe.manager.service.TagService; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.dromara.hertzbeat.manager.service.TagService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import org.springframework.beans.factory.annotation.Autowired; diff --git a/manager/src/main/java/com/usthe/manager/dao/MonitorDao.java b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/MonitorDao.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/dao/MonitorDao.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/dao/MonitorDao.java index 6a19c8d8269..c7aeac2f788 100644 --- a/manager/src/main/java/com/usthe/manager/dao/MonitorDao.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/MonitorDao.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.manager.pojo.dto.AppCount; -import com.usthe.common.entity.manager.Monitor; +import org.dromara.hertzbeat.manager.pojo.dto.AppCount; +import org.dromara.hertzbeat.common.entity.manager.Monitor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -87,7 +87,7 @@ public interface MonitorDao extends JpaRepository, JpaSpecificati * * @return Monitoring Category-Status and Monitoring Quantity Mapping 监控类别-状态与监控数量映射 */ - @Query("select new com.usthe.manager.pojo.dto.AppCount(mo.app, mo.status, COUNT(mo.id)) from Monitor mo group by mo.app, mo.status") + @Query("select new org.dromara.hertzbeat.manager.pojo.dto.AppCount(mo.app, mo.status, COUNT(mo.id)) from Monitor mo group by mo.app, mo.status") List findAppsStatusCount(); /** diff --git a/manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeReceiverDao.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeReceiverDao.java index 8195c9af8e6..8321257009a 100644 --- a/manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeReceiverDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/manager/src/main/java/com/usthe/manager/dao/NoticeRuleDao.java b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDao.java similarity index 92% rename from manager/src/main/java/com/usthe/manager/dao/NoticeRuleDao.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDao.java index 9b6fb38d04d..0fa8eeea5d7 100644 --- a/manager/src/main/java/com/usthe/manager/dao/NoticeRuleDao.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.NoticeRule; +import org.dromara.hertzbeat.common.entity.manager.NoticeRule; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/manager/src/main/java/com/usthe/manager/dao/ParamDao.java b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDao.java similarity index 95% rename from manager/src/main/java/com/usthe/manager/dao/ParamDao.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDao.java index 57819e0fe11..82abb00eb68 100644 --- a/manager/src/main/java/com/usthe/manager/dao/ParamDao.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.Param; +import org.dromara.hertzbeat.common.entity.manager.Param; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/manager/src/main/java/com/usthe/manager/dao/ParamDefineDao.java b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDefineDao.java similarity index 93% rename from manager/src/main/java/com/usthe/manager/dao/ParamDefineDao.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDefineDao.java index 16feaa72221..53965f6ae2e 100644 --- a/manager/src/main/java/com/usthe/manager/dao/ParamDefineDao.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDefineDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/manager/src/main/java/com/usthe/manager/dao/TagDao.java b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagDao.java similarity index 92% rename from manager/src/main/java/com/usthe/manager/dao/TagDao.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagDao.java index 42cda0078dc..ede108eb786 100644 --- a/manager/src/main/java/com/usthe/manager/dao/TagDao.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.Tag; +import org.dromara.hertzbeat.common.entity.manager.Tag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/AppCount.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/pojo/dto/AppCount.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java index b9a8a77f306..d3d58286c97 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/AppCount.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/Dashboard.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Dashboard.java similarity index 96% rename from manager/src/main/java/com/usthe/manager/pojo/dto/Dashboard.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Dashboard.java index 9984034198d..3c259b9177f 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/Dashboard.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Dashboard.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/Hierarchy.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/pojo/dto/Hierarchy.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java index bac26500824..6d79d0357f1 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/Hierarchy.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/LoginDto.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/LoginDto.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/pojo/dto/LoginDto.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/LoginDto.java index d3704f897e4..d9b0d14c045 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/LoginDto.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/LoginDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDefineDto.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDefineDto.java similarity index 96% rename from manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDefineDto.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDefineDto.java index 33e2d1ef5d3..d9c82ccc69d 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDefineDto.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDefineDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDto.java similarity index 92% rename from manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDto.java index f1ef5313118..526671e624d 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDto.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.entity.manager.Param; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ParamDefineDto.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ParamDefineDto.java index 9113b016b99..9d31b2a854f 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ParamDefineDto.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; -import com.usthe.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/WeWorkWebHookDto.java b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/WeWorkWebHookDto.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/pojo/dto/WeWorkWebHookDto.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/WeWorkWebHookDto.java index 6b38b7a3baf..d6ccb8c538d 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/WeWorkWebHookDto.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/WeWorkWebHookDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.pojo.dto; +package org.dromara.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/manager/src/main/java/com/usthe/manager/service/AppService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java similarity index 93% rename from manager/src/main/java/com/usthe/manager/service/AppService.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java index ae225c5e546..9927f992461 100644 --- a/manager/src/main/java/com/usthe/manager/service/AppService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.common.entity.job.Job; -import com.usthe.manager.pojo.dto.Hierarchy; -import com.usthe.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; import java.util.List; import java.util.Map; diff --git a/manager/src/main/java/com/usthe/manager/service/JobSchedulerInit.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/JobSchedulerInit.java similarity index 85% rename from manager/src/main/java/com/usthe/manager/service/JobSchedulerInit.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/JobSchedulerInit.java index 19eb0348f0c..98cf253d360 100644 --- a/manager/src/main/java/com/usthe/manager/service/JobSchedulerInit.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/JobSchedulerInit.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.collector.dispatch.entrance.internal.CollectJobService; -import com.usthe.common.entity.job.Configmap; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.entity.manager.Param; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.dao.MonitorDao; -import com.usthe.manager.dao.ParamDao; +import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.dromara.hertzbeat.common.entity.job.Configmap; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Param; +import org.dromara.hertzbeat.common.util.GsonUtil; +import org.dromara.hertzbeat.manager.dao.MonitorDao; +import org.dromara.hertzbeat.manager.dao.ParamDao; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; diff --git a/manager/src/main/java/com/usthe/manager/service/MailService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/MailService.java similarity index 85% rename from manager/src/main/java/com/usthe/manager/service/MailService.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/MailService.java index 2aecc6edf9f..bc84448c799 100644 --- a/manager/src/main/java/com/usthe/manager/service/MailService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/MailService.java @@ -15,12 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.common.entity.alerter.Alert; -import lombok.extern.slf4j.Slf4j; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Service; +import org.dromara.hertzbeat.common.entity.alerter.Alert; /** * Email delivery service 邮箱发送服务 diff --git a/manager/src/main/java/com/usthe/manager/service/MonitorService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/MonitorService.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/service/MonitorService.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/MonitorService.java index a7354836f67..5573b294f95 100644 --- a/manager/src/main/java/com/usthe/manager/service/MonitorService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/MonitorService.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.manager.pojo.dto.AppCount; -import com.usthe.manager.pojo.dto.MonitorDto; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.entity.manager.Param; -import com.usthe.manager.support.exception.MonitorDetectException; +import org.dromara.hertzbeat.manager.pojo.dto.AppCount; +import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Param; +import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; diff --git a/manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeConfigService.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeConfigService.java index 3590f31ff81..8c3ca5f9243 100644 --- a/manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeConfigService.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.entity.manager.NoticeRule; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.entity.manager.NoticeRule; import org.springframework.data.jpa.domain.Specification; import java.util.List; diff --git a/manager/src/main/java/com/usthe/manager/service/NoticeDispatchService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeDispatchService.java similarity index 95% rename from manager/src/main/java/com/usthe/manager/service/NoticeDispatchService.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeDispatchService.java index ac452306a20..9d20cccb20f 100644 --- a/manager/src/main/java/com/usthe/manager/service/NoticeDispatchService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeDispatchService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; /** * 消息通知转发接口 diff --git a/manager/src/main/java/com/usthe/manager/service/TagService.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/TagService.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/service/TagService.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/TagService.java index d118b0845ce..c7b2bdb0f27 100644 --- a/manager/src/main/java/com/usthe/manager/service/TagService.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/TagService.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.common.entity.manager.Tag; +import org.dromara.hertzbeat.common.entity.manager.Tag; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; diff --git a/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java similarity index 96% rename from manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java index 910dbad6682..58c29df21bb 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.usthe.manager.service.impl; +package org.dromara.hertzbeat.manager.service.impl; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.manager.dao.MonitorDao; -import com.usthe.manager.pojo.dto.Hierarchy; -import com.usthe.common.entity.manager.ParamDefine; -import com.usthe.manager.service.AppService; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.manager.dao.MonitorDao; +import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.manager.service.AppService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailServiceImpl.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailServiceImpl.java index 4073fc4965c..6b9262736da 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/MailServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailServiceImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.manager.service.impl; +package org.dromara.hertzbeat.manager.service.impl; -import com.usthe.alert.AlerterProperties; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.ResourceBundleUtil; -import com.usthe.manager.service.MailService; +import org.dromara.hertzbeat.alert.AlerterProperties; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.ResourceBundleUtil; +import org.dromara.hertzbeat.manager.service.MailService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.thymeleaf.TemplateEngine; diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java index 4c74dc6e466..edddea74d56 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java @@ -15,33 +15,33 @@ * limitations under the License. */ -package com.usthe.manager.service.impl; +package org.dromara.hertzbeat.manager.service.impl; -import com.usthe.alert.calculate.CalculateAlarm; -import com.usthe.alert.dao.AlertDefineBindDao; -import com.usthe.collector.dispatch.entrance.internal.CollectJobService; -import com.usthe.common.entity.job.Configmap; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.manager.Tag; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.AesUtil; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.IntervalExpressionUtil; -import com.usthe.common.util.IpDomainUtil; -import com.usthe.common.util.SnowFlakeIdGenerator; -import com.usthe.manager.dao.MonitorDao; -import com.usthe.manager.dao.ParamDao; -import com.usthe.manager.pojo.dto.AppCount; -import com.usthe.manager.pojo.dto.MonitorDto; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.entity.manager.Param; -import com.usthe.common.entity.manager.ParamDefine; -import com.usthe.manager.service.AppService; -import com.usthe.manager.service.MonitorService; -import com.usthe.manager.support.exception.MonitorDatabaseException; -import com.usthe.manager.support.exception.MonitorDetectException; -import com.usthe.manager.support.exception.MonitorMetricsException; +import org.dromara.hertzbeat.alert.calculate.CalculateAlarm; +import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; +import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.dromara.hertzbeat.common.entity.job.Configmap; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.AesUtil; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.IntervalExpressionUtil; +import org.dromara.hertzbeat.common.util.IpDomainUtil; +import org.dromara.hertzbeat.common.util.SnowFlakeIdGenerator; +import org.dromara.hertzbeat.manager.dao.MonitorDao; +import org.dromara.hertzbeat.manager.dao.ParamDao; +import org.dromara.hertzbeat.manager.pojo.dto.AppCount; +import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Param; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.manager.service.AppService; +import org.dromara.hertzbeat.manager.service.MonitorService; +import org.dromara.hertzbeat.manager.support.exception.MonitorDatabaseException; +import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; +import org.dromara.hertzbeat.manager.support.exception.MonitorMetricsException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java similarity index 91% rename from manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java index 5d80f5a5877..2affc576b0c 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.usthe.manager.service.impl; - -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.cache.CacheFactory; -import com.usthe.manager.cache.ICacheService; -import com.usthe.manager.component.alerter.DispatcherAlarm; -import com.usthe.manager.dao.NoticeReceiverDao; -import com.usthe.manager.dao.NoticeRuleDao; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.entity.manager.NoticeRule; -import com.usthe.manager.service.NoticeConfigService; +package org.dromara.hertzbeat.manager.service.impl; + +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.cache.CacheFactory; +import org.dromara.hertzbeat.manager.cache.ICacheService; +import org.dromara.hertzbeat.manager.component.alerter.DispatcherAlarm; +import org.dromara.hertzbeat.manager.dao.NoticeReceiverDao; +import org.dromara.hertzbeat.manager.dao.NoticeRuleDao; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.entity.manager.NoticeRule; +import org.dromara.hertzbeat.manager.service.NoticeConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/manager/src/main/java/com/usthe/manager/service/impl/TagServiceImpl.java b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TagServiceImpl.java similarity index 90% rename from manager/src/main/java/com/usthe/manager/service/impl/TagServiceImpl.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TagServiceImpl.java index 5a7cfeab101..8261a5ef70f 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/TagServiceImpl.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TagServiceImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.manager.service.impl; +package org.dromara.hertzbeat.manager.service.impl; -import com.usthe.common.entity.manager.Tag; -import com.usthe.manager.dao.TagDao; -import com.usthe.manager.service.TagService; +import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.dromara.hertzbeat.manager.dao.TagDao; +import org.dromara.hertzbeat.manager.service.TagService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java b/manager/src/main/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandler.java similarity index 87% rename from manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandler.java index f66e29857bd..79f4796916b 100644 --- a/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandler.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.usthe.manager.support; - -import com.usthe.common.entity.dto.Message; -import com.usthe.manager.support.exception.AlertNoticeException; -import com.usthe.manager.support.exception.MonitorDatabaseException; -import com.usthe.manager.support.exception.MonitorDetectException; -import com.usthe.manager.support.exception.MonitorMetricsException; +package org.dromara.hertzbeat.manager.support; + +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.manager.support.exception.MonitorDatabaseException; +import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; +import org.dromara.hertzbeat.manager.support.exception.MonitorMetricsException; +import org.dromara.hertzbeat.common.util.CommonConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DataAccessException; import org.springframework.http.HttpStatus; @@ -36,8 +37,6 @@ import java.util.Objects; -import static com.usthe.common.util.CommonConstants.*; - /** * controller exception handler * @author tomsun28 @@ -57,7 +56,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(MonitorDetectException.class) @ResponseBody ResponseEntity> handleMonitorDetectException(MonitorDetectException exception) { - Message message = Message.builder().msg(exception.getMessage()).code(DETECT_FAILED_CODE).build(); + Message message = Message.builder().msg(exception.getMessage()).code(CommonConstants.DETECT_FAILED_CODE).build(); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(message); } @@ -69,7 +68,7 @@ ResponseEntity> handleMonitorDetectException(MonitorDetectExceptio @ExceptionHandler(MonitorDatabaseException.class) @ResponseBody ResponseEntity> handleMonitorDatabaseException(MonitorDatabaseException exception) { - Message message = Message.builder().msg(exception.getMessage()).code(MONITOR_CONFLICT_CODE).build(); + Message message = Message.builder().msg(exception.getMessage()).code(CommonConstants.MONITOR_CONFLICT_CODE).build(); return ResponseEntity.ok(message); } @@ -81,14 +80,14 @@ ResponseEntity> handleMonitorDatabaseException(MonitorDatabaseExce @ExceptionHandler(IllegalArgumentException.class) @ResponseBody ResponseEntity> handleIllegalArgumentException(IllegalArgumentException exception) { - Message message = Message.builder().msg(exception.getMessage()).code(PARAM_INVALID_CODE).build(); + Message message = Message.builder().msg(exception.getMessage()).code(CommonConstants.PARAM_INVALID_CODE).build(); return ResponseEntity.ok(message); } @ExceptionHandler(AlertNoticeException.class) @ResponseBody ResponseEntity> handleAlertNoticeException(AlertNoticeException noticeException) { - Message message = Message.builder().msg(noticeException.getMessage()).code(FAIL_CODE).build(); + Message message = Message.builder().msg(noticeException.getMessage()).code(CommonConstants.FAIL_CODE).build(); return ResponseEntity.ok(message); } @@ -105,10 +104,10 @@ ResponseEntity> handleHttpMessageNotReadableException(HttpMessageN if (msg == null) { msg = exception.getMessage(); } - Message message = Message.builder().msg(msg).code(PARAM_INVALID_CODE).build(); + Message message = Message.builder().msg(msg).code(CommonConstants.PARAM_INVALID_CODE).build(); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(message); } catch (Exception e) { - Message message = Message.builder().msg(exception.getMessage()).code(PARAM_INVALID_CODE).build(); + Message message = Message.builder().msg(exception.getMessage()).code(CommonConstants.PARAM_INVALID_CODE).build(); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(message); } } @@ -146,7 +145,7 @@ ResponseEntity> handleInputValidException(Exception e) { if (log.isDebugEnabled()) { log.debug("[input argument not valid happen]-{}", errorMsg, e); } - Message message = Message.builder().msg(errorMsg).code(PARAM_INVALID_CODE).build(); + Message message = Message.builder().msg(errorMsg).code(CommonConstants.PARAM_INVALID_CODE).build(); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(message); } @@ -164,7 +163,7 @@ ResponseEntity> handleDataAccessException(DataAccessException exce errorMessage = exception.getMessage(); } log.warn("[database error happen]-{}", errorMessage, exception); - Message message = Message.builder().msg(errorMessage).code(MONITOR_CONFLICT_CODE).build(); + Message message = Message.builder().msg(errorMessage).code(CommonConstants.MONITOR_CONFLICT_CODE).build(); return ResponseEntity.status(HttpStatus.CONFLICT).body(message); } @@ -198,7 +197,7 @@ ResponseEntity> handleUnknownException(Exception exception) { errorMessage = exception.getMessage(); } log.error("[monitor]-[unknown error happen]-{}", errorMessage, exception); - Message message = Message.builder().msg(errorMessage).code(MONITOR_CONFLICT_CODE).build(); + Message message = Message.builder().msg(errorMessage).code(CommonConstants.MONITOR_CONFLICT_CODE).build(); return ResponseEntity.status(HttpStatus.CONFLICT).body(message); } @@ -210,7 +209,7 @@ ResponseEntity> handleUnknownException(Exception exception) { @ExceptionHandler(MonitorMetricsException.class) @ResponseBody ResponseEntity> handleMonitorMetricsException(MonitorMetricsException exception) { - Message message = Message.builder().msg(exception.getMessage()).code(PARAM_INVALID_CODE).build(); + Message message = Message.builder().msg(exception.getMessage()).code(CommonConstants.PARAM_INVALID_CODE).build(); return ResponseEntity.ok(message); } diff --git a/manager/src/main/java/com/usthe/manager/support/exception/AlertNoticeException.java b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/AlertNoticeException.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/support/exception/AlertNoticeException.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/AlertNoticeException.java index 652183407c3..5617b2babc0 100644 --- a/manager/src/main/java/com/usthe/manager/support/exception/AlertNoticeException.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/AlertNoticeException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.support.exception; +package org.dromara.hertzbeat.manager.support.exception; /** * alert notice send failed diff --git a/manager/src/main/java/com/usthe/manager/support/exception/MonitorDatabaseException.java b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDatabaseException.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/support/exception/MonitorDatabaseException.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDatabaseException.java index 55f3882df13..265bb035795 100644 --- a/manager/src/main/java/com/usthe/manager/support/exception/MonitorDatabaseException.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDatabaseException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.support.exception; +package org.dromara.hertzbeat.manager.support.exception; /** * 数据库操作异常 diff --git a/manager/src/main/java/com/usthe/manager/support/exception/MonitorDetectException.java b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDetectException.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/support/exception/MonitorDetectException.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDetectException.java index e424bf5bb6b..f39f6fdd2b0 100644 --- a/manager/src/main/java/com/usthe/manager/support/exception/MonitorDetectException.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDetectException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.support.exception; +package org.dromara.hertzbeat.manager.support.exception; /** * 探测失败异常 diff --git a/manager/src/main/java/com/usthe/manager/support/exception/MonitorMetricsException.java b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorMetricsException.java similarity index 94% rename from manager/src/main/java/com/usthe/manager/support/exception/MonitorMetricsException.java rename to manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorMetricsException.java index 875e18d841e..bf6b3828a30 100644 --- a/manager/src/main/java/com/usthe/manager/support/exception/MonitorMetricsException.java +++ b/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorMetricsException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.manager.support.exception; +package org.dromara.hertzbeat.manager.support.exception; /** * 描述：监控指标异常 diff --git a/manager/src/main/resources/application.yml b/manager/src/main/resources/application.yml index df58d0a4654..25bb74a35ba 100644 --- a/manager/src/main/resources/application.yml +++ b/manager/src/main/resources/application.yml @@ -43,10 +43,7 @@ management: endpoints: web: exposure: - include: - - 'metrics' - - 'health' - - 'env' + include: 'metrics' enabled-by-default: on sureness: @@ -117,7 +114,7 @@ warehouse: rpc-port: 6667 username: root password: root - # com.usthe.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 version: V_0_13 query-timeout-in-ms: -1 # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期） diff --git a/manager/src/test/java/com/usthe/manager/AbstractSpringIntegrationTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/AbstractSpringIntegrationTest.java similarity index 89% rename from manager/src/test/java/com/usthe/manager/AbstractSpringIntegrationTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/AbstractSpringIntegrationTest.java index 29f8f31d210..a44ad282c3a 100644 --- a/manager/src/test/java/com/usthe/manager/AbstractSpringIntegrationTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/AbstractSpringIntegrationTest.java @@ -1,4 +1,4 @@ -package com.usthe.manager; +package org.dromara.hertzbeat.manager; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; diff --git a/manager/src/test/java/com/usthe/manager/ManagerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/ManagerTest.java similarity index 57% rename from manager/src/test/java/com/usthe/manager/ManagerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/ManagerTest.java index 95c17f9daba..0d986b736dc 100644 --- a/manager/src/test/java/com/usthe/manager/ManagerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/ManagerTest.java @@ -1,36 +1,36 @@ -package com.usthe.manager; +package org.dromara.hertzbeat.manager; -import com.usthe.alert.AlerterProperties; -import com.usthe.alert.AlerterWorkerPool; -import com.usthe.alert.calculate.CalculateAlarm; -import com.usthe.alert.controller.AlertDefineController; -import com.usthe.alert.controller.AlertDefinesController; -import com.usthe.alert.controller.AlertsController; -import com.usthe.alert.service.impl.AlertDefineServiceImpl; -import com.usthe.alert.service.impl.AlertServiceImpl; -import com.usthe.collector.collect.database.JdbcSpiLoader; -import com.usthe.collector.collect.http.promethus.PrometheusParseCreater; -import com.usthe.collector.collect.strategy.CollectStrategyFactory; -import com.usthe.collector.dispatch.CommonDispatcher; -import com.usthe.collector.dispatch.DispatchProperties; -import com.usthe.collector.dispatch.MetricsCollectorQueue; -import com.usthe.collector.dispatch.WorkerPool; -import com.usthe.collector.dispatch.entrance.internal.CollectJobService; -import com.usthe.collector.dispatch.timer.TimerDispatcher; -import com.usthe.collector.dispatch.unit.impl.DataSizeConvert; -import com.usthe.common.config.AviatorConfiguration; -import com.usthe.common.config.CommonConfig; -import com.usthe.common.config.CommonProperties; -import com.usthe.common.queue.impl.InMemoryCommonDataQueue; -import com.usthe.common.service.TencentSmsClient; -import com.usthe.common.support.SpringContextHolder; -import com.usthe.warehouse.WarehouseWorkerPool; -import com.usthe.warehouse.config.WarehouseProperties; -import com.usthe.warehouse.controller.MetricsDataController; -import com.usthe.warehouse.store.HistoryIotDbDataStorage; -import com.usthe.warehouse.store.HistoryTdEngineDataStorage; -import com.usthe.warehouse.store.RealTimeMemoryDataStorage; -import com.usthe.warehouse.store.RealTimeRedisDataStorage; +import org.dromara.hertzbeat.alert.AlerterProperties; +import org.dromara.hertzbeat.alert.AlerterWorkerPool; +import org.dromara.hertzbeat.alert.calculate.CalculateAlarm; +import org.dromara.hertzbeat.alert.controller.AlertDefineController; +import org.dromara.hertzbeat.alert.controller.AlertDefinesController; +import org.dromara.hertzbeat.alert.controller.AlertsController; +import org.dromara.hertzbeat.alert.service.impl.AlertDefineServiceImpl; +import org.dromara.hertzbeat.alert.service.impl.AlertServiceImpl; +import org.dromara.hertzbeat.collector.collect.database.JdbcSpiLoader; +import org.dromara.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater; +import org.dromara.hertzbeat.collector.collect.strategy.CollectStrategyFactory; +import org.dromara.hertzbeat.collector.dispatch.CommonDispatcher; +import org.dromara.hertzbeat.collector.dispatch.DispatchProperties; +import org.dromara.hertzbeat.collector.dispatch.MetricsCollectorQueue; +import org.dromara.hertzbeat.collector.dispatch.WorkerPool; +import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatcher; +import org.dromara.hertzbeat.collector.dispatch.unit.impl.DataSizeConvert; +import org.dromara.hertzbeat.common.config.AviatorConfiguration; +import org.dromara.hertzbeat.common.config.CommonConfig; +import org.dromara.hertzbeat.common.config.CommonProperties; +import org.dromara.hertzbeat.common.queue.impl.InMemoryCommonDataQueue; +import org.dromara.hertzbeat.common.service.TencentSmsClient; +import org.dromara.hertzbeat.common.support.SpringContextHolder; +import org.dromara.hertzbeat.warehouse.WarehouseWorkerPool; +import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +import org.dromara.hertzbeat.warehouse.controller.MetricsDataController; +import org.dromara.hertzbeat.warehouse.store.HistoryIotDbDataStorage; +import org.dromara.hertzbeat.warehouse.store.HistoryTdEngineDataStorage; +import org.dromara.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; +import org.dromara.hertzbeat.warehouse.store.RealTimeRedisDataStorage; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/AlertNotifyHandlerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java similarity index 66% rename from manager/src/test/java/com/usthe/manager/component/alerter/AlertNotifyHandlerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java index 4c300f0e064..049f82dea69 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/AlertNotifyHandlerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java @@ -1,11 +1,8 @@ -package com.usthe.manager.component.alerter; +package org.dromara.hertzbeat.manager.component.alerter; -import com.usthe.manager.service.TagService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link AlertNotifyHandler} */ diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/DispatcherAlarmTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java similarity index 67% rename from manager/src/test/java/com/usthe/manager/component/alerter/DispatcherAlarmTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java index 403063eb3f9..20f99250837 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/DispatcherAlarmTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java @@ -1,11 +1,8 @@ -package com.usthe.manager.component.alerter; +package org.dromara.hertzbeat.manager.component.alerter; -import com.usthe.manager.service.TagService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link DispatcherAlarm} */ diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java similarity index 63% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java index c73376bacea..0ff91fffd6b 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java @@ -1,11 +1,8 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.manager.service.TagService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link DbAlertStoreHandlerImpl} */ diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java similarity index 81% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java index 01996577e53..1393ac0e64e 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java @@ -1,9 +1,9 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java similarity index 83% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java index 5faa9002c0a..5474e08e10d 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java @@ -1,9 +1,9 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java similarity index 66% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java index 8bd1e4eac07..e0ba1d36014 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java @@ -1,11 +1,8 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.manager.service.TagService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link EmailAlertNotifyHandlerImpl} */ diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java similarity index 81% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java index f09f468cba1..26a5f712812 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java @@ -1,9 +1,9 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java similarity index 82% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java index a9ff6181fc0..7d5fa9e716b 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java @@ -1,9 +1,9 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java similarity index 83% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java index 19073642bbb..d120749d2a2 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java @@ -1,9 +1,9 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java similarity index 81% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java index fb7083661b3..24cc215e7cc 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java @@ -1,9 +1,9 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/com/usthe/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java similarity index 66% rename from manager/src/test/java/com/usthe/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java index 3ba2340dce7..e4ef7b87c2a 100644 --- a/manager/src/test/java/com/usthe/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java @@ -1,11 +1,8 @@ -package com.usthe.manager.component.alerter.impl; +package org.dromara.hertzbeat.manager.component.alerter.impl; -import com.usthe.manager.service.TagService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link WebHookAlertNotifyHandlerImpl} */ diff --git a/manager/src/test/java/com/usthe/manager/controller/AccountControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AccountControllerTest.java similarity index 92% rename from manager/src/test/java/com/usthe/manager/controller/AccountControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/AccountControllerTest.java index 4003e486eb7..bbce732e6be 100644 --- a/manager/src/test/java/com/usthe/manager/controller/AccountControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AccountControllerTest.java @@ -1,8 +1,8 @@ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.pojo.dto.LoginDto; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; +import org.dromara.hertzbeat.manager.pojo.dto.LoginDto; import com.usthe.sureness.util.JsonWebTokenUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/com/usthe/manager/controller/AppControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AppControllerTest.java similarity index 89% rename from manager/src/test/java/com/usthe/manager/controller/AppControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/AppControllerTest.java index 718b96df15f..248f7050311 100644 --- a/manager/src/test/java/com/usthe/manager/controller/AppControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AppControllerTest.java @@ -1,11 +1,10 @@ -package com.usthe.manager.controller; - -import com.usthe.common.entity.dto.Message; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.manager.ParamDefine; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.pojo.dto.Hierarchy; -import com.usthe.manager.service.impl.AppServiceImpl; +package org.dromara.hertzbeat.manager.controller; + +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; +import org.dromara.hertzbeat.manager.service.impl.AppServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,15 +12,12 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.http.ResponseEntity; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.ResultMatcher; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/manager/src/test/java/com/usthe/manager/controller/I18nControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/I18nControllerTest.java similarity index 86% rename from manager/src/test/java/com/usthe/manager/controller/I18nControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/I18nControllerTest.java index 0092592b998..1c7d6bd7c77 100644 --- a/manager/src/test/java/com/usthe/manager/controller/I18nControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/I18nControllerTest.java @@ -1,8 +1,7 @@ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.service.TagService; -import com.usthe.manager.service.impl.AppServiceImpl; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.service.impl.AppServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,7 +15,6 @@ import java.util.HashMap; -import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; /** diff --git a/manager/src/test/java/com/usthe/manager/controller/MonitorControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorControllerTest.java similarity index 94% rename from manager/src/test/java/com/usthe/manager/controller/MonitorControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorControllerTest.java index 3cca14c1cbb..01edd1d9d4d 100644 --- a/manager/src/test/java/com/usthe/manager/controller/MonitorControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorControllerTest.java @@ -1,12 +1,11 @@ -package com.usthe.manager.controller; - -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.entity.manager.Param; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.pojo.dto.MonitorDto; -import com.usthe.manager.service.TagService; -import com.usthe.manager.service.impl.MonitorServiceImpl; +package org.dromara.hertzbeat.manager.controller; + +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Param; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; +import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; +import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,7 +21,6 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/manager/src/test/java/com/usthe/manager/controller/MonitorsControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorsControllerTest.java similarity index 93% rename from manager/src/test/java/com/usthe/manager/controller/MonitorsControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorsControllerTest.java index abc95c29d86..ed60d9a5db0 100644 --- a/manager/src/test/java/com/usthe/manager/controller/MonitorsControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorsControllerTest.java @@ -1,8 +1,8 @@ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.service.impl.MonitorServiceImpl; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; +import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/com/usthe/manager/controller/NoticeConfigControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/NoticeConfigControllerTest.java similarity index 95% rename from manager/src/test/java/com/usthe/manager/controller/NoticeConfigControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/NoticeConfigControllerTest.java index 78c1479801b..914aae98713 100644 --- a/manager/src/test/java/com/usthe/manager/controller/NoticeConfigControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/NoticeConfigControllerTest.java @@ -1,11 +1,10 @@ -package com.usthe.manager.controller; - -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.entity.manager.NoticeRule; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.service.TagService; -import com.usthe.manager.service.impl.NoticeConfigServiceImpl; +package org.dromara.hertzbeat.manager.controller; + +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.entity.manager.NoticeRule; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; +import org.dromara.hertzbeat.manager.service.impl.NoticeConfigServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -21,7 +20,6 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/manager/src/test/java/com/usthe/manager/controller/SummaryControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/SummaryControllerTest.java similarity index 83% rename from manager/src/test/java/com/usthe/manager/controller/SummaryControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/SummaryControllerTest.java index d40fa05744d..71ef4a95b34 100644 --- a/manager/src/test/java/com/usthe/manager/controller/SummaryControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/SummaryControllerTest.java @@ -1,10 +1,8 @@ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.pojo.dto.AppCount; -import com.usthe.manager.service.MonitorService; -import com.usthe.manager.service.impl.MonitorServiceImpl; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.pojo.dto.AppCount; +import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -12,7 +10,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; @@ -20,7 +17,6 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/manager/src/test/java/com/usthe/manager/controller/TagControllerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/TagControllerTest.java similarity index 92% rename from manager/src/test/java/com/usthe/manager/controller/TagControllerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/controller/TagControllerTest.java index ce751fd724e..3255b354c99 100644 --- a/manager/src/test/java/com/usthe/manager/controller/TagControllerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/controller/TagControllerTest.java @@ -1,9 +1,9 @@ -package com.usthe.manager.controller; +package org.dromara.hertzbeat.manager.controller; -import com.usthe.common.entity.manager.Tag; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.service.impl.TagServiceImpl; +import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.GsonUtil; +import org.dromara.hertzbeat.manager.service.impl.TagServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/manager/src/test/java/com/usthe/manager/dao/MonitorDaoTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/MonitorDaoTest.java similarity index 92% rename from manager/src/test/java/com/usthe/manager/dao/MonitorDaoTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/dao/MonitorDaoTest.java index a5dba1b00d3..73b543035f8 100644 --- a/manager/src/test/java/com/usthe/manager/dao/MonitorDaoTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/MonitorDaoTest.java @@ -1,8 +1,8 @@ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.manager.AbstractSpringIntegrationTest; -import com.usthe.manager.pojo.dto.AppCount; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.manager.pojo.dto.AppCount; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/com/usthe/manager/dao/NoticeRuleDaoTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDaoTest.java similarity index 92% rename from manager/src/test/java/com/usthe/manager/dao/NoticeRuleDaoTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDaoTest.java index 7629ff27197..60f518b92bb 100644 --- a/manager/src/test/java/com/usthe/manager/dao/NoticeRuleDaoTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDaoTest.java @@ -1,7 +1,7 @@ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.NoticeRule; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.manager.NoticeRule; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/com/usthe/manager/dao/ParamDaoTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDaoTest.java similarity index 94% rename from manager/src/test/java/com/usthe/manager/dao/ParamDaoTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDaoTest.java index 094a30c4955..827c02b42cc 100644 --- a/manager/src/test/java/com/usthe/manager/dao/ParamDaoTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDaoTest.java @@ -1,7 +1,7 @@ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.Param; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.manager.Param; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/com/usthe/manager/dao/ParamDefineDaoTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDefineDaoTest.java similarity index 91% rename from manager/src/test/java/com/usthe/manager/dao/ParamDefineDaoTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDefineDaoTest.java index 774df90ef78..68e2734787b 100644 --- a/manager/src/test/java/com/usthe/manager/dao/ParamDefineDaoTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDefineDaoTest.java @@ -1,7 +1,7 @@ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.ParamDefine; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/com/usthe/manager/dao/TagDaoTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/TagDaoTest.java similarity index 91% rename from manager/src/test/java/com/usthe/manager/dao/TagDaoTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/dao/TagDaoTest.java index f6d2d6d061e..5cec4e184aa 100644 --- a/manager/src/test/java/com/usthe/manager/dao/TagDaoTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/dao/TagDaoTest.java @@ -1,7 +1,7 @@ -package com.usthe.manager.dao; +package org.dromara.hertzbeat.manager.dao; -import com.usthe.common.entity.manager.Tag; -import com.usthe.manager.AbstractSpringIntegrationTest; +import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/com/usthe/manager/service/AppServiceTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/service/AppServiceTest.java similarity index 89% rename from manager/src/test/java/com/usthe/manager/service/AppServiceTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/service/AppServiceTest.java index 13e286eff1a..6db89b3fb05 100644 --- a/manager/src/test/java/com/usthe/manager/service/AppServiceTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/service/AppServiceTest.java @@ -1,7 +1,6 @@ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.manager.controller.NoticeConfigController; -import com.usthe.manager.service.impl.AppServiceImpl; +import org.dromara.hertzbeat.manager.service.impl.AppServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/com/usthe/manager/service/MailServiceTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/service/MailServiceTest.java similarity index 85% rename from manager/src/test/java/com/usthe/manager/service/MailServiceTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/service/MailServiceTest.java index e6fd856c9d6..149021407d8 100644 --- a/manager/src/test/java/com/usthe/manager/service/MailServiceTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/service/MailServiceTest.java @@ -1,8 +1,8 @@ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.alert.AlerterProperties; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.manager.service.impl.MailServiceImpl; +import org.dromara.hertzbeat.alert.AlerterProperties; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.manager.service.impl.MailServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/com/usthe/manager/service/MonitorServiceTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/service/MonitorServiceTest.java similarity index 95% rename from manager/src/test/java/com/usthe/manager/service/MonitorServiceTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/service/MonitorServiceTest.java index 64f118fc2bb..0c5ea4764f9 100644 --- a/manager/src/test/java/com/usthe/manager/service/MonitorServiceTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/service/MonitorServiceTest.java @@ -1,25 +1,25 @@ -package com.usthe.manager.service; - -import com.usthe.alert.calculate.CalculateAlarm; -import com.usthe.alert.dao.AlertDefineBindDao; -import com.usthe.collector.dispatch.entrance.internal.CollectJobService; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.job.Job; -import com.usthe.common.entity.job.Metrics; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.entity.manager.Param; -import com.usthe.common.entity.manager.ParamDefine; -import com.usthe.common.entity.manager.Tag; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.manager.dao.MonitorDao; -import com.usthe.manager.dao.ParamDao; -import com.usthe.manager.pojo.dto.AppCount; -import com.usthe.manager.pojo.dto.MonitorDto; -import com.usthe.manager.service.impl.MonitorServiceImpl; -import com.usthe.manager.support.exception.MonitorDatabaseException; -import com.usthe.manager.support.exception.MonitorDetectException; -import com.usthe.manager.support.exception.MonitorMetricsException; +package org.dromara.hertzbeat.manager.service; + +import org.dromara.hertzbeat.alert.calculate.CalculateAlarm; +import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; +import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.job.Job; +import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.entity.manager.Param; +import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.manager.dao.MonitorDao; +import org.dromara.hertzbeat.manager.dao.ParamDao; +import org.dromara.hertzbeat.manager.pojo.dto.AppCount; +import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; +import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; +import org.dromara.hertzbeat.manager.support.exception.MonitorDatabaseException; +import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; +import org.dromara.hertzbeat.manager.support.exception.MonitorMetricsException; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -29,13 +29,10 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.*; import static org.junit.jupiter.api.Assertions.*; @@ -712,6 +709,6 @@ void addNewMonitorOptionalMetrics() { @Test void getMonitorMetrics() { - assertDoesNotThrow(()-> appService.getAppDefineMetricNames("test")); + Assertions.assertDoesNotThrow(()-> appService.getAppDefineMetricNames("test")); } } diff --git a/manager/src/test/java/com/usthe/manager/service/NoticeConfigServiceTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/service/NoticeConfigServiceTest.java similarity index 88% rename from manager/src/test/java/com/usthe/manager/service/NoticeConfigServiceTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/service/NoticeConfigServiceTest.java index 8c4589deccf..39165748632 100644 --- a/manager/src/test/java/com/usthe/manager/service/NoticeConfigServiceTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/service/NoticeConfigServiceTest.java @@ -1,15 +1,14 @@ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.usthe.common.entity.alerter.Alert; -import com.usthe.common.entity.manager.NoticeReceiver; -import com.usthe.common.entity.manager.NoticeRule; -import com.usthe.common.entity.manager.NoticeRule.TagItem; -import com.usthe.manager.component.alerter.DispatcherAlarm; -import com.usthe.manager.dao.NoticeReceiverDao; -import com.usthe.manager.dao.NoticeRuleDao; -import com.usthe.manager.service.impl.NoticeConfigServiceImpl; +import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.dromara.hertzbeat.common.entity.manager.NoticeRule; +import org.dromara.hertzbeat.manager.component.alerter.DispatcherAlarm; +import org.dromara.hertzbeat.manager.dao.NoticeReceiverDao; +import org.dromara.hertzbeat.manager.dao.NoticeRuleDao; +import org.dromara.hertzbeat.manager.service.impl.NoticeConfigServiceImpl; import org.assertj.core.util.Maps; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -119,8 +118,8 @@ void getReceiverFilterRule() { final String tagValue = "tagValue"; final List priorities = Lists.newArrayList(priority); final List prioritiesFail = Lists.newArrayList(priorityFail); - final List tags = Lists.newArrayList(new TagItem(tagName, tagValue)); - final List tagsFail = Lists.newArrayList(new TagItem(tagNameFail, tagValue)); + final List tags = Lists.newArrayList(new NoticeRule.TagItem(tagName, tagValue)); + final List tagsFail = Lists.newArrayList(new NoticeRule.TagItem(tagNameFail, tagValue)); final Map tagsMap = Maps.newHashMap(tagName, tagValue); final NoticeRule rule1 = NoticeRule.builder() .id(1L) diff --git a/manager/src/test/java/com/usthe/manager/service/TagServiceTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/service/TagServiceTest.java similarity index 89% rename from manager/src/test/java/com/usthe/manager/service/TagServiceTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/service/TagServiceTest.java index 35b0376c809..5eb35656cc1 100644 --- a/manager/src/test/java/com/usthe/manager/service/TagServiceTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/service/TagServiceTest.java @@ -1,8 +1,8 @@ -package com.usthe.manager.service; +package org.dromara.hertzbeat.manager.service; -import com.usthe.common.entity.manager.Tag; -import com.usthe.manager.dao.TagDao; -import com.usthe.manager.service.impl.TagServiceImpl; +import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.dromara.hertzbeat.manager.dao.TagDao; +import org.dromara.hertzbeat.manager.service.impl.TagServiceImpl; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -10,7 +10,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; import java.util.Collections; diff --git a/manager/src/test/java/com/usthe/manager/support/GlobalExceptionHandlerTest.java b/manager/src/test/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandlerTest.java similarity index 92% rename from manager/src/test/java/com/usthe/manager/support/GlobalExceptionHandlerTest.java rename to manager/src/test/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandlerTest.java index 560873ae9c0..beb16df4c18 100644 --- a/manager/src/test/java/com/usthe/manager/support/GlobalExceptionHandlerTest.java +++ b/manager/src/test/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandlerTest.java @@ -1,13 +1,13 @@ -package com.usthe.manager.support; +package org.dromara.hertzbeat.manager.support; -import com.usthe.common.entity.manager.Monitor; -import com.usthe.common.util.GsonUtil; -import com.usthe.manager.controller.MonitorController; -import com.usthe.manager.pojo.dto.MonitorDto; -import com.usthe.manager.support.exception.AlertNoticeException; -import com.usthe.manager.support.exception.MonitorDatabaseException; -import com.usthe.manager.support.exception.MonitorDetectException; -import com.usthe.manager.support.exception.MonitorMetricsException; +import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.dromara.hertzbeat.common.util.GsonUtil; +import org.dromara.hertzbeat.manager.controller.MonitorController; +import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; +import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +import org.dromara.hertzbeat.manager.support.exception.MonitorDatabaseException; +import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; +import org.dromara.hertzbeat.manager.support.exception.MonitorMetricsException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -21,11 +21,11 @@ import java.util.Collections; -import static com.usthe.common.util.CommonConstants.DETECT_FAILED_CODE; -import static com.usthe.common.util.CommonConstants.FAIL_CODE; -import static com.usthe.common.util.CommonConstants.MONITOR_CONFLICT_CODE; -import static com.usthe.common.util.CommonConstants.PARAM_INVALID_CODE; -import static com.usthe.common.util.CommonConstants.SUCCESS_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.DETECT_FAILED_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.FAIL_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.MONITOR_CONFLICT_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.PARAM_INVALID_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.SUCCESS_CODE; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doThrow; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; diff --git a/pom.xml b/pom.xml index bede1d1fdb1..e91ff2eecb8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.usthe.tancloud + org.dromara.hertzbeat hertzbeat pom 1.0 diff --git a/script/application.yml b/script/application.yml index ff32732f1f3..79d010cbbda 100644 --- a/script/application.yml +++ b/script/application.yml @@ -111,9 +111,8 @@ warehouse: rpc-port: 6667 username: root password: root - # org.apache.iotdb.session.util.Version: V_O_12 || V_0_13 + # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 version: V_0_13 - # if iotdb version >= 0.13 use default queryTimeoutInMs = -1; else use default queryTimeoutInMs = 0 query-timeout-in-ms: -1 # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期） # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire) diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml index ee6fc0a7e3e..7a563e4172d 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml @@ -103,10 +103,9 @@ warehouse: rpc-port: 6667 username: root password: root - # org.apache.iotdb.session.util.Version: V_O_13 || V_1_0 + # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 # 如果你使用docker-compose-1.0.yaml, 不要忘记修i该version为V_1_0 version: V_0_13 - # if iotdb version >= 0.13 use default queryTimeoutInMs = -1; else use default queryTimeoutInMs = 0 query-timeout-in-ms: -1 # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期） # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire) diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml index dc2006efdae..fd8d355ae7d 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml @@ -12,11 +12,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -a + version: "3.8" networks: - heartzbeat: + hertzbeat: driver: bridge services: @@ -28,8 +28,7 @@ services: ports: - "6667:6667" environment: - TZ: Asia/Shanghai - environment: + - TZ=Asia/Shanghai - cn_internal_address=iotdb - cn_internal_port=10710 - cn_consensus_port=10720 @@ -44,7 +43,7 @@ services: - ./dbdata/iotdbdata:/iotdb/data - ./dbdata/iotdblogs:/iotdb/logs networks: - - heartzbeat + - hertzbeat hertzbeat: image: tancloud/hertzbeat container_name: hertzbeat @@ -61,6 +60,6 @@ services: ports: - "1157:1157" networks: - - heartzbeat + - hertzbeat diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml index f36047ddb70..0ce3f18266a 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml @@ -16,7 +16,7 @@ version: "3.7" networks: - heartzbeat: + hertzbeat: driver: bridge services: @@ -34,7 +34,7 @@ services: - ./dbdata/mysqldata:/var/lib/mysql/ - ./conf/sql:/docker-entrypoint-initdb.d/ networks: - - heartzbeat + - hertzbeat iotdb: image: apache/iotdb:0.13.3-node @@ -49,7 +49,7 @@ services: volumes: - ./dbdata/iotdbdata:/iotdb/data networks: - - heartzbeat + - hertzbeat hertzbeat: image: tancloud/hertzbeat @@ -68,4 +68,4 @@ services: ports: - "1157:1157" networks: - - heartzbeat + - hertzbeat diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml index b22a0da08af..43ac33a59a8 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml @@ -16,7 +16,7 @@ version: "3.7" networks: - heartzbeat: + hertzbeat: driver: bridge services: @@ -34,7 +34,7 @@ services: - ./dbdata/mysqldata:/var/lib/mysql/ - ./conf/sql:/docker-entrypoint-initdb.d/ networks: - - heartzbeat + - hertzbeat tdengine: image: tdengine/tdengine:2.4.0.12 @@ -49,7 +49,7 @@ services: volumes: - ./dbdata/taosdata:/var/lib/taos/ networks: - - heartzbeat + - hertzbeat hertzbeat: image: tancloud/hertzbeat @@ -68,4 +68,4 @@ services: ports: - "1157:1157" networks: - - heartzbeat + - hertzbeat diff --git a/warehouse/pom.xml b/warehouse/pom.xml index c378259ad8d..f7f13745721 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - com.usthe.tancloud + org.dromara.hertzbeat 1.0 @@ -36,7 +36,7 @@ - com.usthe.tancloud + org.dromara.hertzbeat common ${common.version} provided diff --git a/warehouse/src/main/java/com/usthe/warehouse/WarehouseWorkerPool.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPool.java similarity index 98% rename from warehouse/src/main/java/com/usthe/warehouse/WarehouseWorkerPool.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPool.java index e908d7e9c9d..b3712446fd5 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/WarehouseWorkerPool.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.warehouse; +package org.dromara.hertzbeat.warehouse; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/warehouse/src/main/java/com/usthe/warehouse/config/IotDbVersion.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/IotDbVersion.java similarity index 95% rename from warehouse/src/main/java/com/usthe/warehouse/config/IotDbVersion.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/IotDbVersion.java index a8d5dbe3d0a..d043260075e 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/config/IotDbVersion.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/IotDbVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.warehouse.config; +package org.dromara.hertzbeat.warehouse.config; /** * IoTDB user version diff --git a/warehouse/src/main/java/com/usthe/warehouse/config/WarehouseAutoConfiguration.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java similarity index 91% rename from warehouse/src/main/java/com/usthe/warehouse/config/WarehouseAutoConfiguration.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java index 0c8c3bf5682..a40f4a7693e 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/config/WarehouseAutoConfiguration.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.warehouse.config; +package org.dromara.hertzbeat.warehouse.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; @@ -25,7 +25,7 @@ * @version 2.1 * Created by Musk.Chen on 2023/1/14 */ -@ComponentScan(basePackages = "com.usthe.warehouse") +@ComponentScan(basePackages = "org.dromara.hertzbeat.warehouse") @EnableConfigurationProperties(WarehouseProperties.class) public class WarehouseAutoConfiguration { } diff --git a/warehouse/src/main/java/com/usthe/warehouse/config/WarehouseProperties.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java similarity index 99% rename from warehouse/src/main/java/com/usthe/warehouse/config/WarehouseProperties.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java index d21245008fb..7b8fba2dcf7 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/config/WarehouseProperties.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.usthe.warehouse.config; +package org.dromara.hertzbeat.warehouse.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataController.java similarity index 90% rename from warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataController.java index c272f595d78..33de5556f3d 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataController.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.usthe.warehouse.controller; +package org.dromara.hertzbeat.warehouse.controller; -import com.usthe.common.entity.dto.Field; -import com.usthe.common.entity.dto.Message; -import com.usthe.common.entity.dto.MetricsData; -import com.usthe.common.entity.dto.MetricsHistoryData; -import com.usthe.common.entity.dto.Value; -import com.usthe.common.entity.dto.ValueRow; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.warehouse.store.AbstractHistoryDataStorage; -import com.usthe.warehouse.store.AbstractRealTimeDataStorage; -import com.usthe.warehouse.store.HistoryJpaDatabaseDataStorage; -import com.usthe.warehouse.store.RealTimeMemoryDataStorage; +import org.dromara.hertzbeat.common.entity.dto.Field; +import org.dromara.hertzbeat.common.entity.dto.Message; +import org.dromara.hertzbeat.common.entity.dto.MetricsData; +import org.dromara.hertzbeat.common.entity.dto.MetricsHistoryData; +import org.dromara.hertzbeat.common.entity.dto.Value; +import org.dromara.hertzbeat.common.entity.dto.ValueRow; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.warehouse.store.AbstractHistoryDataStorage; +import org.dromara.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; +import org.dromara.hertzbeat.warehouse.store.HistoryJpaDatabaseDataStorage; +import org.dromara.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -43,7 +43,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.usthe.common.util.CommonConstants.FAIL_CODE; +import static org.dromara.hertzbeat.common.util.CommonConstants.FAIL_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** diff --git a/warehouse/src/main/java/com/usthe/warehouse/dao/HistoryDao.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/dao/HistoryDao.java similarity index 94% rename from warehouse/src/main/java/com/usthe/warehouse/dao/HistoryDao.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/dao/HistoryDao.java index 263a4fd8469..3400e2ca490 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/dao/HistoryDao.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/dao/HistoryDao.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.warehouse.dao; +package org.dromara.hertzbeat.warehouse.dao; -import com.usthe.common.entity.warehouse.History; +import org.dromara.hertzbeat.common.entity.warehouse.History; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/AbstractHistoryDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java similarity index 93% rename from warehouse/src/main/java/com/usthe/warehouse/store/AbstractHistoryDataStorage.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java index c335617d771..230b514c30d 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/AbstractHistoryDataStorage.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.dto.Value; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.dto.Value; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.DisposableBean; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/AbstractRealTimeDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java similarity index 93% rename from warehouse/src/main/java/com/usthe/warehouse/store/AbstractRealTimeDataStorage.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java index 6c5f76853b8..23d59105540 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/AbstractRealTimeDataStorage.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.DisposableBean; import org.springframework.lang.NonNull; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/DataStorageDispatch.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/DataStorageDispatch.java similarity index 94% rename from warehouse/src/main/java/com/usthe/warehouse/store/DataStorageDispatch.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/DataStorageDispatch.java index a8194aefcca..b0d52ada523 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/DataStorageDispatch.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/DataStorageDispatch.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.queue.CommonDataQueue; -import com.usthe.warehouse.WarehouseWorkerPool; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.dromara.hertzbeat.warehouse.WarehouseWorkerPool; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryIotDbDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java similarity index 98% rename from warehouse/src/main/java/com/usthe/warehouse/store/HistoryIotDbDataStorage.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java index ca365c418e7..7ffe9bf093f 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryIotDbDataStorage.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.dto.Value; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.warehouse.config.IotDbVersion; -import com.usthe.warehouse.config.WarehouseProperties; +import org.dromara.hertzbeat.common.entity.dto.Value; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.warehouse.config.IotDbVersion; +import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; import lombok.extern.slf4j.Slf4j; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryJpaDatabaseDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java similarity index 95% rename from warehouse/src/main/java/com/usthe/warehouse/store/HistoryJpaDatabaseDataStorage.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java index 1ac0bf19bc5..04fc388591e 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryJpaDatabaseDataStorage.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.dto.Value; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.entity.warehouse.History; -import com.usthe.common.util.CommonConstants; -import com.usthe.common.util.TimePeriodUtil; -import com.usthe.warehouse.config.WarehouseProperties; -import com.usthe.warehouse.dao.HistoryDao; +import org.dromara.hertzbeat.common.entity.dto.Value; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.warehouse.History; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.common.util.TimePeriodUtil; +import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +import org.dromara.hertzbeat.warehouse.dao.HistoryDao; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java similarity index 98% rename from warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java index 00d0d78c376..27bb01757ae 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.dto.Value; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.warehouse.config.WarehouseProperties; +import org.dromara.hertzbeat.common.entity.dto.Value; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.slf4j.Slf4j; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/MetricsDataRedisCodec.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodec.java similarity index 94% rename from warehouse/src/main/java/com/usthe/warehouse/store/MetricsDataRedisCodec.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodec.java index 5a5e62bdf9c..285918b929d 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/MetricsDataRedisCodec.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodec.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.entity.message.CollectRep; import io.lettuce.core.codec.RedisCodec; import lombok.extern.slf4j.Slf4j; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/RealTimeMemoryDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java similarity index 94% rename from warehouse/src/main/java/com/usthe/warehouse/store/RealTimeMemoryDataStorage.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java index 995b87d2f9f..d35b4009294 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/RealTimeMemoryDataStorage.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.warehouse.config.WarehouseProperties; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.lang.NonNull; diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/RealTimeRedisDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java similarity index 96% rename from warehouse/src/main/java/com/usthe/warehouse/store/RealTimeRedisDataStorage.java rename to warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java index d44bfa1f563..d267077c792 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/store/RealTimeRedisDataStorage.java +++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.warehouse.config.WarehouseProperties; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; import io.lettuce.core.api.StatefulRedisConnection; diff --git a/warehouse/src/main/resources/META-INF/spring.factories b/warehouse/src/main/resources/META-INF/spring.factories index 737cb27d74e..07b6fe472f9 100644 --- a/warehouse/src/main/resources/META-INF/spring.factories +++ b/warehouse/src/main/resources/META-INF/spring.factories @@ -14,4 +14,4 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.usthe.warehouse.config.WarehouseAutoConfiguration \ No newline at end of file +org.dromara.hertzbeat.warehouse.config.WarehouseAutoConfiguration \ No newline at end of file diff --git a/warehouse/src/test/java/com/usthe/warehouse/WarehouseWorkerPoolTest.java b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPoolTest.java similarity index 96% rename from warehouse/src/test/java/com/usthe/warehouse/WarehouseWorkerPoolTest.java rename to warehouse/src/test/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPoolTest.java index eaddf269e40..0323ea1c281 100644 --- a/warehouse/src/test/java/com/usthe/warehouse/WarehouseWorkerPoolTest.java +++ b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPoolTest.java @@ -1,4 +1,4 @@ -package com.usthe.warehouse; +package org.dromara.hertzbeat.warehouse; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/warehouse/src/test/java/com/usthe/warehouse/controller/MetricsDataControllerTest.java b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataControllerTest.java similarity index 95% rename from warehouse/src/test/java/com/usthe/warehouse/controller/MetricsDataControllerTest.java rename to warehouse/src/test/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataControllerTest.java index c5a9cac57d3..c3985ed3fd5 100644 --- a/warehouse/src/test/java/com/usthe/warehouse/controller/MetricsDataControllerTest.java +++ b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataControllerTest.java @@ -1,10 +1,10 @@ -package com.usthe.warehouse.controller; +package org.dromara.hertzbeat.warehouse.controller; -import com.usthe.common.entity.dto.Value; -import com.usthe.common.entity.message.CollectRep; -import com.usthe.common.util.CommonConstants; -import com.usthe.warehouse.store.AbstractHistoryDataStorage; -import com.usthe.warehouse.store.AbstractRealTimeDataStorage; +import org.dromara.hertzbeat.common.entity.dto.Value; +import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.dromara.hertzbeat.common.util.CommonConstants; +import org.dromara.hertzbeat.warehouse.store.AbstractHistoryDataStorage; +import org.dromara.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/warehouse/src/test/java/com/usthe/warehouse/store/HistoryTdEngineDataStorageTest.java b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java similarity index 90% rename from warehouse/src/test/java/com/usthe/warehouse/store/HistoryTdEngineDataStorageTest.java rename to warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java index 7b22d760f8c..197cee4eb25 100644 --- a/warehouse/src/test/java/com/usthe/warehouse/store/HistoryTdEngineDataStorageTest.java +++ b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java @@ -1,4 +1,4 @@ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/warehouse/src/test/java/com/usthe/warehouse/store/MetricsDataRedisCodecTest.java b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java similarity index 81% rename from warehouse/src/test/java/com/usthe/warehouse/store/MetricsDataRedisCodecTest.java rename to warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java index 35887eff4f5..44203c4da18 100644 --- a/warehouse/src/test/java/com/usthe/warehouse/store/MetricsDataRedisCodecTest.java +++ b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java @@ -1,10 +1,8 @@ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - /** * Test case for {@link MetricsDataRedisCodec} */ diff --git a/warehouse/src/test/java/com/usthe/warehouse/store/RealTimeMemoryDataStorageTest.java b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java similarity index 86% rename from warehouse/src/test/java/com/usthe/warehouse/store/RealTimeMemoryDataStorageTest.java rename to warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java index 49d2488afa5..f2db0113fd1 100644 --- a/warehouse/src/test/java/com/usthe/warehouse/store/RealTimeMemoryDataStorageTest.java +++ b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java @@ -1,4 +1,4 @@ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/warehouse/src/test/java/com/usthe/warehouse/store/RealTimeRedisDataStorageTest.java b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java similarity index 86% rename from warehouse/src/test/java/com/usthe/warehouse/store/RealTimeRedisDataStorageTest.java rename to warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java index 8b1f16ff29c..6b3ea109930 100644 --- a/warehouse/src/test/java/com/usthe/warehouse/store/RealTimeRedisDataStorageTest.java +++ b/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java @@ -1,4 +1,4 @@ -package com.usthe.warehouse.store; +package org.dromara.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/web-app/src/favicon.ico b/web-app/src/favicon.ico index c89ac20273c37cd76b0e5596b05611efc9c086c2..4d53d66b88476df8095bc0eda559d13568b0e3a8 100644 GIT binary patch literal 5088 zcmV<66Cdn}P)@~0drDELIAGL9O(c600d`2O+f$vv5yPMK~#7F?VU|> z6h{`v-^*$d-c8R5+!CHOQb>5~X6cZy#R(8608T)20;CflPJl2dyrjJ~QmAJ)5i_9j z3EbW}q^``#S5+-qQh!xdW>!|!`$d2x+z6}d{qud~%a;g@5#Dyr+ILniJCPI}p;QMz ze2V~W0M%BCK4K?%rP80%*Hanl*A3Ixh4ecjh7#l-`g;wf{yY#eytrHmAB7u3Uv_O=A!NdRE?*o$w7Qg~xgAe4cUd8WeWA8#@ z>^?)H=u1?;twh1#$8aMAW+p6v8<4@bTBCK8;%88>t3#0vRGWbgqXrSGcRzjJIs)bz zEC5K1enpJ-K;h3&PB`NXL^#sFy%Uk>vv+8)0IotCsUGVuyUjT4j7_N%R1)@wG_awowJU1=a1R&&7i}h!@3HgRsu*@{8uW8?-|3?Q3$mV z0Eaqmsgn>YFM#8<(-&;`Wq=`|JlOeie;+DLWd#tIGb8c320OJC2SX{;^Q!JLS55#) zxD&lrahn3;3snt^1XPIQwUehS7@f26`v(;sB9tGG@1E{Kg{XuFpt5F!kq&ow6RQeT z$s2etfL}T%y8?lXpOf55QH>pCZv~LFFUS{=RCt)Gg1CRFy@9XIc3uh~33=p4uJF_a z3x7~l?##yo*((9irdA}QL*RJ7jzwR19ThKt zWD8IdrFa1PffWk9@^iAw#0*i%2ixKI18|IU4?ty3Hh$&?ZEX{0WEW49q3>2zb9lz|NpfG;6GG+_dx7P#~*8q{e1#! z0*Kq0QI=ijk0&FOQ76V64Fs$V>oV3Oo@5Q9brK5-wXOwnPpMcKHQH6j@KT8lTWu58 z1aQ1|^44*0PkLd5dWTZ=%cv>)#QV;tE($FKg(QZ1P+?I}@6h&_tw&%1D*{MImGr<3 zef@8}96@Wq*9OgI>@7gxE~;1%U8oS+llQj2Y`z4;7#F~C=X6h@dJT3NYNJ2UM!(NS zpAQm508v-(%V;l+KUASeVPlWLr~uN=P968#OU~%P^@SAA+3?LmrD`d}9>x>2y%mG; z%8)SuI7oVjQo)m-LcZq5Hnfn9MD)y0F_=w?jS1kx+UYBM2iW~RQ(AZ8WEyeLt1t<1 zf9K2Qb1;Ar0oaZE+4y}Sea>E7DW#)F{H=173^o=yv>*-IOcW+K$ zBp)c;4lQYRk0s-$@+KR50NbI@&iUplFqI&& z1$f~+PeAp&$cXmb0d(esO}4|$Ln>M% zp^+2fkvfo*Tmtyz?#Zsrd${O!LSQNj

YM`#s7L^q1C8cTvw7m1`jfxdb32z5dHC~|p$%sBvEQlS->JLy;k{iZeU2Ky$USLvSKRI@f3Q5R%h zKKydOm*wwd@&J_hDuuSkmG^z5WlvijRcN#LE|hCsbM zR5CRzf_4^LT}lA1R)0c(;y(WdK_L;fH`B34Fa+7^vR+^*0k~TI3GvMe3!q`pE-sz< zHJKOCd4^?Pw@?5sSAXK~zkvnNP$(}jB?46Nc$tdOLIFfVJ_U#HQO9OuPy|a=gcgTD zd~Ffq7*irxW?x{g0I0Lib$jcF)sy%(!K@n^OudLjfN%iCXs?LT-nYR1D zO>hOH^W(MC*T?@V@AeR;TpoVeq7bGJMTigf&t_)N&HL{@buq$^;0FT~cyJMkBhC?; zg^6<~)QqP+N`Kmao9O|B6lI?Gya{`ShC=%UO35cs1c5X2*qI(c$Krp2&(nts9)-(_ zem@j=0qvT`n}tI_)Vt>L4<%qQ8r6F=WQq=6n{~u?Y6z6he(@fK!P_j2PkHey9Gu5GZCX;e80m14Drz*a zj06l7hgNT?RPJF|`aPNY3~zaWbmq%BRENRN`PK$l!o>j~H((eaH4UPJ?f+JH)QlE2 zdEzeQK!-v9ycq`F@&FQK7pld2JeJV{^)Y@z#VsvrB+fppo}SZQiwo~*nj#xy)Aj^z zhd@Hjt($s@QqMlDeKK}ZjpEJpf{&UQ|4pT ziYCQm_;-ZVtA0G>w_!WcIz$rivI^s9-miV?p~`i(_*OOOngA+P?U+IKLAvqHDXr1E z{<-N5?Lyk8OQAB8}9OrDY`^%tcr7BP7Jo1W0^F4f;m$9!=mvDo|m!BCmuk-JzyBa zq+!vSjj$*RLU=uapJwa<&9u@u8(rh=aqYnan<$ zY+_F6b<{f+z-@**=Ue{-i^LC7jCMgGc?K54G}2RjlU|sTX387D9DU4twz9_bwE!M~ zBUlXc_*yQtbYd}V0do!47j>ucF3lg>XEEF)NsvFReR{6L$9o0}Kex~VP+YaRMtRq? z{;k8Wm1I&y2bixYe5GtyKiwk+T(-LgLV34TwnWqeKAP&1_R=@SHw8pdngF;f*F7u% zufPs4PGJFf1ft44>VwG#3&0~Jz#qUkg$3XfQXK)~6cRvbNgs2a5ws`-;^*Oxp%wu0 z8}13T?H^xb#JFO}A&_TCsSbc~h8BPdf$@eyR{$|t359mK{APQGLiPf#5K6&cz<9+- zwx~Id7beRfVki`Q0Pmn=n7x2~B*;Gmat`1n>;>#YjgLZVHvo)xuotio*}e!O83N-a z>;>#Xwl6MVB?QJx*bCT&Y+s~@j(L?yiAp>XHVyUy))+kA3C2A4v|cxz-zspr5LV{G&39bu{u zj7E8TASLY)dIO9Rl$;2GxDu40-J;iF#-$2qCMGAu21pl_L;z_esPQqTLiGAQ;Dp#1 zSI_zCJb+&PeuIWng-yXUA?^c{n@L;05`d6?uYNA@u>v#=9SS|7xtYM^LQR~yyAr?! zh^8ONuFL|EgseQ!I4>(va61G_-qa?qD*jf0Zc_A?^oBE-yny4{nP7$L9W<2+9Y$}p zM(e=j0&f&Lt{;kT@LZa4UAPLM)IlJ zO#ltv4;WUZ0z~n@Qm_k54sM6|x90*iGY_bY=V{3P zTxD_~BGJF~XE*;K4TJj7Aga<0`~JI6UEmu%^U|Mo|M1k&h^VkpU58bv0AYkLfXM}l z={7x80O_u9W2!-E^~-CHJEwcVtAAdG7t!=ihp7Tc4r4c__k1{c8MCkG=fSIgPW0y2 z(X3}YdpdM;HpTp3{nt)kaPLokq?9uk^O*uj4-E97=J;L#qRX?DQaxaDg5mh^%QWWS z572-;0iP>CwCNS0{0K~LP{7;+L~{j@?g`X78TPpXbVo$5IrJ$4hTESv59hsNt^k@a znatM;5XJr6@=%OruA5qTMN-WtlMQ^V03ENLJmt8*I6{hr=cgA6px$1)r^bO=mgmRbGd*Ddp+bYrY`Ucjd@C~W-Z zSa$U%mcAx+B!eE*EEn))3QheC1VusJ-FC>d8m_UOofH97-N!S^bGj0w9vnd^MOK zRMHrfMG z5Zjo^61Fh`5EPT4Lceb`caQ+{5Gy;Nz~?67{z;4qfY=T<50%IJ1GZZrk`acS{F;Vr z%2eDxiE#lC55xOCP=2;b*lvN~@#W@0grnG|EMP?d#3jV7626Tbu{s5UIz53~9t?xw zg$%5f*{um6Ns4{D(AjbVECSy6G75&Klir(H697R8OHvu~LqpS~>h=k50o}9nJ(mlqmvREzq?30}rt^!7wp? z^R@nYI28am@Wxj`hGY}2jh}EX0OG3%+*OBcCBWSFP?*&C%NbHuiU0`u zfnAnJTi>)oFbuan6opEi!A6-A`brZ3;c}ng$N!iwsqyMx1UGg5MU*N4g5H2jB{rzv z1MCrkVR-e=4?Syo=4Bf{(E<-hx4Iv_?|kYZTDc891jF#^pAYKl+&QsM$`!eSuyb}OH zvEk17=BlZK_PSPYtP7M^|7_3!c3fdKEdU}3iQ>cdrJpe4)qiRF6!PR9SnComsz8fK-RGV*z<#m9A_N2Q>c5b9 zUTmH@{bk|32biQxZ@{bne3IIJuv#VKCo16qCi&_Oe&1IZyme)iy!y`qL%J|U*Y^8R zK`JMJF=_wEDy__U!lEqDO^$j4rvuC+L;ao{=p?rX6{b=l&@{$jk*!%o$ys0617-{v z{!0pXeB0E@LuEa{BxzXG)5dxjVbs%~8=K7|g?tRW`p3{bei}*cYfV27&dvn8Bt4_s zgH#A8@JXJjVtm#&W~f8VH!T_L*U9k5)WQSYWSl5#1MZDrw1-hXoyU_N6f~7M#vegz z|IxX>8(BrEr3WxUgIE7Ppn7*HTZcaH;F_YA9>4?*Tm9oO2c$YmufS~#>;b0m%iWV* zA>-Q}>rNjPzPSK#)P&W38teh4ASAwmdM^KDaR)9t5r~cus-rWAwgB<%*B&BF zKPnQ+EU{?g#ngbcQDgG81oamgxs(_NAVW5EbNnCuj~r2M2+OVj0000gGMC#?!LiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo32;bR za{vGf6951U69E94oEVWdAAbbGNklU2+pg5bhpHR34QRWCaI6E)=Trg#4Ho z2tEPw2|`YQbOZYY*eAdRcIDB_Q>utvtPc>hoPd3#ENO=R)+-^cXa9E%UzJMIXf)G3 z{WD+pGSz_B&WCP`X3touz9RaC4D}6Bm#$wSn8-JHFG$ueM~<9(&ECZ089t%ZNG_qUCHN{hO`G?ZPVPRoS0MF zku71(p{x&=>{DLrDjGfhe{d8ZzM%jD7XBAs7{Y3!_n!E_x>O_HI{yu2^^szFBnRW9 zObuFQwiOTT8w#BE&ZqH(ie!ZRhIXI$gJb$muw=!R6+#6NJc`w;v_%le z%x3?OkAnmICV$8#>8z9$1xAx6>C{`gKz=1Q-AV4K2`m&UaMC+R+U)09$Yu>#P;=)j zBMrvk3Y9)8LZwB{&-5+5yONQ%Im>-42=g&M%&0X)5yOU_Q+c`($jKh(q0(_Hh#URf zh7g&IZWG<5!r}i6RYh0aVI*sgPVQdpxAfIPvLd{ZOn*=X$_1!$xz4RXY7NbI&feU6 zKT4Re5jT)sMV#b^0jRXn>eXrQVhZnH1nV9b0i+_vqW}fFBZYKZ6q%$NRY#^ah00Fy*?a1i;V{bDr;r7`cQB*X%_TnI&zseggCEP=K>-a`eXLfWU2=@ivf)*O&B zv`eT)z%i;agXtj1@96P!qxfsNPnemmkVlAuR(f z+wye_kNaf3V%s2dsPZXiP)2ZVgJB`kKwBQ2kx0fBZm>})*mo(XD=E^xZ9J_>RsjL} zvww6$h8SQT>4yDHIbiG9;q+_H_aWpK-?J6_)_UNn|KKo_yBNFspv%#O-zRkj6AK#n zTAC6`0bF;!Uv}V(Kypojz(5 z?1|?ES##Tz15xnw68iNaYC8S!F3LLfbzu}L>ann#OwY#aE1o_CpP*%4M0lVUhF<`l<5THYJBByhDUh*1?CohypHKy&kSZ(mI=%uS W7IoMcIF|JQ0000