[monitor]数据库实体对象类迁移到common包

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;
 

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.common.entity.alerter.Alert;
-import com.usthe.alert.pojo.entity.AlertDefine;
+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;

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.common.entity.alerter.AlertDefine;
-import com.usthe.alert.pojo.entity.AlertDefineBind;
+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;

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;

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;

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;

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;
 

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;

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.common.entity.alerter.AlertDefine;
-import com.usthe.alert.pojo.entity.AlertDefineBind;
+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;

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;

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.common.entity.alerter.AlertDefine;
-import com.usthe.alert.pojo.entity.AlertDefineBind;
+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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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.common.entity.manager.Monitor;
-import com.usthe.manager.pojo.entity.NoticeReceiver;
+import com.usthe.common.entity.manager.NoticeReceiver;
 import com.usthe.manager.service.MonitorService;
 import com.usthe.manager.service.NoticeConfigService;
 import lombok.extern.slf4j.Slf4j;

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;

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;

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;

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.common.entity.manager.NoticeReceiver;
-import com.usthe.manager.pojo.entity.NoticeRule;
+import com.usthe.common.entity.manager.NoticeRule;
 import com.usthe.manager.service.NoticeConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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;

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;
 

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;
 

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;

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数据库操作

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.common.entity.manager.Monitor;
-import com.usthe.manager.pojo.entity.Param;
+import com.usthe.common.entity.manager.Param;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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;

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;

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.common.entity.manager.Monitor;
-import com.usthe.manager.pojo.entity.Param;
+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;

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.common.entity.alerter.Alert;
-import com.usthe.manager.pojo.entity.NoticeReceiver;
+import com.usthe.common.entity.manager.NoticeReceiver;
-import com.usthe.manager.pojo.entity.NoticeRule;
+import com.usthe.common.entity.manager.NoticeRule;
 import org.springframework.data.jpa.domain.Specification;
 
 import java.util.List;

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;

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.common.entity.manager.Monitor;
-import com.usthe.manager.pojo.entity.Param;
+import com.usthe.common.entity.manager.Param;
-import com.usthe.manager.pojo.entity.ParamDefine;
+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;

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.common.entity.manager.NoticeReceiver;
-import com.usthe.manager.pojo.entity.NoticeRule;
+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;

manager/src/main/java/com/usthe/manager/support/SpringContextHolder.java

@@ -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> T getBean(String beanName) {
-        assertApplicationContext();
-        return (T) applicationContext.getBean(beanName);
-    }
-
-    public static <T> T getBean(Class<T> tClass) {
-        assertApplicationContext();
-        return (T) applicationContext.getBean(tClass);
-    }
-
-    private static void assertApplicationContext() {
-        if (null == SpringContextHolder.applicationContext) {
-            throw new RuntimeException("applicationContext为空,请检查是否注入springContextHolder");
-        }
-    }
-}

manager/src/main/java/com/usthe/manager/support/valid/HostParamValidator.java

@@ -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<HostValid, String> {
-
-    @Override
-    public boolean isValid(String value, ConstraintValidatorContext context) {
-        // 判断value是否满足ipv4 ipv5 域名 格式
-        return IpDomainUtil.validateIpDomain(value);
-    }
-}

manager/src/main/java/com/usthe/manager/support/valid/HostValid.java

@@ -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<? extends Payload>[] payload() default {};
-}