Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backend包名修改 #1108

Merged
merged 1 commit into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions sermant-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.huawei.sermant.backend.common.exception;
package com.huaweicloud.sermant.backend.common.exception;

/**
* 错误信息处理器
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.huawei.sermant.backend.common.exception;
package com.huaweicloud.sermant.backend.common.exception;

/**
* zookeeper动态配置异常类
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.huawei.sermant.backend.entity;
package com.huaweicloud.sermant.backend.entity;

public enum AddressScope {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.huawei.sermant.backend.entity;
package com.huaweicloud.sermant.backend.entity;

public enum AddressType {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package com.huawei.sermant.backend.entity;
package com.huaweicloud.sermant.backend.entity;

/**
* 服务可见性基础信息
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package com.huawei.sermant.backend.entity;
package com.huaweicloud.sermant.backend.entity;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package com.huawei.sermant.backend.entity;
package com.huaweicloud.sermant.backend.entity;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading