diff --git a/common/src/main/java/ink/wgink/common/remote/rest/handler/RestRemoteHandler.java b/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java similarity index 99% rename from common/src/main/java/ink/wgink/common/remote/rest/handler/RestRemoteHandler.java rename to common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java index 90a93288..700eeba2 100644 --- a/common/src/main/java/ink/wgink/common/remote/rest/handler/RestRemoteHandler.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java @@ -1,11 +1,11 @@ -package ink.wgink.common.remote.rest.handler; +package ink.wgink.common.rpc.rest.handler; import ink.wgink.annotation.remote.rest.method.RemoteDeleteMethod; import ink.wgink.annotation.remote.rest.method.RemoteGetMethod; import ink.wgink.annotation.remote.rest.method.RemotePostMethod; import ink.wgink.annotation.remote.rest.method.RemotePutMethod; import ink.wgink.annotation.remote.rest.params.*; -import ink.wgink.common.remote.rest.request.RestRemoteRequest; +import ink.wgink.common.rpc.rest.request.RestRemoteRequest; import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.base.SystemException; import ink.wgink.util.RegexUtil; diff --git a/common/src/main/java/ink/wgink/common/remote/rest/proxy/RestRemoteProxy.java b/common/src/main/java/ink/wgink/common/rpc/rest/proxy/RestRemoteProxy.java similarity index 81% rename from common/src/main/java/ink/wgink/common/remote/rest/proxy/RestRemoteProxy.java rename to common/src/main/java/ink/wgink/common/rpc/rest/proxy/RestRemoteProxy.java index 0c71769c..f9bbb789 100644 --- a/common/src/main/java/ink/wgink/common/remote/rest/proxy/RestRemoteProxy.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/proxy/RestRemoteProxy.java @@ -1,6 +1,6 @@ -package ink.wgink.common.remote.rest.proxy; +package ink.wgink.common.rpc.rest.proxy; -import ink.wgink.common.remote.rest.handler.RestRemoteHandler; +import ink.wgink.common.rpc.rest.handler.RestRemoteHandler; import java.lang.reflect.Proxy; diff --git a/common/src/main/java/ink/wgink/common/remote/rest/request/RestRemoteRequest.java b/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java similarity index 99% rename from common/src/main/java/ink/wgink/common/remote/rest/request/RestRemoteRequest.java rename to common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java index 2421ffa2..fb7bb042 100644 --- a/common/src/main/java/ink/wgink/common/remote/rest/request/RestRemoteRequest.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java @@ -1,4 +1,4 @@ -package ink.wgink.common.remote.rest.request; +package ink.wgink.common.rpc.rest.request; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestFactoryBean.java b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestFactoryBean.java similarity index 90% rename from common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestFactoryBean.java rename to common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestFactoryBean.java index f2123548..dae7319d 100644 --- a/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestFactoryBean.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestFactoryBean.java @@ -1,6 +1,6 @@ -package ink.wgink.common.remote.rest.scanner; +package ink.wgink.common.rpc.rest.scanner; -import ink.wgink.common.remote.rest.proxy.RestRemoteProxy; +import ink.wgink.common.rpc.rest.proxy.RestRemoteProxy; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScanner.java b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScanner.java similarity index 97% rename from common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScanner.java rename to common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScanner.java index e0b253fa..0b89b57c 100644 --- a/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScanner.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScanner.java @@ -1,4 +1,4 @@ -package ink.wgink.common.remote.rest.scanner; +package ink.wgink.common.rpc.rest.scanner; import ink.wgink.annotation.remote.rest.RemoteService; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; diff --git a/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScannerConfiguration.java b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScannerComponent.java similarity index 86% rename from common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScannerConfiguration.java rename to common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScannerComponent.java index e317cabf..214b5eea 100644 --- a/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScannerConfiguration.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScannerComponent.java @@ -1,4 +1,4 @@ -package ink.wgink.common.remote.rest.scanner; +package ink.wgink.common.rpc.rest.scanner; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; * @Version: 1.0 */ @Component -public class RemoteRestScannerConfiguration implements BeanFactoryPostProcessor, ApplicationContextAware { +public class RemoteRestScannerComponent implements BeanFactoryPostProcessor, ApplicationContextAware { private ApplicationContext applicationContext; @@ -26,7 +26,7 @@ public class RemoteRestScannerConfiguration implements BeanFactoryPostProcessor, public void postProcessBeanFactory(ConfigurableListableBeanFactory configurableListableBeanFactory) throws BeansException { RemoteRestScanner scanner = new RemoteRestScanner((BeanDefinitionRegistry) configurableListableBeanFactory); scanner.setResourceLoader(this.applicationContext); - scanner.scan("**.remote"); + scanner.scan("**.rpc"); } @Override