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
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
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
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
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
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
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
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
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
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
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
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 c89ac20273c..4d53d66b884 100644
Binary files a/web-app/src/favicon.ico and b/web-app/src/favicon.ico differ