From 89e48395cf5459175c4672f917def96c065be537 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Sun, 30 Jan 2022 12:11:10 +0800 Subject: [PATCH] =?UTF-8?q?[monitor]=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=AF=B9=E8=B1=A1=E7=B1=BB=E8=BF=81=E7=A7=BB=E5=88=B0?= =?UTF-8?q?common=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/usthe/alert/AlerterDataQueue.java | 2 +- .../usthe/alert/calculate/CalculateAlarm.java | 4 +- .../controller/AlertDefineController.java | 4 +- .../controller/AlertDefinesController.java | 2 +- .../alert/controller/AlertsController.java | 2 +- .../java/com/usthe/alert/dao/AlertDao.java | 2 +- .../usthe/alert/dao/AlertDefineBindDao.java | 2 +- .../com/usthe/alert/dao/AlertDefineDao.java | 2 +- .../alert/service/AlertDefineService.java | 4 +- .../com/usthe/alert/service/AlertService.java | 2 +- .../service/impl/AlertDefineServiceImpl.java | 4 +- .../alert/service/impl/AlertServiceImpl.java | 2 +- .../usthe/common/entity/alerter}/Alert.java | 2 +- .../common/entity/alerter}/AlertDefine.java | 2 +- .../entity/alerter}/AlertDefineBind.java | 2 +- .../JsonOptionListAttributeConverter.java | 2 +- .../usthe/common/entity/manager}/Monitor.java | 5 +- .../entity/manager}/NoticeReceiver.java | 2 +- .../common/entity/manager}/NoticeRule.java | 2 +- .../usthe/common/entity/manager}/Param.java | 2 +- .../common/entity/manager}/ParamDefine.java | 2 +- .../component/alerter/DispatchAlarm.java | 6 +-- .../manager/controller/AppController.java | 2 +- .../manager/controller/I18nController.java | 1 - .../controller/MonitorsController.java | 2 +- .../controller/NoticeConfigController.java | 4 +- .../com/usthe/manager/dao/MonitorDao.java | 2 +- .../usthe/manager/dao/NoticeReceiverDao.java | 2 +- .../com/usthe/manager/dao/NoticeRuleDao.java | 2 +- .../java/com/usthe/manager/dao/ParamDao.java | 2 +- .../com/usthe/manager/dao/ParamDefineDao.java | 3 +- .../usthe/manager/pojo/dto/MonitorDto.java | 4 +- .../manager/pojo/dto/ParamDefineDto.java | 2 +- .../com/usthe/manager/service/AppService.java | 2 +- .../usthe/manager/service/MonitorService.java | 4 +- .../manager/service/NoticeConfigService.java | 6 +-- .../manager/service/impl/AppServiceImpl.java | 2 +- .../service/impl/MonitorServiceImpl.java | 6 +-- .../service/impl/NoticeConfigServiceImpl.java | 6 +-- .../manager/support/SpringContextHolder.java | 48 ------------------- .../support/valid/HostParamValidator.java | 20 -------- .../manager/support/valid/HostValid.java | 29 ----------- 42 files changed, 55 insertions(+), 153 deletions(-) rename {alerter/src/main/java/com/usthe/alert/pojo/entity => common/src/main/java/com/usthe/common/entity/alerter}/Alert.java (98%) rename {alerter/src/main/java/com/usthe/alert/pojo/entity => common/src/main/java/com/usthe/common/entity/alerter}/AlertDefine.java (98%) rename {alerter/src/main/java/com/usthe/alert/pojo/entity => common/src/main/java/com/usthe/common/entity/alerter}/AlertDefineBind.java (97%) rename {manager/src/main/java/com/usthe/manager/pojo/entity => common/src/main/java/com/usthe/common/entity/manager}/JsonOptionListAttributeConverter.java (93%) rename {manager/src/main/java/com/usthe/manager/pojo/entity => common/src/main/java/com/usthe/common/entity/manager}/Monitor.java (97%) rename {manager/src/main/java/com/usthe/manager/pojo/entity => common/src/main/java/com/usthe/common/entity/manager}/NoticeReceiver.java (98%) rename {manager/src/main/java/com/usthe/manager/pojo/entity => common/src/main/java/com/usthe/common/entity/manager}/NoticeRule.java (98%) rename {manager/src/main/java/com/usthe/manager/pojo/entity => common/src/main/java/com/usthe/common/entity/manager}/Param.java (98%) rename {manager/src/main/java/com/usthe/manager/pojo/entity => common/src/main/java/com/usthe/common/entity/manager}/ParamDefine.java (99%) delete mode 100644 manager/src/main/java/com/usthe/manager/support/SpringContextHolder.java delete mode 100644 manager/src/main/java/com/usthe/manager/support/valid/HostParamValidator.java delete mode 100644 manager/src/main/java/com/usthe/manager/support/valid/HostValid.java diff --git a/alerter/src/main/java/com/usthe/alert/AlerterDataQueue.java b/alerter/src/main/java/com/usthe/alert/AlerterDataQueue.java index 562c17a..4ae9ede 100644 --- a/alerter/src/main/java/com/usthe/alert/AlerterDataQueue.java +++ b/alerter/src/main/java/com/usthe/alert/AlerterDataQueue.java @@ -1,6 +1,6 @@ package com.usthe.alert; -import com.usthe.alert.pojo.entity.Alert; +import com.usthe.common.entity.alerter.Alert; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java b/alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java index 1a2cb3a..555dfe4 100644 --- a/alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java +++ b/alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java @@ -4,8 +4,8 @@ import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; import com.usthe.alert.AlerterWorkerPool; import com.usthe.alert.AlerterDataQueue; -import com.usthe.alert.pojo.entity.Alert; -import com.usthe.alert.pojo.entity.AlertDefine; +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.collector.dispatch.export.MetricsDataExporter; diff --git a/alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java b/alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java index 63a789e..b2aebec 100644 --- a/alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java +++ b/alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java @@ -1,7 +1,7 @@ package com.usthe.alert.controller; -import com.usthe.alert.pojo.entity.AlertDefine; -import com.usthe.alert.pojo.entity.AlertDefineBind; +import com.usthe.common.entity.alerter.AlertDefine; +import com.usthe.common.entity.alerter.AlertDefineBind; import com.usthe.alert.service.AlertDefineService; import com.usthe.common.entity.dto.Message; import io.swagger.annotations.Api; diff --git a/alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java b/alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java index 97903ce..213752a 100644 --- a/alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java +++ b/alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java @@ -1,6 +1,6 @@ package com.usthe.alert.controller; -import com.usthe.alert.pojo.entity.AlertDefine; +import com.usthe.common.entity.alerter.AlertDefine; import com.usthe.alert.service.AlertDefineService; import com.usthe.common.entity.dto.Message; import io.swagger.annotations.Api; diff --git a/alerter/src/main/java/com/usthe/alert/controller/AlertsController.java b/alerter/src/main/java/com/usthe/alert/controller/AlertsController.java index a969444..238e9bd 100644 --- a/alerter/src/main/java/com/usthe/alert/controller/AlertsController.java +++ b/alerter/src/main/java/com/usthe/alert/controller/AlertsController.java @@ -1,6 +1,6 @@ package com.usthe.alert.controller; -import com.usthe.alert.pojo.entity.Alert; +import com.usthe.common.entity.alerter.Alert; import com.usthe.alert.service.AlertService; import com.usthe.common.entity.dto.Message; import io.swagger.annotations.Api; diff --git a/alerter/src/main/java/com/usthe/alert/dao/AlertDao.java b/alerter/src/main/java/com/usthe/alert/dao/AlertDao.java index cc955f6..35cd920 100644 --- a/alerter/src/main/java/com/usthe/alert/dao/AlertDao.java +++ b/alerter/src/main/java/com/usthe/alert/dao/AlertDao.java @@ -1,6 +1,6 @@ package com.usthe.alert.dao; -import com.usthe.alert.pojo.entity.Alert; +import com.usthe.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; diff --git a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java b/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java index 812b517..6fc6e55 100644 --- a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java +++ b/alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java @@ -1,6 +1,6 @@ package com.usthe.alert.dao; -import com.usthe.alert.pojo.entity.AlertDefineBind; +import com.usthe.common.entity.alerter.AlertDefineBind; 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/com/usthe/alert/dao/AlertDefineDao.java index e2cd779..6a752a9 100644 --- a/alerter/src/main/java/com/usthe/alert/dao/AlertDefineDao.java +++ b/alerter/src/main/java/com/usthe/alert/dao/AlertDefineDao.java @@ -1,6 +1,6 @@ package com.usthe.alert.dao; -import com.usthe.alert.pojo.entity.AlertDefine; +import com.usthe.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/service/AlertDefineService.java b/alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java index 790cbf4..0f8b1b9 100644 --- a/alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java +++ b/alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java @@ -1,7 +1,7 @@ package com.usthe.alert.service; -import com.usthe.alert.pojo.entity.AlertDefine; -import com.usthe.alert.pojo.entity.AlertDefineBind; +import com.usthe.common.entity.alerter.AlertDefine; +import com.usthe.common.entity.alerter.AlertDefineBind; 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/com/usthe/alert/service/AlertService.java index 06d2858..c46504b 100644 --- a/alerter/src/main/java/com/usthe/alert/service/AlertService.java +++ b/alerter/src/main/java/com/usthe/alert/service/AlertService.java @@ -1,6 +1,6 @@ package com.usthe.alert.service; -import com.usthe.alert.pojo.entity.Alert; +import com.usthe.common.entity.alerter.Alert; 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/com/usthe/alert/service/impl/AlertDefineServiceImpl.java index 11ec856..5df988c 100644 --- a/alerter/src/main/java/com/usthe/alert/service/impl/AlertDefineServiceImpl.java +++ b/alerter/src/main/java/com/usthe/alert/service/impl/AlertDefineServiceImpl.java @@ -2,8 +2,8 @@ package com.usthe.alert.service.impl; import com.usthe.alert.dao.AlertDefineBindDao; import com.usthe.alert.dao.AlertDefineDao; -import com.usthe.alert.pojo.entity.AlertDefine; -import com.usthe.alert.pojo.entity.AlertDefineBind; +import com.usthe.common.entity.alerter.AlertDefine; +import com.usthe.common.entity.alerter.AlertDefineBind; import com.usthe.alert.service.AlertDefineService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java b/alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java index 96a4d1f..883cf47 100644 --- a/alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java +++ b/alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java @@ -1,7 +1,7 @@ package com.usthe.alert.service.impl; import com.usthe.alert.dao.AlertDao; -import com.usthe.alert.pojo.entity.Alert; +import com.usthe.common.entity.alerter.Alert; import com.usthe.alert.service.AlertService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/alerter/src/main/java/com/usthe/alert/pojo/entity/Alert.java b/common/src/main/java/com/usthe/common/entity/alerter/Alert.java similarity index 98% rename from alerter/src/main/java/com/usthe/alert/pojo/entity/Alert.java rename to common/src/main/java/com/usthe/common/entity/alerter/Alert.java index 1f1042f..11b6a1b 100644 --- a/alerter/src/main/java/com/usthe/alert/pojo/entity/Alert.java +++ b/common/src/main/java/com/usthe/common/entity/alerter/Alert.java @@ -1,4 +1,4 @@ -package com.usthe.alert.pojo.entity; +package com.usthe.common.entity.alerter; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefine.java b/common/src/main/java/com/usthe/common/entity/alerter/AlertDefine.java similarity index 98% rename from alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefine.java rename to common/src/main/java/com/usthe/common/entity/alerter/AlertDefine.java index 76b05a1..a1f4260 100644 --- a/alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefine.java +++ b/common/src/main/java/com/usthe/common/entity/alerter/AlertDefine.java @@ -1,4 +1,4 @@ -package com.usthe.alert.pojo.entity; +package com.usthe.common.entity.alerter; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefineBind.java b/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineBind.java similarity index 97% rename from alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefineBind.java rename to common/src/main/java/com/usthe/common/entity/alerter/AlertDefineBind.java index 30c27bf..e7e18c0 100644 --- a/alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefineBind.java +++ b/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineBind.java @@ -1,4 +1,4 @@ -package com.usthe.alert.pojo.entity; +package com.usthe.common.entity.alerter; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/JsonOptionListAttributeConverter.java b/common/src/main/java/com/usthe/common/entity/manager/JsonOptionListAttributeConverter.java similarity index 93% rename from manager/src/main/java/com/usthe/manager/pojo/entity/JsonOptionListAttributeConverter.java rename to common/src/main/java/com/usthe/common/entity/manager/JsonOptionListAttributeConverter.java index 2142fd6..b22b6a5 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/JsonOptionListAttributeConverter.java +++ b/common/src/main/java/com/usthe/common/entity/manager/JsonOptionListAttributeConverter.java @@ -1,4 +1,4 @@ -package com.usthe.manager.pojo.entity; +package com.usthe.common.entity.manager; import com.usthe.common.util.GsonUtil; diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java b/common/src/main/java/com/usthe/common/entity/manager/Monitor.java similarity index 97% rename from manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java rename to common/src/main/java/com/usthe/common/entity/manager/Monitor.java index b496152..1fecdb7 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java +++ b/common/src/main/java/com/usthe/common/entity/manager/Monitor.java @@ -1,6 +1,7 @@ -package com.usthe.manager.pojo.entity; +package com.usthe.common.entity.manager; -import com.usthe.manager.support.valid.HostValid; + +import com.usthe.common.support.valid.HostValid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/NoticeReceiver.java b/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java similarity index 98% rename from manager/src/main/java/com/usthe/manager/pojo/entity/NoticeReceiver.java rename to common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java index 0dfdc83..d5353d4 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/NoticeReceiver.java +++ b/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java @@ -1,4 +1,4 @@ -package com.usthe.manager.pojo.entity; +package com.usthe.common.entity.manager; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/NoticeRule.java b/common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java similarity index 98% rename from manager/src/main/java/com/usthe/manager/pojo/entity/NoticeRule.java rename to common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java index d386b81..175dcc1 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/NoticeRule.java +++ b/common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java @@ -1,4 +1,4 @@ -package com.usthe.manager.pojo.entity; +package com.usthe.common.entity.manager; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java b/common/src/main/java/com/usthe/common/entity/manager/Param.java similarity index 98% rename from manager/src/main/java/com/usthe/manager/pojo/entity/Param.java rename to common/src/main/java/com/usthe/common/entity/manager/Param.java index b7f0fd4..e2fc118 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java +++ b/common/src/main/java/com/usthe/common/entity/manager/Param.java @@ -1,4 +1,4 @@ -package com.usthe.manager.pojo.entity; +package com.usthe.common.entity.manager; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java b/common/src/main/java/com/usthe/common/entity/manager/ParamDefine.java similarity index 99% rename from manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java rename to common/src/main/java/com/usthe/common/entity/manager/ParamDefine.java index 10ddc9e..9ff26a8 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java +++ b/common/src/main/java/com/usthe/common/entity/manager/ParamDefine.java @@ -1,4 +1,4 @@ -package com.usthe.manager.pojo.entity; +package com.usthe.common.entity.manager; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java b/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java index bfd5070..8ae7f77 100644 --- a/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java +++ b/manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java @@ -2,11 +2,11 @@ package com.usthe.manager.component.alerter; import com.usthe.alert.AlerterDataQueue; import com.usthe.alert.AlerterWorkerPool; -import com.usthe.alert.pojo.entity.Alert; +import com.usthe.common.entity.alerter.Alert; import com.usthe.alert.service.AlertService; import com.usthe.common.util.CommonConstants; -import com.usthe.manager.pojo.entity.Monitor; -import com.usthe.manager.pojo.entity.NoticeReceiver; +import com.usthe.common.entity.manager.Monitor; +import com.usthe.common.entity.manager.NoticeReceiver; import com.usthe.manager.service.MonitorService; import com.usthe.manager.service.NoticeConfigService; import lombok.extern.slf4j.Slf4j; diff --git a/manager/src/main/java/com/usthe/manager/controller/AppController.java b/manager/src/main/java/com/usthe/manager/controller/AppController.java index cae3875..039dad7 100644 --- a/manager/src/main/java/com/usthe/manager/controller/AppController.java +++ b/manager/src/main/java/com/usthe/manager/controller/AppController.java @@ -2,7 +2,7 @@ package com.usthe.manager.controller; import com.usthe.common.entity.dto.Message; import com.usthe.manager.pojo.dto.Hierarchy; -import com.usthe.manager.pojo.entity.ParamDefine; +import com.usthe.common.entity.manager.ParamDefine; import com.usthe.manager.service.AppService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager/src/main/java/com/usthe/manager/controller/I18nController.java b/manager/src/main/java/com/usthe/manager/controller/I18nController.java index 4f7fede..6660ad8 100644 --- a/manager/src/main/java/com/usthe/manager/controller/I18nController.java +++ b/manager/src/main/java/com/usthe/manager/controller/I18nController.java @@ -1,7 +1,6 @@ package com.usthe.manager.controller; import com.usthe.common.entity.dto.Message; -import com.usthe.manager.pojo.entity.ParamDefine; import com.usthe.manager.service.AppService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java b/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java index b10f114..c807c32 100644 --- a/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java +++ b/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java @@ -1,7 +1,7 @@ package com.usthe.manager.controller; import com.usthe.common.entity.dto.Message; -import com.usthe.manager.pojo.entity.Monitor; +import com.usthe.common.entity.manager.Monitor; import com.usthe.manager.service.MonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java b/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java index fe676b0..c498941 100644 --- a/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java +++ b/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java @@ -1,8 +1,8 @@ package com.usthe.manager.controller; import com.usthe.common.entity.dto.Message; -import com.usthe.manager.pojo.entity.NoticeReceiver; -import com.usthe.manager.pojo.entity.NoticeRule; +import com.usthe.common.entity.manager.NoticeReceiver; +import com.usthe.common.entity.manager.NoticeRule; import com.usthe.manager.service.NoticeConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager/src/main/java/com/usthe/manager/dao/MonitorDao.java b/manager/src/main/java/com/usthe/manager/dao/MonitorDao.java index a631b3f..2b44e24 100644 --- a/manager/src/main/java/com/usthe/manager/dao/MonitorDao.java +++ b/manager/src/main/java/com/usthe/manager/dao/MonitorDao.java @@ -1,7 +1,7 @@ package com.usthe.manager.dao; import com.usthe.manager.pojo.dto.AppCount; -import com.usthe.manager.pojo.entity.Monitor; +import com.usthe.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; diff --git a/manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java b/manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java index f918992..36fcfe2 100644 --- a/manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java +++ b/manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java @@ -1,6 +1,6 @@ package com.usthe.manager.dao; -import com.usthe.manager.pojo.entity.NoticeReceiver; +import com.usthe.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/com/usthe/manager/dao/NoticeRuleDao.java index 075fb7a..54bcb44 100644 --- a/manager/src/main/java/com/usthe/manager/dao/NoticeRuleDao.java +++ b/manager/src/main/java/com/usthe/manager/dao/NoticeRuleDao.java @@ -1,6 +1,6 @@ package com.usthe.manager.dao; -import com.usthe.manager.pojo.entity.NoticeRule; +import com.usthe.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/com/usthe/manager/dao/ParamDao.java index a0a3126..4ed655a 100644 --- a/manager/src/main/java/com/usthe/manager/dao/ParamDao.java +++ b/manager/src/main/java/com/usthe/manager/dao/ParamDao.java @@ -1,6 +1,6 @@ package com.usthe.manager.dao; -import com.usthe.manager.pojo.entity.Param; +import com.usthe.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/com/usthe/manager/dao/ParamDefineDao.java index a07cdb4..96bafb8 100644 --- a/manager/src/main/java/com/usthe/manager/dao/ParamDefineDao.java +++ b/manager/src/main/java/com/usthe/manager/dao/ParamDefineDao.java @@ -1,10 +1,9 @@ package com.usthe.manager.dao; -import com.usthe.manager.pojo.entity.ParamDefine; +import com.usthe.common.entity.manager.ParamDefine; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -import java.util.Optional; /** * ParamDefine数据库操作 diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java b/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java index 5e677e0..8f4d858 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java +++ b/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java @@ -1,7 +1,7 @@ package com.usthe.manager.pojo.dto; -import com.usthe.manager.pojo.entity.Monitor; -import com.usthe.manager.pojo.entity.Param; +import com.usthe.common.entity.manager.Monitor; +import com.usthe.common.entity.manager.Param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java b/manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java index a6ef0d7..0b72a7b 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java +++ b/manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java @@ -1,6 +1,6 @@ package com.usthe.manager.pojo.dto; -import com.usthe.manager.pojo.entity.ParamDefine; +import com.usthe.common.entity.manager.ParamDefine; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/manager/src/main/java/com/usthe/manager/service/AppService.java b/manager/src/main/java/com/usthe/manager/service/AppService.java index 59f993a..0ad6d42 100644 --- a/manager/src/main/java/com/usthe/manager/service/AppService.java +++ b/manager/src/main/java/com/usthe/manager/service/AppService.java @@ -2,7 +2,7 @@ package com.usthe.manager.service; import com.usthe.common.entity.job.Job; import com.usthe.manager.pojo.dto.Hierarchy; -import com.usthe.manager.pojo.entity.ParamDefine; +import com.usthe.common.entity.manager.ParamDefine; import java.util.List; import java.util.Map; diff --git a/manager/src/main/java/com/usthe/manager/service/MonitorService.java b/manager/src/main/java/com/usthe/manager/service/MonitorService.java index 5a80c53..ac0e984 100644 --- a/manager/src/main/java/com/usthe/manager/service/MonitorService.java +++ b/manager/src/main/java/com/usthe/manager/service/MonitorService.java @@ -2,8 +2,8 @@ package com.usthe.manager.service; import com.usthe.manager.pojo.dto.AppCount; import com.usthe.manager.pojo.dto.MonitorDto; -import com.usthe.manager.pojo.entity.Monitor; -import com.usthe.manager.pojo.entity.Param; +import com.usthe.common.entity.manager.Monitor; +import com.usthe.common.entity.manager.Param; import com.usthe.manager.support.exception.MonitorDetectException; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java b/manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java index e483d31..116c9e4 100644 --- a/manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java +++ b/manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java @@ -1,8 +1,8 @@ package com.usthe.manager.service; -import com.usthe.alert.pojo.entity.Alert; -import com.usthe.manager.pojo.entity.NoticeReceiver; -import com.usthe.manager.pojo.entity.NoticeRule; +import com.usthe.common.entity.alerter.Alert; +import com.usthe.common.entity.manager.NoticeReceiver; +import com.usthe.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/impl/AppServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java index 6508304..3f82a48 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java @@ -5,7 +5,7 @@ import com.usthe.common.entity.job.Metrics; import com.usthe.manager.dao.ParamDefineDao; import com.usthe.manager.pojo.dto.Hierarchy; import com.usthe.manager.pojo.dto.ParamDefineDto; -import com.usthe.manager.pojo.entity.ParamDefine; +import com.usthe.common.entity.manager.ParamDefine; import com.usthe.manager.service.AppService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java index 2a6e9ca..458961d 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java +++ b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java @@ -14,9 +14,9 @@ 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.pojo.entity.Monitor; -import com.usthe.manager.pojo.entity.Param; -import com.usthe.manager.pojo.entity.ParamDefine; +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; diff --git a/manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java index e1890cd..384f686 100644 --- a/manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java +++ b/manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java @@ -1,10 +1,10 @@ package com.usthe.manager.service.impl; -import com.usthe.alert.pojo.entity.Alert; +import com.usthe.common.entity.alerter.Alert; import com.usthe.manager.dao.NoticeReceiverDao; import com.usthe.manager.dao.NoticeRuleDao; -import com.usthe.manager.pojo.entity.NoticeReceiver; -import com.usthe.manager.pojo.entity.NoticeRule; +import com.usthe.common.entity.manager.NoticeReceiver; +import com.usthe.common.entity.manager.NoticeRule; import com.usthe.manager.service.NoticeConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/manager/src/main/java/com/usthe/manager/support/SpringContextHolder.java b/manager/src/main/java/com/usthe/manager/support/SpringContextHolder.java deleted file mode 100644 index 35d725a..0000000 --- a/manager/src/main/java/com/usthe/manager/support/SpringContextHolder.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.usthe.manager.support; - -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; - -/** - * Spring的ApplicationContext的持有者,可以用静态方法的方式获取spring容器中的bean - * @author tomsun28 - * @date 21:07 2018/4/18 - */ -@Component -public class SpringContextHolder implements ApplicationContextAware { - - private static ApplicationContext applicationContext; - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - set(applicationContext); - } - - private static void set(ApplicationContext applicationContext) { - SpringContextHolder.applicationContext = applicationContext; - } - - public static ApplicationContext getApplicationContext() { - assertApplicationContext(); - return applicationContext; - } - - @SuppressWarnings("unchecked") - public static T getBean(String beanName) { - assertApplicationContext(); - return (T) applicationContext.getBean(beanName); - } - - public static T getBean(Class tClass) { - assertApplicationContext(); - return (T) applicationContext.getBean(tClass); - } - - private static void assertApplicationContext() { - if (null == SpringContextHolder.applicationContext) { - throw new RuntimeException("applicationContext为空,请检查是否注入springContextHolder"); - } - } -} diff --git a/manager/src/main/java/com/usthe/manager/support/valid/HostParamValidator.java b/manager/src/main/java/com/usthe/manager/support/valid/HostParamValidator.java deleted file mode 100644 index 3c10d47..0000000 --- a/manager/src/main/java/com/usthe/manager/support/valid/HostParamValidator.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.usthe.manager.support.valid; - -import com.usthe.common.util.IpDomainUtil; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * host注解数据自定义校验器 - * @author tomsun28 - * @date 2021/11/17 19:44 - */ -public class HostParamValidator implements ConstraintValidator { - - @Override - public boolean isValid(String value, ConstraintValidatorContext context) { - // 判断value是否满足ipv4 ipv5 域名 格式 - return IpDomainUtil.validateIpDomain(value); - } -} diff --git a/manager/src/main/java/com/usthe/manager/support/valid/HostValid.java b/manager/src/main/java/com/usthe/manager/support/valid/HostValid.java deleted file mode 100644 index 85ec830..0000000 --- a/manager/src/main/java/com/usthe/manager/support/valid/HostValid.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.usthe.manager.support.valid; - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * host注解数据自定义校验器注解 - * @author tomsun28 - * @date 2021/11/17 19:42 - */ -@Target({ FIELD, PARAMETER }) -@Retention(RUNTIME) -@Documented -@Constraint(validatedBy = HostParamValidator.class) -public @interface HostValid { - - String message() default "Host value is invalid,must ipv4, ipv6 or domain"; - - Class[] groups() default {}; - - Class[] payload() default {}; -}