From 78b7853fa906c9f48a90dfe45f3f6516ab9355e7 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Mon, 20 Sep 2021 16:31:55 +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 --- basic-util/pom.xml | 5 ----- common/pom.xml | 5 +++++ .../common}/remote/rest/handler/RestRemoteHandler.java | 10 +++------- .../common}/remote/rest/proxy/RestRemoteProxy.java | 4 ++-- .../common}/remote/rest/request/RestRemoteRequest.java | 2 +- .../remote/rest/scanner/RemoteRestFactoryBean.java | 4 ++-- .../common}/remote/rest/scanner/RemoteRestScanner.java | 2 +- .../rest/scanner/RemoteRestScannerConfiguration.java | 2 +- 8 files changed, 15 insertions(+), 19 deletions(-) rename {basic-util/src/main/java/ink/wgink/util => common/src/main/java/ink/wgink/common}/remote/rest/handler/RestRemoteHandler.java (96%) rename {basic-util/src/main/java/ink/wgink/util => common/src/main/java/ink/wgink/common}/remote/rest/proxy/RestRemoteProxy.java (81%) rename {basic-util/src/main/java/ink/wgink/util => common/src/main/java/ink/wgink/common}/remote/rest/request/RestRemoteRequest.java (99%) rename {basic-util/src/main/java/ink/wgink/util => common/src/main/java/ink/wgink/common}/remote/rest/scanner/RemoteRestFactoryBean.java (90%) rename {basic-util/src/main/java/ink/wgink/util => common/src/main/java/ink/wgink/common}/remote/rest/scanner/RemoteRestScanner.java (97%) rename {basic-util/src/main/java/ink/wgink/util => common/src/main/java/ink/wgink/common}/remote/rest/scanner/RemoteRestScannerConfiguration.java (96%) diff --git a/basic-util/pom.xml b/basic-util/pom.xml index daa6a00a..fde7105e 100644 --- a/basic-util/pom.xml +++ b/basic-util/pom.xml @@ -151,11 +151,6 @@ basic-pojo 1.0-SNAPSHOT - - ink.wgink - basic-properties - 1.0-SNAPSHOT - diff --git a/common/pom.xml b/common/pom.xml index f59a487d..26fe3f9c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,6 +22,11 @@ basic-util 1.0-SNAPSHOT + + ink.wgink + basic-properties + 1.0-SNAPSHOT + diff --git a/basic-util/src/main/java/ink/wgink/util/remote/rest/handler/RestRemoteHandler.java b/common/src/main/java/ink/wgink/common/remote/rest/handler/RestRemoteHandler.java similarity index 96% rename from basic-util/src/main/java/ink/wgink/util/remote/rest/handler/RestRemoteHandler.java rename to common/src/main/java/ink/wgink/common/remote/rest/handler/RestRemoteHandler.java index 8f2095d0..90a93288 100644 --- a/basic-util/src/main/java/ink/wgink/util/remote/rest/handler/RestRemoteHandler.java +++ b/common/src/main/java/ink/wgink/common/remote/rest/handler/RestRemoteHandler.java @@ -1,18 +1,14 @@ -package ink.wgink.util.remote.rest.handler; +package ink.wgink.common.remote.rest.handler; -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.RemoteHeaderParams; -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.remote.rest.params.*; +import ink.wgink.common.remote.rest.request.RestRemoteRequest; import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.base.SystemException; import ink.wgink.util.RegexUtil; -import ink.wgink.util.remote.rest.request.RestRemoteRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/basic-util/src/main/java/ink/wgink/util/remote/rest/proxy/RestRemoteProxy.java b/common/src/main/java/ink/wgink/common/remote/rest/proxy/RestRemoteProxy.java similarity index 81% rename from basic-util/src/main/java/ink/wgink/util/remote/rest/proxy/RestRemoteProxy.java rename to common/src/main/java/ink/wgink/common/remote/rest/proxy/RestRemoteProxy.java index dab6be19..0c71769c 100644 --- a/basic-util/src/main/java/ink/wgink/util/remote/rest/proxy/RestRemoteProxy.java +++ b/common/src/main/java/ink/wgink/common/remote/rest/proxy/RestRemoteProxy.java @@ -1,6 +1,6 @@ -package ink.wgink.util.remote.rest.proxy; +package ink.wgink.common.remote.rest.proxy; -import ink.wgink.util.remote.rest.handler.RestRemoteHandler; +import ink.wgink.common.remote.rest.handler.RestRemoteHandler; import java.lang.reflect.Proxy; diff --git a/basic-util/src/main/java/ink/wgink/util/remote/rest/request/RestRemoteRequest.java b/common/src/main/java/ink/wgink/common/remote/rest/request/RestRemoteRequest.java similarity index 99% rename from basic-util/src/main/java/ink/wgink/util/remote/rest/request/RestRemoteRequest.java rename to common/src/main/java/ink/wgink/common/remote/rest/request/RestRemoteRequest.java index 121f3005..2421ffa2 100644 --- a/basic-util/src/main/java/ink/wgink/util/remote/rest/request/RestRemoteRequest.java +++ b/common/src/main/java/ink/wgink/common/remote/rest/request/RestRemoteRequest.java @@ -1,4 +1,4 @@ -package ink.wgink.util.remote.rest.request; +package ink.wgink.common.remote.rest.request; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestFactoryBean.java b/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestFactoryBean.java similarity index 90% rename from basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestFactoryBean.java rename to common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestFactoryBean.java index 6afe14e8..f2123548 100644 --- a/basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestFactoryBean.java +++ b/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestFactoryBean.java @@ -1,6 +1,6 @@ -package ink.wgink.util.remote.rest.scanner; +package ink.wgink.common.remote.rest.scanner; -import ink.wgink.util.remote.rest.proxy.RestRemoteProxy; +import ink.wgink.common.remote.rest.proxy.RestRemoteProxy; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestScanner.java b/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScanner.java similarity index 97% rename from basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestScanner.java rename to common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScanner.java index 12e73df7..e0b253fa 100644 --- a/basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestScanner.java +++ b/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScanner.java @@ -1,4 +1,4 @@ -package ink.wgink.util.remote.rest.scanner; +package ink.wgink.common.remote.rest.scanner; import ink.wgink.annotation.remote.rest.RemoteService; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; diff --git a/basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestScannerConfiguration.java b/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScannerConfiguration.java similarity index 96% rename from basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestScannerConfiguration.java rename to common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScannerConfiguration.java index b2ea770b..e317cabf 100644 --- a/basic-util/src/main/java/ink/wgink/util/remote/rest/scanner/RemoteRestScannerConfiguration.java +++ b/common/src/main/java/ink/wgink/common/remote/rest/scanner/RemoteRestScannerConfiguration.java @@ -1,4 +1,4 @@ -package ink.wgink.util.remote.rest.scanner; +package ink.wgink.common.remote.rest.scanner; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor;