diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java index 2085ed4b99..4136d3328e 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java +++ b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java @@ -1,25 +1,50 @@ package com.apache.eventmesh.admin.server; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.eventmesh.common.Constants; -import org.apache.eventmesh.common.remote.request.ReportHeartBeatRequest; +import org.apache.eventmesh.common.config.CommonConfiguration; +import org.apache.eventmesh.common.config.ConfigService; import org.apache.eventmesh.common.remote.Task; +import org.apache.eventmesh.common.remote.exception.ErrorCode; +import org.apache.eventmesh.common.remote.request.ReportHeartBeatRequest; import org.apache.eventmesh.common.utils.IPUtils; import org.apache.eventmesh.common.utils.PagedList; import org.apache.eventmesh.registry.RegisterServerInfo; +import org.apache.eventmesh.registry.RegistryFactory; import org.apache.eventmesh.registry.RegistryService; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; -public class AdminServer implements Admin { +@Service +@Slf4j +public class AdminServer implements Admin, ApplicationListener { private final RegistryService registryService; private final RegisterServerInfo adminServeInfo; - public AdminServer(RegistryService registryService, AdminServerProperties properties) { - this.registryService = registryService; + private final CommonConfiguration configuration; + + public AdminServer(AdminServerProperties properties) { + configuration = + ConfigService.getInstance().buildConfigInstance(CommonConfiguration.class); + if (configuration == null) { + throw new AdminServerException(ErrorCode.STARTUP_CONFIG_MISS, "common configuration file miss"); + } this.adminServeInfo = new RegisterServerInfo(); - adminServeInfo.setServiceName(Constants.ADMIN_SERVER_REGISTRY_NAME); + adminServeInfo.setHealth(true); adminServeInfo.setAddress(IPUtils.getLocalAddress() + ":" + properties.getPort()); + String name = Constants.ADMIN_SERVER_REGISTRY_NAME; + if (StringUtils.isNotBlank(properties.getServiceName())) { + name = properties.getServiceName(); + } + adminServeInfo.setServiceName(name); + registryService = RegistryFactory.getInstance(configuration.getEventMeshRegistryPluginType()); } @@ -49,13 +74,24 @@ public void reportHeartbeat(ReportHeartBeatRequest heartBeat) { } @Override + @PostConstruct public void start() { - registryService.register(adminServeInfo); + + registryService.init(); } @Override public void destroy() { registryService.unRegister(adminServeInfo); + try { + Thread.sleep(3000); + }catch (InterruptedException ignore){} registryService.shutdown(); } + + @Override + public void onApplicationEvent(ApplicationReadyEvent event) { + log.info("application is started, it's will register admin self"); + registryService.register(adminServeInfo); + } } diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerProperties.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerProperties.java index 15ffc55cc4..ec507d5994 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerProperties.java +++ b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerProperties.java @@ -9,5 +9,8 @@ @Setter public class AdminServerProperties { private int port; - private boolean enable; + private boolean enableSSL; + private String configurationPath; + private String configurationFile; + private String serviceName; } diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ExampleAdminServer.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ExampleAdminServer.java index c9b5600638..51e2e10381 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ExampleAdminServer.java +++ b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ExampleAdminServer.java @@ -1,11 +1,14 @@ package com.apache.eventmesh.admin.server; +import com.apache.eventmesh.admin.server.constatns.AdminServerConstants; +import org.apache.eventmesh.common.config.ConfigService; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class ExampleAdminServer { - public static void main(String[] args) { + public static void main(String[] args) throws Exception { + ConfigService.getInstance().setConfigPath(AdminServerConstants.EVENTMESH_CONF_HOME).setRootConfig(AdminServerConstants.EVENTMESH_CONF_FILE); SpringApplication.run(ExampleAdminServer.class); } } diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/constatns/AdminServerConstants.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/constatns/AdminServerConstants.java new file mode 100644 index 0000000000..d3c01fedc9 --- /dev/null +++ b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/constatns/AdminServerConstants.java @@ -0,0 +1,9 @@ +package com.apache.eventmesh.admin.server.constatns; + +public class AdminServerConstants { + public static final String CONF_ENV = "configurationPath"; + + public static final String EVENTMESH_CONF_HOME = System.getProperty(CONF_ENV, System.getenv(CONF_ENV)); + + public static final String EVENTMESH_CONF_FILE = "eventmesh-admin.properties"; +} diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java index 0c4053d9bd..1a1ccb17b7 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java +++ b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java @@ -24,7 +24,7 @@ public class GrpcServer extends BaseServer { @Override public void start() throws Exception { NettyServerBuilder serverBuilder = NettyServerBuilder.forPort(getPort()).addService(adminGrpcServer); - if (properties.isEnable()) { + if (properties.isEnableSSL()) { serverBuilder.sslContext(null); } server = serverBuilder.build(); @@ -41,7 +41,7 @@ public void destroy() { server.shutdownNow(); } } - } catch (Exception e) { + } catch (InterruptedException e) { log.warn("destroy [{}] server fail", this.getClass().getSimpleName(), e); } } diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/position/impl/MysqlReportPositionHandler.java b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/position/impl/MysqlReportPositionHandler.java index f32f0f1454..5dff0454cd 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/position/impl/MysqlReportPositionHandler.java +++ b/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/position/impl/MysqlReportPositionHandler.java @@ -96,9 +96,7 @@ public FetchPositionResponse handler(FetchPositionRequest request, Metadata meta offset.setOffset(position.getPosition()); RecordPosition recordPosition = new RecordPosition(); recordPosition.setRecordPartition(partition); - recordPosition.setRecordPartitionClazz(partition.getClass()); recordPosition.setRecordOffset(offset); - recordPosition.setRecordOffsetClazz(offset.getClass()); response.setRecordPosition(recordPosition); } return response; diff --git a/eventmesh-admin-server/src/main/resources/application.yaml b/eventmesh-admin-server/src/main/resources/application.yaml index 2b450e485c..bc5241301d 100644 --- a/eventmesh-admin-server/src/main/resources/application.yaml +++ b/eventmesh-admin-server/src/main/resources/application.yaml @@ -11,4 +11,5 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl event-mesh: admin-server: + service-name: DEFAULT_GROUP@@em_adm_server port: 8081 \ No newline at end of file diff --git a/eventmesh-admin-server/src/main/resources/eventmesh-admin.properties b/eventmesh-admin-server/src/main/resources/eventmesh-admin.properties new file mode 100644 index 0000000000..ceb1f59b3b --- /dev/null +++ b/eventmesh-admin-server/src/main/resources/eventmesh-admin.properties @@ -0,0 +1,2 @@ +eventMesh.server.retry.plugin.type=nacos +eventMesh.registry.plugin.server-addr=localhost:8848 diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java index 7ca23ab440..97286f0968 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java @@ -206,5 +206,5 @@ public class Constants { public static final String DEFAULT = "default"; - public static final String ADMIN_SERVER_REGISTRY_NAME = "em_adm_server@@DEFAULT_GROUP"; + public static final String ADMIN_SERVER_REGISTRY_NAME = "DEFAULT_GROUP@@em_adm_server"; } diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigService.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigService.java index 7c5b17d7e6..07bdb63993 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigService.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigService.java @@ -17,9 +17,9 @@ package org.apache.eventmesh.common.config; -import static org.apache.eventmesh.common.utils.ReflectUtils.lookUpFieldByParentClass; - +import lombok.Getter; import org.apache.commons.lang3.StringUtils; +import org.assertj.core.util.Strings; import java.io.File; import java.io.IOException; @@ -29,9 +29,7 @@ import java.util.Objects; import java.util.Properties; -import org.assertj.core.util.Strings; - -import lombok.Getter; +import static org.apache.eventmesh.common.utils.ReflectUtils.lookUpFieldByParentClass; public class ConfigService { @@ -60,6 +58,9 @@ private ConfigService() { } public ConfigService setConfigPath(String configPath) { + if (StringUtils.isNotBlank(configPath) && !configPath.endsWith(File.separator)) { + configPath = configPath + File.separator; + } this.configPath = configPath; return this; } diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/exception/ErrorCode.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/exception/ErrorCode.java index 8c5309be26..73f29d9bf6 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/exception/ErrorCode.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/exception/ErrorCode.java @@ -6,4 +6,5 @@ public class ErrorCode { public static final int BAD_DB_DATA = 4002; public static final int INTERNAL_ERR = 5000; + public static final int STARTUP_CONFIG_MISS = 5001; } diff --git a/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/MockRecordOffset.java b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/MockRecordOffset.java new file mode 100644 index 0000000000..4331774ab1 --- /dev/null +++ b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/MockRecordOffset.java @@ -0,0 +1,10 @@ +package org.apache.eventmesh.connector.wecom.connector; + +import org.apache.eventmesh.common.remote.offset.RecordOffset; + +public class MockRecordOffset extends RecordOffset { + @Override + public Class getRecordOffsetClass() { + return MockRecordOffset.class; + } +} diff --git a/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/MockRecordPartition.java b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/MockRecordPartition.java new file mode 100644 index 0000000000..d11e5cb00a --- /dev/null +++ b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/MockRecordPartition.java @@ -0,0 +1,10 @@ +package org.apache.eventmesh.connector.wecom.connector; + +import org.apache.eventmesh.common.remote.offset.RecordPartition; + +public class MockRecordPartition extends RecordPartition { + @Override + public Class getRecordPartitionClass() { + return MockRecordPartition.class; + } +} diff --git a/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java index b612615569..e78e089035 100644 --- a/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java +++ b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java @@ -17,10 +17,6 @@ package org.apache.eventmesh.connector.wecom.connector; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import org.apache.eventmesh.common.config.connector.wecom.WeComSinkConfig; import org.apache.eventmesh.common.remote.offset.RecordOffset; import org.apache.eventmesh.common.remote.offset.RecordPartition; @@ -31,20 +27,11 @@ import org.apache.eventmesh.connector.wecom.sink.connector.WeComSinkConnector; import org.apache.eventmesh.openconnect.offsetmgmt.api.data.ConnectRecord; import org.apache.eventmesh.openconnect.util.ConfigUtil; - import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -56,6 +43,17 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import java.io.IOException; +import java.lang.reflect.Field; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + @ExtendWith(MockitoExtension.class) public class WeComSinkConnectorTest { @@ -89,8 +87,8 @@ public void testSendMessageToWeCom() throws IOException { final int times = 3; List records = new ArrayList<>(); for (int i = 0; i < times; i++) { - RecordPartition partition = new RecordPartition(); - RecordOffset offset = new RecordOffset(); + RecordPartition partition = new MockRecordPartition(); + RecordOffset offset = new MockRecordOffset(); ConnectRecord connectRecord = new ConnectRecord(partition, offset, System.currentTimeMillis(), "Hello, EventMesh!".getBytes(StandardCharsets.UTF_8)); connectRecord.addExtension(ConnectRecordExtensionKeys.WECOM_MESSAGE_TEMPLATE_TYPE, diff --git a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/data/ConnectRecord.java b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/data/ConnectRecord.java index 145531238e..14dc17e74e 100644 --- a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/data/ConnectRecord.java +++ b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/data/ConnectRecord.java @@ -49,12 +49,6 @@ public ConnectRecord(RecordPartition recordPartition, RecordOffset recordOffset, public ConnectRecord(RecordPartition recordPartition, RecordOffset recordOffset, Long timestamp, Object data) { this.position = new RecordPosition(recordPartition, recordOffset); - if (recordPartition != null) { - this.position.setRecordPartitionClazz(recordPartition.getRecordPartitionClass()); - } - if (recordOffset != null) { - this.position.setRecordOffsetClazz(recordOffset.getRecordOffsetClass()); - } this.timestamp = timestamp; this.data = data; } diff --git a/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryFactory.java b/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryFactory.java index bd6d37e047..ff135b0b22 100644 --- a/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryFactory.java +++ b/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryFactory.java @@ -21,7 +21,8 @@ private static RegistryService registryBuilder(String registryPluginType) { log.error(errorMsg); throw new RuntimeException(errorMsg); } - + log.info("build registry plugin [{}] by type [{}] success", registryServiceExt.getClass().getSimpleName(), + registryPluginType); return registryServiceExt; } } diff --git a/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryService.java b/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryService.java index f549e136dc..72536a08b4 100644 --- a/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryService.java +++ b/eventmesh-registry/eventmesh-registry-api/src/main/java/org/apache/eventmesh/registry/RegistryService.java @@ -9,7 +9,6 @@ @EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.REGISTRY) public interface RegistryService { - String ConfigurationKey = "registry"; void init() throws RegistryException; void shutdown() throws RegistryException; diff --git a/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosDiscoveryService.java b/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosDiscoveryService.java index fdd58af089..13b75df614 100644 --- a/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosDiscoveryService.java +++ b/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosDiscoveryService.java @@ -12,13 +12,9 @@ import com.alibaba.nacos.api.naming.pojo.ServiceInfo; import com.alibaba.nacos.api.naming.utils.NamingUtils; import com.alibaba.nacos.client.naming.utils.UtilAndComs; - import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang3.StringUtils; -import org.apache.eventmesh.common.config.CommonConfiguration; import org.apache.eventmesh.common.config.ConfigService; -import org.apache.eventmesh.common.utils.ConfigurationContextUtil; import org.apache.eventmesh.registry.NotifyEvent; import org.apache.eventmesh.registry.QueryInstances; import org.apache.eventmesh.registry.RegisterServerInfo; @@ -48,8 +44,6 @@ public class NacosDiscoveryService implements RegistryService { private final AtomicBoolean initFlag = new AtomicBoolean(false); - private CommonConfiguration configuration; - private NacosRegistryConfiguration nacosConf; private NamingService namingService; @@ -73,10 +67,6 @@ public void init() throws RegistryException { if (!initFlag.compareAndSet(false, true)) { return; } - configuration = ConfigurationContextUtil.get(RegistryService.ConfigurationKey); - if (configuration == null) { - throw new RegistryException("registry config instance is null"); - } nacosConf = ConfigService.getInstance().buildConfigInstance(NacosRegistryConfiguration.class); if (nacosConf == null) { log.info("nacos registry configuration is null"); @@ -93,12 +83,13 @@ public void init() throws RegistryException { private Properties buildProperties() { Properties properties = new Properties(); - properties.setProperty(PropertyKeyConst.SERVER_ADDR, configuration.getRegistryAddr()); - properties.setProperty(PropertyKeyConst.USERNAME, configuration.getEventMeshRegistryPluginUsername()); - properties.setProperty(PropertyKeyConst.PASSWORD, configuration.getEventMeshRegistryPluginPassword()); if (nacosConf == null) { return properties; } + properties.setProperty(PropertyKeyConst.SERVER_ADDR, nacosConf.getRegistryAddr()); + properties.setProperty(PropertyKeyConst.USERNAME, nacosConf.getEventMeshRegistryPluginUsername()); + properties.setProperty(PropertyKeyConst.PASSWORD, nacosConf.getEventMeshRegistryPluginPassword()); + String endpoint = nacosConf.getEndpoint(); if (Objects.nonNull(endpoint) && endpoint.contains(":")) { int index = endpoint.indexOf(":"); diff --git a/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosRegistryConfiguration.java b/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosRegistryConfiguration.java index bdaf3e4835..ffb446edd4 100644 --- a/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosRegistryConfiguration.java +++ b/eventmesh-registry/eventmesh-registry-nacos/src/main/java/org/apache/eventmesh/registry/nacos/NacosRegistryConfiguration.java @@ -21,13 +21,14 @@ import com.alibaba.nacos.client.naming.utils.UtilAndComs; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.eventmesh.common.config.CommonConfiguration; import org.apache.eventmesh.common.config.Config; import org.apache.eventmesh.common.config.ConfigField; @Data @NoArgsConstructor @Config(prefix = "eventMesh.registry.nacos") -public class NacosRegistryConfiguration { +public class NacosRegistryConfiguration extends CommonConfiguration { @ConfigField(field = PropertyKeyConst.ENDPOINT) private String endpoint; diff --git a/eventmesh-registry/eventmesh-registry-nacos/src/main/resources/META-INF.eventmesh/com.apache.eventmesh.admin.server.registry.RegistryService b/eventmesh-registry/eventmesh-registry-nacos/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.registry.RegistryService similarity index 91% rename from eventmesh-registry/eventmesh-registry-nacos/src/main/resources/META-INF.eventmesh/com.apache.eventmesh.admin.server.registry.RegistryService rename to eventmesh-registry/eventmesh-registry-nacos/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.registry.RegistryService index 656fec8f37..3301d56e5e 100644 --- a/eventmesh-registry/eventmesh-registry-nacos/src/main/resources/META-INF.eventmesh/com.apache.eventmesh.admin.server.registry.RegistryService +++ b/eventmesh-registry/eventmesh-registry-nacos/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.registry.RegistryService @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -nacos=com.apache.eventmesh.admin.server.registry.NacosDiscoveryService \ No newline at end of file +nacos=org.apache.eventmesh.registry.nacos.NacosDiscoveryService \ No newline at end of file