Merge pull request #1108 from xuezechao1/issue_1107

backend包名修改

report/pom.xml

@@ -126,6 +126,11 @@
             <artifactId>spring-cloud-registry-service</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.huaweicloud.sermant</groupId>
+            <artifactId>sermant-backend</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

sermant-backend/pom.xml

@@ -217,7 +217,7 @@
                         <artifactId>spring-boot-maven-plugin</artifactId>
                         <version>${spring.boot.version}</version>
                         <configuration>
-                            <mainClass>com.huawei.sermant.backend.NettyServerApplication</mainClass>
+                            <mainClass>com.huaweicloud.sermant.backend.NettyServerApplication</mainClass>
                             <outputDirectory>${package.output.dir}</outputDirectory>
                         </configuration>
                         <executions>
@@ -240,7 +240,7 @@
                         <artifactId>spring-boot-maven-plugin</artifactId>
                         <version>${spring.boot.version}</version>
                         <configuration>
-                            <mainClass>com.huawei.sermant.backend.NettyServerApplication</mainClass>
+                            <mainClass>com.huaweicloud.sermant.backend.NettyServerApplication</mainClass>
                             <outputDirectory>${package.output.dir}</outputDirectory>
                         </configuration>
                         <executions>

sermant-backend/src/main/java/com/huawei/sermant/backend/NettyServerApplication.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/NettyServerApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend;
+package com.huaweicloud.sermant.backend;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

sermant-backend/src/main/java/com/huawei/sermant/backend/cache/CollectorCache.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/CollectorCache.java

@@ -15,12 +15,12 @@
  *
  */
 
-package com.huawei.sermant.backend.cache;
+package com.huaweicloud.sermant.backend.cache;
 
-import com.huawei.sermant.backend.entity.Consanguinity;
-import com.huawei.sermant.backend.entity.Contract;
-import com.huawei.sermant.backend.entity.ServerInfo;
-import com.huawei.sermant.backend.entity.ServiceType;
+import com.huaweicloud.sermant.backend.entity.Consanguinity;
+import com.huaweicloud.sermant.backend.entity.Contract;
+import com.huaweicloud.sermant.backend.entity.ServerInfo;
+import com.huaweicloud.sermant.backend.entity.ServiceType;
 
 import com.alibaba.fastjson.JSONObject;
 

sermant-backend/src/main/java/com/huawei/sermant/backend/cache/DeleteTimeoutData.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/DeleteTimeoutData.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.cache;
+package com.huaweicloud.sermant.backend.cache;
 
-import com.huawei.sermant.backend.common.conf.VisibilityConfig;
-import com.huawei.sermant.backend.entity.HeartbeatEntity;
-import com.huawei.sermant.backend.entity.ServerInfo;
+import com.huaweicloud.sermant.backend.common.conf.VisibilityConfig;
+import com.huaweicloud.sermant.backend.entity.HeartbeatEntity;
+import com.huaweicloud.sermant.backend.entity.ServerInfo;
 
 import java.util.Iterator;
 import java.util.Map;

sermant-backend/src/main/java/com/huawei/sermant/backend/cache/HeartbeatCache.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/HeartbeatCache.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.cache;
+package com.huaweicloud.sermant.backend.cache;
 
-import com.huawei.sermant.backend.entity.HeartbeatEntity;
-import com.huawei.sermant.backend.entity.ServerInfo;
+import com.huaweicloud.sermant.backend.entity.HeartbeatEntity;
+import com.huaweicloud.sermant.backend.entity.ServerInfo;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/DataTypeTopicMapping.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021-2022 Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package com.huaweicloud.sermant.backend.common.conf;
+
+import lombok.Data;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * web 配置
+ *
+ * @author beetlemen
+ * @since 2021-12-08
+ */
+@Data
+@ConfigurationProperties(
+        prefix = "datatype.topic"
+)
+public class DataTypeTopicMapping {
+    private final Map<Integer, String> mapping = new HashMap<>();
+
+    /**
+     * 获取topic类型
+     *
+     * @param type 类型
+     * @return topic
+     */
+    public String getTopicOfType(Integer type) {
+        return mapping.get(type);
+    }
+}

sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/KafkaConf.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/KafkaConf.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.common.conf;
+package com.huaweicloud.sermant.backend.common.conf;
 
 import lombok.Getter;
 import lombok.Setter;

sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/VisibilityConfig.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/VisibilityConfig.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.common.conf;
+package com.huaweicloud.sermant.backend.common.conf;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/WebConfig.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/WebConfig.java

@@ -1,11 +1,33 @@
-package com.huawei.sermant.backend.common.conf;
+/*
+ * Copyright (C) 2021-2022 Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package com.huaweicloud.sermant.backend.common.conf;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+/**
+ * web 配置
+ *
+ * @since 2021-12-17
+ * @author xuezechao
+ */
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 

sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ErrorMsgParser.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ErrorMsgParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.common.exception;
+package com.huaweicloud.sermant.backend.common.exception;
 
 /**
  * 错误信息处理器

sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/KafkaTopicException.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/KafkaTopicException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.common.exception;
+package com.huaweicloud.sermant.backend.common.exception;
 
 import java.util.Locale;
 

sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.common.exception;
+package com.huaweicloud.sermant.backend.common.exception;
 
 /**
  * zookeeper动态配置异常类

sermant-backend/src/main/java/com/huawei/sermant/backend/common/handler/BaseHandler.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/handler/BaseHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.common.handler;
+package com.huaweicloud.sermant.backend.common.handler;
 
 import com.huawei.sermant.backend.pojo.Message;
 

sermant-backend/src/main/java/com/huawei/sermant/backend/common/util/GzipUtils.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/util/GzipUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.common.util;
+package com.huaweicloud.sermant.backend.common.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

sermant-backend/src/main/java/com/huawei/sermant/backend/controller/VisibilityController.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/controller/VisibilityController.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.controller;
+package com.huaweicloud.sermant.backend.controller;
 
-import com.huawei.sermant.backend.cache.CollectorCache;
-import com.huawei.sermant.backend.entity.ServerInfo;
+import com.huaweicloud.sermant.backend.cache.CollectorCache;
+import com.huaweicloud.sermant.backend.entity.ServerInfo;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Address.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Address.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 import lombok.Getter;
 import lombok.Setter;

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressScope.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressScope.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 public enum AddressScope {
     /**

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressType.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 public enum AddressType {
     /**

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AgentInfo.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AgentInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 import lombok.Getter;
 import lombok.Setter;

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/BaseInfo.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/BaseInfo.java

@@ -15,7 +15,7 @@
  *
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 /**
  * 服务可见性基础信息

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Consanguinity.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Consanguinity.java

@@ -15,7 +15,7 @@
  *
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 import java.util.List;
 

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Contract.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Contract.java

@@ -15,7 +15,7 @@
  *
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 import java.util.List;
 

sermant-backend/src/main/java/com/huawei/sermant/backend/entity/HeartBeatResult.java → sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/HeartBeatResult.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.huawei.sermant.backend.entity;
+package com.huaweicloud.sermant.backend.entity;
 
 import java.util.List;
 import java.util.Map;