From af77f24f68bfcbdb922499fac1761a523e9d105e Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Mon, 20 Sep 2021 16:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=9C=E7=A8=8B=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{remote => rpc}/rest/RemoteService.java | 2 +- .../rest/method/RemoteDeleteMethod.java | 2 +- .../rest/method/RemoteGetMethod.java | 2 +- .../rest/method/RemotePostMethod.java | 2 +- .../rest/method/RemotePutMethod.java | 2 +- .../rest/params/RemoteHeaderParams.java | 2 +- .../rest/params/RemoteJsonBodyParams.java | 2 +- .../rest/params/RemotePathParams.java | 2 +- .../rest/params/RemoteQueryParams.java | 2 +- .../rest/params/RemoteServerParams.java | 2 +- .../RemoteRequestException.java | 2 +- .../RemoteResponseException.java | 2 +- .../rpc/rest/handler/RestRemoteHandler.java | 10 +++++----- .../rpc/rest/request/RestRemoteRequest.java | 4 ++-- .../rpc/rest/scanner/RemoteRestScanner.java | 2 +- .../src/test/java/RemoteTest.java | 18 +++++++++--------- 16 files changed, 29 insertions(+), 29 deletions(-) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/RemoteService.java (87%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/method/RemoteDeleteMethod.java (85%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/method/RemoteGetMethod.java (85%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/method/RemotePostMethod.java (85%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/method/RemotePutMethod.java (85%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/params/RemoteHeaderParams.java (86%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/params/RemoteJsonBodyParams.java (85%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/params/RemotePathParams.java (85%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/params/RemoteQueryParams.java (85%) rename basic-annotation/src/main/java/ink/wgink/annotation/{remote => rpc}/rest/params/RemoteServerParams.java (85%) rename basic-exception/src/main/java/ink/wgink/exceptions/{remote => rpc}/RemoteRequestException.java (95%) rename basic-exception/src/main/java/ink/wgink/exceptions/{remote => rpc}/RemoteResponseException.java (95%) rename {basic-util => common}/src/test/java/RemoteTest.java (85%) diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/RemoteService.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/RemoteService.java similarity index 87% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/RemoteService.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/RemoteService.java index 4f71fa34..0a1a4242 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/RemoteService.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/RemoteService.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest; +package ink.wgink.annotation.rpc.rest; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemoteDeleteMethod.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemoteDeleteMethod.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemoteDeleteMethod.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemoteDeleteMethod.java index ef721a39..c9b1c613 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemoteDeleteMethod.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemoteDeleteMethod.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.method; +package ink.wgink.annotation.rpc.rest.method; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemoteGetMethod.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemoteGetMethod.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemoteGetMethod.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemoteGetMethod.java index 2d5d869e..9d1e2668 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemoteGetMethod.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemoteGetMethod.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.method; +package ink.wgink.annotation.rpc.rest.method; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemotePostMethod.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemotePostMethod.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemotePostMethod.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemotePostMethod.java index 6ecd1b10..4e68d38f 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemotePostMethod.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemotePostMethod.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.method; +package ink.wgink.annotation.rpc.rest.method; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemotePutMethod.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemotePutMethod.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemotePutMethod.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemotePutMethod.java index f0cd0710..fa9f6047 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/method/RemotePutMethod.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/method/RemotePutMethod.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.method; +package ink.wgink.annotation.rpc.rest.method; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteHeaderParams.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteHeaderParams.java similarity index 86% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteHeaderParams.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteHeaderParams.java index f47c21fe..cf4096b8 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteHeaderParams.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteHeaderParams.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.params; +package ink.wgink.annotation.rpc.rest.params; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteJsonBodyParams.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteJsonBodyParams.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteJsonBodyParams.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteJsonBodyParams.java index 63ddb21e..e864c99a 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteJsonBodyParams.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteJsonBodyParams.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.params; +package ink.wgink.annotation.rpc.rest.params; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemotePathParams.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemotePathParams.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemotePathParams.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemotePathParams.java index 3cfd45aa..4ca11131 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemotePathParams.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemotePathParams.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.params; +package ink.wgink.annotation.rpc.rest.params; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteQueryParams.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteQueryParams.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteQueryParams.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteQueryParams.java index dddd3f75..c0e0eed2 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteQueryParams.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteQueryParams.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.params; +package ink.wgink.annotation.rpc.rest.params; import java.lang.annotation.*; diff --git a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteServerParams.java b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteServerParams.java similarity index 85% rename from basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteServerParams.java rename to basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteServerParams.java index 523d6c0f..23a5ac9d 100644 --- a/basic-annotation/src/main/java/ink/wgink/annotation/remote/rest/params/RemoteServerParams.java +++ b/basic-annotation/src/main/java/ink/wgink/annotation/rpc/rest/params/RemoteServerParams.java @@ -1,4 +1,4 @@ -package ink.wgink.annotation.remote.rest.params; +package ink.wgink.annotation.rpc.rest.params; import java.lang.annotation.*; diff --git a/basic-exception/src/main/java/ink/wgink/exceptions/remote/RemoteRequestException.java b/basic-exception/src/main/java/ink/wgink/exceptions/rpc/RemoteRequestException.java similarity index 95% rename from basic-exception/src/main/java/ink/wgink/exceptions/remote/RemoteRequestException.java rename to basic-exception/src/main/java/ink/wgink/exceptions/rpc/RemoteRequestException.java index 08e5a288..8949faf0 100644 --- a/basic-exception/src/main/java/ink/wgink/exceptions/remote/RemoteRequestException.java +++ b/basic-exception/src/main/java/ink/wgink/exceptions/rpc/RemoteRequestException.java @@ -1,4 +1,4 @@ -package ink.wgink.exceptions.remote; +package ink.wgink.exceptions.rpc; import ink.wgink.exceptions.base.SystemException; diff --git a/basic-exception/src/main/java/ink/wgink/exceptions/remote/RemoteResponseException.java b/basic-exception/src/main/java/ink/wgink/exceptions/rpc/RemoteResponseException.java similarity index 95% rename from basic-exception/src/main/java/ink/wgink/exceptions/remote/RemoteResponseException.java rename to basic-exception/src/main/java/ink/wgink/exceptions/rpc/RemoteResponseException.java index 03ac50ee..fe636b34 100644 --- a/basic-exception/src/main/java/ink/wgink/exceptions/remote/RemoteResponseException.java +++ b/basic-exception/src/main/java/ink/wgink/exceptions/rpc/RemoteResponseException.java @@ -1,4 +1,4 @@ -package ink.wgink.exceptions.remote; +package ink.wgink.exceptions.rpc; import ink.wgink.exceptions.base.SystemException; diff --git a/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java b/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java index 700eeba2..5d0b38b4 100644 --- a/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java @@ -1,10 +1,10 @@ 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.annotation.rpc.rest.method.RemoteDeleteMethod; +import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod; +import ink.wgink.annotation.rpc.rest.method.RemotePostMethod; +import ink.wgink.annotation.rpc.rest.method.RemotePutMethod; +import ink.wgink.annotation.rpc.rest.params.*; import ink.wgink.common.rpc.rest.request.RestRemoteRequest; import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.base.SystemException; diff --git a/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java b/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java index fb7bb042..b2e40a5b 100644 --- a/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java @@ -3,8 +3,8 @@ package ink.wgink.common.rpc.rest.request; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import ink.wgink.exceptions.ParamsException; -import ink.wgink.exceptions.remote.RemoteRequestException; -import ink.wgink.exceptions.remote.RemoteResponseException; +import ink.wgink.exceptions.rpc.RemoteRequestException; +import ink.wgink.exceptions.rpc.RemoteResponseException; import org.springframework.http.*; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScanner.java b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScanner.java index 0b89b57c..735f340f 100644 --- a/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScanner.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/scanner/RemoteRestScanner.java @@ -1,6 +1,6 @@ package ink.wgink.common.rpc.rest.scanner; -import ink.wgink.annotation.remote.rest.RemoteService; +import ink.wgink.annotation.rpc.rest.RemoteService; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; diff --git a/basic-util/src/test/java/RemoteTest.java b/common/src/test/java/RemoteTest.java similarity index 85% rename from basic-util/src/test/java/RemoteTest.java rename to common/src/test/java/RemoteTest.java index 6fe9877a..c6ebed94 100644 --- a/basic-util/src/test/java/RemoteTest.java +++ b/common/src/test/java/RemoteTest.java @@ -1,15 +1,15 @@ -import ink.wgink.annotation.remote.rest.params.RemoteServerParams; -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.RemoteJsonBodyParams; -import ink.wgink.annotation.remote.rest.params.RemotePathParams; -import ink.wgink.annotation.remote.rest.params.RemoteQueryParams; +import ink.wgink.annotation.rpc.rest.method.RemoteDeleteMethod; +import ink.wgink.annotation.rpc.rest.method.RemoteGetMethod; +import ink.wgink.annotation.rpc.rest.method.RemotePostMethod; +import ink.wgink.annotation.rpc.rest.method.RemotePutMethod; +import ink.wgink.annotation.rpc.rest.params.RemoteJsonBodyParams; +import ink.wgink.annotation.rpc.rest.params.RemotePathParams; +import ink.wgink.annotation.rpc.rest.params.RemoteQueryParams; +import ink.wgink.annotation.rpc.rest.params.RemoteServerParams; +import ink.wgink.common.rpc.rest.proxy.RestRemoteProxy; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.util.remote.rest.proxy.RestRemoteProxy; import java.util.ArrayList; import java.util.HashMap;