diff --git a/njzscloud-common/njzscloud-common-core/pom.xml b/njzscloud-common/njzscloud-common-core/pom.xml index 36bf9c3..1c62159 100644 --- a/njzscloud-common/njzscloud-common-core/pom.xml +++ b/njzscloud-common/njzscloud-common-core/pom.xml @@ -72,18 +72,6 @@ - - - cglib - cglib - - - - - com.squareup.okhttp3 - okhttp - - org.projectlombok diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java index 801a93c..691e3ac 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java @@ -4,7 +4,6 @@ package com.njzscloud.common.core.thread; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadFactory; @@ -115,7 +114,7 @@ public class ThreadPool { } @Override - public Thread newThread(@NotNull Runnable r) { + public Thread newThread(Runnable r) { String name = namePrefix + threadNumber.getAndIncrement(); log.debug("创建新线程：{}", name); Thread t = new Thread(r, name) { diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/Mime.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Mime.java similarity index 96% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/Mime.java rename to njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Mime.java index fa1ae79..62db987 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/Mime.java +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Mime.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.constant; +package com.njzscloud.common.core.utils; import cn.hutool.core.util.StrUtil; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/StrUtil.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/StrUtil.java new file mode 100644 index 0000000..4df6267 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/StrUtil.java @@ -0,0 +1,113 @@ +package com.njzscloud.common.core.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class StrUtil { + // 匹配非特殊字符的正则表达式，对应 TS 中的 [^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+ + private static final Pattern SPLIT_CHAR_PATTERN = Pattern.compile("[^\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\x7f]+"); + + // 匹配大写字母的正则表达式，用于分割单词 + private static final Pattern UPPER_CASE_PATTERN = Pattern.compile("([A-Z])"); + + /** + * 检查字符串是否为空 + */ + private static boolean isBlank(String str) { + return str == null || str.trim().isEmpty(); + } + + /** + * 首字母大写 + */ + private static String capitalize(String word) { + if (isBlank(word)) { + return word; + } + return Character.toUpperCase(word.charAt(0)) + + (word.length() > 1 ? word.substring(1).toLowerCase() : ""); + } + + /** + * 以大写字母为分割符，转换成其他分隔符 + */ + public static String processWords(String str, WordJoiner joiner) { + if (isBlank(str)) { + return ""; + } + + // 处理字符串：在大写字母前添加分隔符，然后转为小写 + String processed = UPPER_CASE_PATTERN.matcher(str).replaceAll(" $1").toLowerCase(); + + // 提取匹配的单词 + Matcher matcher = SPLIT_CHAR_PATTERN.matcher(processed); + List words = new ArrayList<>(); + while (matcher.find()) { + words.add(matcher.group().trim()); + } + + // 使用 joiner 连接单词 + StringBuilder result = new StringBuilder(); + for (int i = 0; i < words.size(); i++) { + result.append(joiner.join(words.get(i), i)); + } + return result.toString(); + } + + /** + * 小驼峰命名 (camelCase) + */ + public static String camelCase(String str) { + return processWords(str, (word, index) -> { + if (index == 0) { + return word; + } else { + return capitalize(word); + } + }); + } + + /** + * 大驼峰命名 (PascalCase) + */ + public static String pascalCase(String str) { + String camel = camelCase(str); + return capitalize(camel); + } + + /** + * 下划线命名 (snake_case) + */ + public static String snakeCase(String str) { + return processWords(str, (word, index) -> { + if (index == 0) { + return word; + } else { + return "_" + word; + } + }); + } + + /** + * 中横杠命名 (kebab-case) + */ + public static String kebabCase(String str) { + return processWords(str, (word, index) -> { + if (index == 0) { + return word; + } else { + return "-" + word; + } + }); + } + + /** + * 函数式接口，用于处理单词连接 + */ + @FunctionalInterface + public interface WordJoiner { + String join(String word, int index); + } +} diff --git a/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java b/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java index 6b187d5..2ed60e1 100644 --- a/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java +++ b/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java @@ -2,8 +2,8 @@ package com.njzscloud.common.email; import cn.hutool.core.lang.Assert; import com.njzscloud.common.core.ex.Exceptions; -import com.njzscloud.common.core.http.constant.Mime; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.utils.Mime; import lombok.Getter; import javax.mail.util.ByteArrayDataSource; diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/TplController.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/TplController.java index 934de3e..1c1df11 100644 --- a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/TplController.java +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/TplController.java @@ -1,6 +1,6 @@ package com.njzscloud.common.gen; -import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.utils.Mime; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.gen.support.Generator; import com.njzscloud.common.mp.support.PageParam; diff --git a/njzscloud-common/njzscloud-common-http/pom.xml b/njzscloud-common/njzscloud-common-http/pom.xml new file mode 100644 index 0000000..76ba9e5 --- /dev/null +++ b/njzscloud-common/njzscloud-common-http/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + njzscloud-common-http + jar + + + + com.njzscloud + njzscloud-common-core + provided + + + + + cglib + cglib + + + + + com.squareup.okhttp3 + okhttp + + + diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClient.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/HttpClient.java similarity index 97% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClient.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/HttpClient.java index 518ceed..76ee075 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClient.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/HttpClient.java @@ -1,9 +1,10 @@ -package com.njzscloud.common.core.http; +package com.njzscloud.common.http; import cn.hutool.core.collection.CollUtil; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.support.ResponseInfo; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.http.config.HttpClientProperties; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.support.ResponseInfo; import lombok.extern.slf4j.Slf4j; import okhttp3.*; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientDecorator.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/HttpClientDecorator.java similarity index 86% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientDecorator.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/HttpClientDecorator.java index b8fd926..a8e250c 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientDecorator.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/HttpClientDecorator.java @@ -1,20 +1,23 @@ -package com.njzscloud.common.core.http; +package com.njzscloud.common.http; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.SimpleCache; import cn.hutool.core.util.ReflectUtil; -import com.njzscloud.common.core.http.annotation.GetEndpoint; -import com.njzscloud.common.core.http.annotation.PostEndpoint; -import com.njzscloud.common.core.http.annotation.RemoteServer; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.interceptor.RequestInterceptor; -import com.njzscloud.common.core.http.interceptor.ResponseInterceptor; -import com.njzscloud.common.core.http.resolver.*; -import com.njzscloud.common.core.http.support.RequestInfo; -import com.njzscloud.common.core.http.support.ResponseInfo; -import com.njzscloud.common.core.http.support.ResponseResult; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.http.annotation.GetEndpoint; +import com.njzscloud.common.http.annotation.PostEndpoint; +import com.njzscloud.common.http.annotation.RemoteServer; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.interceptor.RequestInterceptor; +import com.njzscloud.common.http.interceptor.ResponseInterceptor; +import com.njzscloud.common.http.resolver.*; +import com.njzscloud.common.http.support.RequestInfo; +import com.njzscloud.common.http.support.ResponseInfo; +import com.njzscloud.common.http.support.ResponseResult; import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; @@ -63,9 +66,16 @@ public class HttpClientDecorator { public MethodInterceptorImpl(Class clazz, HttpClient httpClient) { RemoteServer anno = clazz.getAnnotation(RemoteServer.class); - baseUrl = anno.value(); - Matcher matcher = ADDR_PATTERN.matcher(baseUrl); - Assert.isTrue(matcher.matches(), "地址不合法"); + String value = anno.value(); + if (value.startsWith("${") && value.endsWith("}")) { + value = SpringUtil.getProperty(value.substring(2, value.length() - 1)); + } + if (StrUtil.isBlank(value)) { + throw Exceptions.error("地址不合法"); + } + Matcher matcher = ADDR_PATTERN.matcher(value); + Assert.isTrue(matcher.matches(), () -> Exceptions.error("地址不合法")); + baseUrl = value; Class requestedInterceptorClazz = anno.requestInterceptor(); Class responseInterceptorClazz = anno.responseInterceptor(); requestInterceptor = ReflectUtil.newInstance(requestedInterceptorClazz); diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/BodyParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/BodyParam.java similarity index 71% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/BodyParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/BodyParam.java index 85c93b8..0c56aff 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/BodyParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/BodyParam.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.BodyParamProcessor; -import com.njzscloud.common.core.http.processor.DefaultBodyParamProcessor; +import com.njzscloud.common.http.processor.BodyParamProcessor; +import com.njzscloud.common.http.processor.DefaultBodyParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/FormBodyParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/FormBodyParam.java similarity index 84% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/FormBodyParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/FormBodyParam.java index da1a901..37db154 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/FormBodyParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/FormBodyParam.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.FormBodyParamProcessor; +import com.njzscloud.common.http.processor.FormBodyParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/GetEndpoint.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/GetEndpoint.java similarity index 90% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/GetEndpoint.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/GetEndpoint.java index 1772cd1..dd020fd 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/GetEndpoint.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/GetEndpoint.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/HeaderParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/HeaderParam.java similarity index 84% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/HeaderParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/HeaderParam.java index 41990f1..5c66a5b 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/HeaderParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/HeaderParam.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.DefaultHeaderParamProcessor; +import com.njzscloud.common.http.processor.DefaultHeaderParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/JsonBodyParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/JsonBodyParam.java similarity index 69% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/JsonBodyParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/JsonBodyParam.java index de470f2..3d90850 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/JsonBodyParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/JsonBodyParam.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.DefaultJsonBodyParamProcessor; -import com.njzscloud.common.core.http.processor.JsonBodyParamProcessor; +import com.njzscloud.common.http.processor.DefaultJsonBodyParamProcessor; +import com.njzscloud.common.http.processor.JsonBodyParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/MultiBodyParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/MultiBodyParam.java similarity index 85% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/MultiBodyParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/MultiBodyParam.java index 85b70b1..51d4bc5 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/MultiBodyParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/MultiBodyParam.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.MultiBodyParamProcessor; +import com.njzscloud.common.http.processor.MultiBodyParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PathParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/PathParam.java similarity index 77% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PathParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/PathParam.java index 47cfd04..a70d568 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PathParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/PathParam.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.DefaultPathParamProcessor; -import com.njzscloud.common.core.http.processor.PathParamProcessor; +import com.njzscloud.common.http.processor.DefaultPathParamProcessor; +import com.njzscloud.common.http.processor.PathParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PostEndpoint.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/PostEndpoint.java similarity index 90% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PostEndpoint.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/PostEndpoint.java index 394460f..b8e0590 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PostEndpoint.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/PostEndpoint.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/QueryParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/QueryParam.java similarity index 84% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/QueryParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/QueryParam.java index 43181f7..45b1b25 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/QueryParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/QueryParam.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.DefaultQueryParamProcessor; +import com.njzscloud.common.http.processor.DefaultQueryParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/RemoteServer.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/RemoteServer.java similarity index 76% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/RemoteServer.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/RemoteServer.java index 965a90c..8d437e3 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/RemoteServer.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/RemoteServer.java @@ -1,9 +1,9 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.interceptor.CompositeInterceptor; -import com.njzscloud.common.core.http.interceptor.RequestInterceptor; -import com.njzscloud.common.core.http.interceptor.ResponseInterceptor; +import com.njzscloud.common.http.interceptor.CompositeInterceptor; +import com.njzscloud.common.http.interceptor.RequestInterceptor; +import com.njzscloud.common.http.interceptor.ResponseInterceptor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -22,7 +22,7 @@ public @interface RemoteServer { * * @return String */ - String value(); + String value() default ""; /** * 请求拦截器, 在请求之前触发 diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/XmlBodyParam.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/XmlBodyParam.java similarity index 69% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/XmlBodyParam.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/XmlBodyParam.java index c0fb0e6..85b0f23 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/XmlBodyParam.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/annotation/XmlBodyParam.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.annotation; +package com.njzscloud.common.http.annotation; -import com.njzscloud.common.core.http.processor.DefaultXmlBodyParamProcessor; -import com.njzscloud.common.core.http.processor.XmlBodyParamProcessor; +import com.njzscloud.common.http.processor.DefaultXmlBodyParamProcessor; +import com.njzscloud.common.http.processor.XmlBodyParamProcessor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/HttpClientAutoConfiguration.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/config/HttpClientAutoConfiguration.java similarity index 75% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/HttpClientAutoConfiguration.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/config/HttpClientAutoConfiguration.java index 0cd6adc..09a407f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/HttpClientAutoConfiguration.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/config/HttpClientAutoConfiguration.java @@ -1,8 +1,7 @@ -package com.njzscloud.supervisory.config; +package com.njzscloud.common.http.config; -import com.njzscloud.common.core.http.HttpClient; -import com.njzscloud.common.core.http.HttpClientDecorator; -import com.njzscloud.common.core.http.HttpClientProperties; +import com.njzscloud.common.http.HttpClient; +import com.njzscloud.common.http.HttpClientDecorator; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientProperties.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/config/HttpClientProperties.java similarity index 97% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientProperties.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/config/HttpClientProperties.java index 64a8fc7..3552a3d 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientProperties.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/config/HttpClientProperties.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http; +package com.njzscloud.common.http.config; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/HttpMethod.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/constant/HttpMethod.java similarity index 70% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/HttpMethod.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/constant/HttpMethod.java index 232d6dc..ca349cf 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/HttpMethod.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/constant/HttpMethod.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.constant; +package com.njzscloud.common.http.constant; /** * HTTP 方法 diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/CompositeInterceptor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/CompositeInterceptor.java similarity index 83% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/CompositeInterceptor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/CompositeInterceptor.java index 11abf06..0810738 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/CompositeInterceptor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/CompositeInterceptor.java @@ -1,9 +1,9 @@ -package com.njzscloud.common.core.http.interceptor; +package com.njzscloud.common.http.interceptor; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.support.RequestInfo; -import com.njzscloud.common.core.http.support.ResponseInfo; import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.support.RequestInfo; +import com.njzscloud.common.http.support.ResponseInfo; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Type; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/RequestInterceptor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/RequestInterceptor.java similarity index 62% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/RequestInterceptor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/RequestInterceptor.java index f718c3a..713e435 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/RequestInterceptor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/RequestInterceptor.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.interceptor; +package com.njzscloud.common.http.interceptor; -import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.http.constant.HttpMethod; /** * 请求拦截器, 在请求之前触发, 可修改请求参数 diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/ResponseInterceptor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/ResponseInterceptor.java similarity index 64% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/ResponseInterceptor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/ResponseInterceptor.java index 7048514..6d0593e 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/ResponseInterceptor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/interceptor/ResponseInterceptor.java @@ -1,8 +1,8 @@ -package com.njzscloud.common.core.http.interceptor; +package com.njzscloud.common.http.interceptor; -import com.njzscloud.common.core.http.support.RequestInfo; -import com.njzscloud.common.core.http.support.ResponseInfo; +import com.njzscloud.common.http.support.RequestInfo; +import com.njzscloud.common.http.support.ResponseInfo; import java.lang.reflect.Type; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/BodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/BodyParamProcessor.java similarity index 56% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/BodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/BodyParamProcessor.java index 9d71fb6..b784205 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/BodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/BodyParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.BodyParam; +import com.njzscloud.common.http.annotation.BodyParam; public interface BodyParamProcessor { byte[] process(BodyParam bodyParam, String paramName, Class paramClazz, Object paramValue); diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultBodyParamProcessor.java similarity index 84% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultBodyParamProcessor.java index 700ea83..ef98eb9 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultBodyParamProcessor.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; import cn.hutool.core.util.ReflectUtil; -import com.njzscloud.common.core.http.annotation.BodyParam; +import com.njzscloud.common.http.annotation.BodyParam; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultFormBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultFormBodyParamProcessor.java similarity index 72% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultFormBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultFormBodyParamProcessor.java index 07b3aeb..cdc2b76 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultFormBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultFormBodyParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.FormBodyParam; +import com.njzscloud.common.http.annotation.FormBodyParam; import java.util.List; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultHeaderParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultHeaderParamProcessor.java similarity index 72% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultHeaderParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultHeaderParamProcessor.java index b9bd685..e4b49e2 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultHeaderParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultHeaderParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.HeaderParam; +import com.njzscloud.common.http.annotation.HeaderParam; import java.util.List; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultJsonBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultJsonBodyParamProcessor.java similarity index 73% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultJsonBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultJsonBodyParamProcessor.java index 9a2cedd..7ce19f0 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultJsonBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultJsonBodyParamProcessor.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.JsonBodyParam; import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.http.annotation.JsonBodyParam; public class DefaultJsonBodyParamProcessor implements JsonBodyParamProcessor { @Override diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultMultiBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultMultiBodyParamProcessor.java similarity index 74% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultMultiBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultMultiBodyParamProcessor.java index 43028b9..c104b88 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultMultiBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultMultiBodyParamProcessor.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.MultiBodyParam; import com.njzscloud.common.core.tuple.Tuple3; +import com.njzscloud.common.http.annotation.MultiBodyParam; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultPathParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultPathParamProcessor.java similarity index 69% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultPathParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultPathParamProcessor.java index cc470c4..aa9cecd 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultPathParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultPathParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.PathParam; +import com.njzscloud.common.http.annotation.PathParam; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultQueryParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultQueryParamProcessor.java similarity index 71% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultQueryParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultQueryParamProcessor.java index 0e4c979..5aa1494 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultQueryParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultQueryParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.QueryParam; +import com.njzscloud.common.http.annotation.QueryParam; import java.util.List; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultXmlBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultXmlBodyParamProcessor.java similarity index 73% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultXmlBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultXmlBodyParamProcessor.java index 3b996fc..021bf6a 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultXmlBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/DefaultXmlBodyParamProcessor.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.XmlBodyParam; import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.http.annotation.XmlBodyParam; public class DefaultXmlBodyParamProcessor implements XmlBodyParamProcessor { @Override diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/FormBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/FormBodyParamProcessor.java similarity index 66% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/FormBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/FormBodyParamProcessor.java index 9fcacb0..41cd6f6 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/FormBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/FormBodyParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.FormBodyParam; +import com.njzscloud.common.http.annotation.FormBodyParam; import java.util.List; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/HeaderParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/HeaderParamProcessor.java similarity index 66% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/HeaderParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/HeaderParamProcessor.java index eb5576e..f39e398 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/HeaderParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/HeaderParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.HeaderParam; +import com.njzscloud.common.http.annotation.HeaderParam; import java.util.List; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/JsonBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/JsonBodyParamProcessor.java similarity index 57% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/JsonBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/JsonBodyParamProcessor.java index 3fceb40..378e38a 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/JsonBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/JsonBodyParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.JsonBodyParam; +import com.njzscloud.common.http.annotation.JsonBodyParam; public interface JsonBodyParamProcessor { byte[] process(JsonBodyParam jsonBodyParam, String paramName, Class paramClazz, Object paramValue); diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/MultiBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/MultiBodyParamProcessor.java similarity index 70% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/MultiBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/MultiBodyParamProcessor.java index ee3801b..5975708 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/MultiBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/MultiBodyParamProcessor.java @@ -1,7 +1,7 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.MultiBodyParam; import com.njzscloud.common.core.tuple.Tuple3; +import com.njzscloud.common.http.annotation.MultiBodyParam; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/PathParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/PathParamProcessor.java similarity index 63% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/PathParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/PathParamProcessor.java index 7d05d5b..a6c0db2 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/PathParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/PathParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.PathParam; +import com.njzscloud.common.http.annotation.PathParam; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/QueryParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/QueryParamProcessor.java similarity index 66% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/QueryParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/QueryParamProcessor.java index bad3a65..1c52759 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/QueryParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/QueryParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.QueryParam; +import com.njzscloud.common.http.annotation.QueryParam; import java.util.List; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/XmlBodyParamProcessor.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/XmlBodyParamProcessor.java similarity index 57% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/XmlBodyParamProcessor.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/XmlBodyParamProcessor.java index d7ab83a..00cdd1f 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/XmlBodyParamProcessor.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/processor/XmlBodyParamProcessor.java @@ -1,6 +1,6 @@ -package com.njzscloud.common.core.http.processor; +package com.njzscloud.common.http.processor; -import com.njzscloud.common.core.http.annotation.XmlBodyParam; +import com.njzscloud.common.http.annotation.XmlBodyParam; public interface XmlBodyParamProcessor { byte[] process(XmlBodyParam xmlBodyParam, String paramName, Class paramClazz, Object paramValue); diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/BodyParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/BodyParamResolver.java similarity index 83% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/BodyParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/BodyParamResolver.java index f0745d1..4c6d733 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/BodyParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/BodyParamResolver.java @@ -1,11 +1,11 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.util.ReflectUtil; -import com.njzscloud.common.core.http.annotation.BodyParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.constant.Mime; -import com.njzscloud.common.core.http.processor.BodyParamProcessor; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.utils.Mime; +import com.njzscloud.common.http.annotation.BodyParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.BodyParamProcessor; public class BodyParamResolver extends ParamResolver> { byte[] result = null; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/FormBodyParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/FormBodyParamResolver.java similarity index 92% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/FormBodyParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/FormBodyParamResolver.java index 0a69414..d116dfd 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/FormBodyParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/FormBodyParamResolver.java @@ -1,12 +1,12 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.njzscloud.common.core.http.annotation.FormBodyParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.constant.Mime; -import com.njzscloud.common.core.http.processor.FormBodyParamProcessor; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.utils.Mime; +import com.njzscloud.common.http.annotation.FormBodyParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.FormBodyParamProcessor; import java.math.RoundingMode; import java.nio.charset.StandardCharsets; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/HeaderParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/HeaderParamResolver.java similarity index 92% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/HeaderParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/HeaderParamResolver.java index 7b0ce38..b03dc67 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/HeaderParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/HeaderParamResolver.java @@ -1,10 +1,10 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.njzscloud.common.core.http.annotation.HeaderParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.processor.DefaultHeaderParamProcessor; +import com.njzscloud.common.http.annotation.HeaderParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.DefaultHeaderParamProcessor; import java.math.RoundingMode; import java.util.*; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/JsonBodyParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/JsonBodyParamResolver.java similarity index 81% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/JsonBodyParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/JsonBodyParamResolver.java index d6a3c6c..04ed97e 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/JsonBodyParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/JsonBodyParamResolver.java @@ -1,11 +1,11 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.util.ReflectUtil; -import com.njzscloud.common.core.http.annotation.JsonBodyParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.constant.Mime; -import com.njzscloud.common.core.http.processor.JsonBodyParamProcessor; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.utils.Mime; +import com.njzscloud.common.http.annotation.JsonBodyParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.JsonBodyParamProcessor; public class JsonBodyParamResolver extends ParamResolver> { byte[] result = null; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/MultiBodyParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/MultiBodyParamResolver.java similarity index 94% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/MultiBodyParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/MultiBodyParamResolver.java index f29f737..7aa8292 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/MultiBodyParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/MultiBodyParamResolver.java @@ -1,16 +1,16 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; -import com.njzscloud.common.core.http.annotation.MultiBodyParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.constant.Mime; -import com.njzscloud.common.core.http.processor.MultiBodyParamProcessor; import com.njzscloud.common.core.tuple.Tuple2; import com.njzscloud.common.core.tuple.Tuple3; +import com.njzscloud.common.core.utils.Mime; +import com.njzscloud.common.http.annotation.MultiBodyParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.MultiBodyParamProcessor; import java.io.ByteArrayOutputStream; import java.math.RoundingMode; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/ParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/ParamResolver.java similarity index 98% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/ParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/ParamResolver.java index b9f6ddb..13f8000 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/ParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/ParamResolver.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; @@ -7,9 +7,9 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.njzscloud.common.core.http.constant.HttpMethod; import com.njzscloud.common.core.tuple.Tuple2; import com.njzscloud.common.core.tuple.Tuple3; +import com.njzscloud.common.http.constant.HttpMethod; import lombok.RequiredArgsConstructor; import java.io.File; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/PathParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/PathParamResolver.java similarity index 90% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/PathParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/PathParamResolver.java index 064b1d1..49e74d9 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/PathParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/PathParamResolver.java @@ -1,10 +1,10 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.njzscloud.common.core.http.annotation.PathParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.processor.PathParamProcessor; +import com.njzscloud.common.http.annotation.PathParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.PathParamProcessor; import java.math.RoundingMode; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/QueryParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/QueryParamResolver.java similarity index 93% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/QueryParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/QueryParamResolver.java index 15abff5..1203c87 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/QueryParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/QueryParamResolver.java @@ -1,10 +1,10 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.njzscloud.common.core.http.annotation.QueryParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.processor.DefaultQueryParamProcessor; +import com.njzscloud.common.http.annotation.QueryParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.DefaultQueryParamProcessor; import java.math.RoundingMode; import java.util.*; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/XmlBodyParamResolver.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/XmlBodyParamResolver.java similarity index 81% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/XmlBodyParamResolver.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/XmlBodyParamResolver.java index 64670d1..cd332e0 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/XmlBodyParamResolver.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/resolver/XmlBodyParamResolver.java @@ -1,11 +1,11 @@ -package com.njzscloud.common.core.http.resolver; +package com.njzscloud.common.http.resolver; import cn.hutool.core.util.ReflectUtil; -import com.njzscloud.common.core.http.annotation.XmlBodyParam; -import com.njzscloud.common.core.http.constant.HttpMethod; -import com.njzscloud.common.core.http.constant.Mime; -import com.njzscloud.common.core.http.processor.XmlBodyParamProcessor; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.utils.Mime; +import com.njzscloud.common.http.annotation.XmlBodyParam; +import com.njzscloud.common.http.constant.HttpMethod; +import com.njzscloud.common.http.processor.XmlBodyParamProcessor; public class XmlBodyParamResolver extends ParamResolver> { byte[] result = null; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ParameterInfo.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ParameterInfo.java similarity index 80% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ParameterInfo.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ParameterInfo.java index fcd7aae..e05bed1 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ParameterInfo.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ParameterInfo.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.support; +package com.njzscloud.common.http.support; import java.lang.annotation.Annotation; import java.util.List; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/RequestInfo.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/RequestInfo.java similarity index 89% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/RequestInfo.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/RequestInfo.java index 23009fc..bcbc80e 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/RequestInfo.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/RequestInfo.java @@ -1,8 +1,8 @@ -package com.njzscloud.common.core.http.support; +package com.njzscloud.common.http.support; import cn.hutool.core.map.MapUtil; -import com.njzscloud.common.core.http.constant.HttpMethod; import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.http.constant.HttpMethod; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseInfo.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ResponseInfo.java similarity index 95% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseInfo.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ResponseInfo.java index 0719f98..b62a6be 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseInfo.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ResponseInfo.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.support; +package com.njzscloud.common.http.support; import cn.hutool.core.map.MapUtil; diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseResult.java b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ResponseResult.java similarity index 97% rename from njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseResult.java rename to njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ResponseResult.java index 48a7a14..b5740e5 100644 --- a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseResult.java +++ b/njzscloud-common/njzscloud-common-http/src/main/java/com/njzscloud/common/http/support/ResponseResult.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.core.http.support; +package com.njzscloud.common.http.support; import java.util.List; import java.util.Map; diff --git a/njzscloud-common/njzscloud-common-http/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-http/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..838f593 --- /dev/null +++ b/njzscloud-common/njzscloud-common-http/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration = \ + com.njzscloud.common.http.config.HttpClientAutoConfiguration diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java index c24717a..17758df 100644 --- a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java +++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.njzscloud.common.core.jackson.Jackson; import lombok.extern.slf4j.Slf4j; import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload; -import org.jetbrains.annotations.NotNull; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; @@ -98,12 +97,12 @@ public class ReusableHttpServletRequest extends HttpServletRequestWrapper { } @Override - public int read(@NotNull byte[] b) throws IOException { + public int read(byte[] b) throws IOException { return bais.read(b); } @Override - public int read(@NotNull byte[] b, int off, int len) throws IOException { + public int read(byte[] b, int off, int len) throws IOException { return bais.read(b, off, len); } diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java index b03db1d..ed75035 100644 --- a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java +++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.njzscloud.common.redis.annotation.RedisListener; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; @@ -34,7 +33,7 @@ public class RedisListenerRegistrar implements ImportBeanDefinitionRegistrar, Re private Environment environment; @Override - public void registerBeanDefinitions(@NotNull AnnotationMetadata metadata, @NotNull BeanDefinitionRegistry registry) { + public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { LinkedHashSet candidateComponents = new LinkedHashSet<>(); AnnotationTypeFilter annotationTypeFilter = new AnnotationTypeFilter(RedisListener.class); @@ -92,7 +91,7 @@ public class RedisListenerRegistrar implements ImportBeanDefinitionRegistrar, Re protected ClassPathScanningCandidateComponentProvider getScanner() { return new ClassPathScanningCandidateComponentProvider(false, this.environment) { @Override - protected boolean isCandidateComponent(@NotNull AnnotatedBeanDefinition beanDefinition) { + protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) { return beanDefinition.getMetadata().isIndependent() && !beanDefinition.getMetadata().isAnnotation(); } }; diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java index 7222763..c12a759 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java @@ -2,8 +2,8 @@ package com.njzscloud.common.security.handler; import cn.hutool.extra.servlet.ServletUtil; import com.njzscloud.common.core.ex.ExceptionMsg; -import com.njzscloud.common.core.http.constant.Mime; import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.core.utils.Mime; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.security.ex.MissingPermissionException; import lombok.extern.slf4j.Slf4j; diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java index 3fe45e7..091733d 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java @@ -2,8 +2,8 @@ package com.njzscloud.common.security.handler; import cn.hutool.extra.servlet.ServletUtil; import com.njzscloud.common.core.ex.ExceptionMsg; -import com.njzscloud.common.core.http.constant.Mime; import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.core.utils.Mime; import com.njzscloud.common.core.utils.R; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java index 5c6c9b4..4279e22 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java @@ -2,8 +2,8 @@ package com.njzscloud.common.security.handler; import cn.hutool.extra.servlet.ServletUtil; import com.njzscloud.common.core.ex.ExceptionMsg; -import com.njzscloud.common.core.http.constant.Mime; import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.core.utils.Mime; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.security.contant.AuthWay; import com.njzscloud.common.security.ex.UserLoginException; diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java index 8685958..73410da 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java @@ -2,8 +2,8 @@ package com.njzscloud.common.security.handler; import cn.hutool.extra.servlet.ServletUtil; import com.njzscloud.common.core.ex.ExceptionMsg; -import com.njzscloud.common.core.http.constant.Mime; import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.core.utils.Mime; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.security.support.Token; import com.njzscloud.common.security.support.UserAuthenticationToken; diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatAuthenticationProvider.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniAuthenticationProvider.java similarity index 82% rename from njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatAuthenticationProvider.java rename to njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniAuthenticationProvider.java index f67bbf2..c322b67 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatAuthenticationProvider.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniAuthenticationProvider.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.security.module.wechat; +package com.njzscloud.common.security.module.wechat.mini; import com.njzscloud.common.core.ex.ExceptionMsg; import com.njzscloud.common.security.contant.AuthWay; @@ -14,7 +14,7 @@ import java.util.Set; * 验证码登录认证器 */ @RequiredArgsConstructor -public class WechatAuthenticationProvider extends AbstractAuthenticationProvider { +public class WechatMiniAuthenticationProvider extends AbstractAuthenticationProvider { private final IUserService iUserService; private final IRoleService iRoleService; private final IResourceService iResourceService; @@ -27,9 +27,9 @@ public class WechatAuthenticationProvider extends AbstractAuthenticationProvider */ @Override protected UserDetail retrieveUser(LoginForm loginForm) throws UserLoginException { - WechatLoginForm wechatLoginForm = (WechatLoginForm) loginForm; - String code = wechatLoginForm.getCode(); - AuthWay authWay = wechatLoginForm.getAuthWay(); + WechatMiniLoginForm wechatMiniLoginForm = (WechatMiniLoginForm) loginForm; + String code = wechatMiniLoginForm.getCode(); + AuthWay authWay = wechatMiniLoginForm.getAuthWay(); UserDetail userDetail = iUserService.selectUser(code, authWay); if (userDetail == null) throw new UserLoginException(ExceptionMsg.CLI_ERR_MSG, "账号不存在"); Long userId = userDetail.getUserId(); diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatLoginForm.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniLoginForm.java similarity index 64% rename from njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatLoginForm.java rename to njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniLoginForm.java index e92d9d2..106d2b0 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatLoginForm.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniLoginForm.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.security.module.wechat; +package com.njzscloud.common.security.module.wechat.mini; import com.njzscloud.common.security.contant.AuthWay; import com.njzscloud.common.security.support.LoginForm; @@ -10,13 +10,15 @@ import lombok.Setter; */ @Getter @Setter -public class WechatLoginForm extends LoginForm { +public class WechatMiniLoginForm extends LoginForm { /** * 验证码 */ private String code; + private String openid; + private String unionid; - public WechatLoginForm() { + public WechatMiniLoginForm() { super(AuthWay.WECHAT_MINI); } diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatLoginPreparer.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniLoginPreparer.java similarity index 88% rename from njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatLoginPreparer.java rename to njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniLoginPreparer.java index 65d468f..7f7cea2 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/WechatLoginPreparer.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/wechat/mini/WechatMiniLoginPreparer.java @@ -1,4 +1,4 @@ -package com.njzscloud.common.security.module.wechat; +package com.njzscloud.common.security.module.wechat.mini; import com.njzscloud.common.core.ex.ExceptionMsg; import com.njzscloud.common.core.jackson.Jackson; @@ -16,7 +16,7 @@ import static com.njzscloud.common.security.contant.Constants.LOGIN_WECHAT_URL; /** * 验证码登录，登录参数处理器 */ -public class WechatLoginPreparer implements LoginPreparer { +public class WechatMiniLoginPreparer implements LoginPreparer { private static final AntPathRequestMatcher matcher = new AntPathRequestMatcher(LOGIN_WECHAT_URL, "POST"); /** @@ -28,7 +28,7 @@ public class WechatLoginPreparer implements LoginPreparer { @Override public LoginForm createLoginForm(HttpServletRequest request) { try (ServletInputStream inputStream = request.getInputStream()) { - return Jackson.toBean(inputStream, WechatLoginForm.class); + return Jackson.toBean(inputStream, WechatMiniLoginForm.class); } catch (Exception e) { throw new UserLoginException(e, ExceptionMsg.SYS_ERR_MSG, "登录表单解析失败"); } diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java index a31a3c2..cfbd4da 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java @@ -1,7 +1,21 @@ package com.njzscloud.common.security.support; import com.njzscloud.common.security.contant.AuthWay; +import com.njzscloud.common.security.module.password.PasswordLoginForm; +import com.njzscloud.common.security.module.wechat.mini.WechatMiniLoginForm; public interface IUserService { UserDetail selectUser(String phone, AuthWay authWay); + + default UserDetail selectUser(PasswordLoginForm form) { + return null; + } + + default UserDetail selectUser(WechatMiniLoginForm form) { + return null; + } + + default UserDetail my(WechatMiniLoginForm form) { + return null; + } } diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java index ea6d929..f0b1217 100644 --- a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java +++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java @@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor; import lombok.Setter; import java.security.Principal; +import java.util.Map; @Getter @Setter @@ -17,4 +18,8 @@ public abstract class LoginForm implements Principal { */ private final AuthWay authWay; + /** + * 扩展参数 + */ + private Map extra; } diff --git a/njzscloud-common/njzscloud-common-wechat/pom.xml b/njzscloud-common/njzscloud-common-wechat/pom.xml new file mode 100644 index 0000000..74ef09c --- /dev/null +++ b/njzscloud-common/njzscloud-common-wechat/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-wechat + jar + + + UTF-8 + + + + + com.njzscloud + njzscloud-common-core + provided + + + com.njzscloud + njzscloud-common-http + provided + + + diff --git a/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatApi.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatApi.java new file mode 100644 index 0000000..05e88ff --- /dev/null +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatApi.java @@ -0,0 +1,25 @@ +package com.njzscloud.common.wechat; + +import com.njzscloud.common.http.annotation.GetEndpoint; +import com.njzscloud.common.http.annotation.QueryParam; +import com.njzscloud.common.http.annotation.RemoteServer; +import com.njzscloud.common.wechat.param.Code2SessionParam; +import com.njzscloud.common.wechat.param.GetAccessTokenParam; +import com.njzscloud.common.wechat.result.Code2SessionResult; +import com.njzscloud.common.wechat.result.GetAccessTokenResult; + +@RemoteServer(value = "${wechat.base-url}") +public interface WechatApi { + + /** + * 获取access_token + */ + @GetEndpoint("/cgi-bin/token") + GetAccessTokenResult getAccessToken(@QueryParam GetAccessTokenParam getAccessTokenParam); + + /** + * 小程序登录 + */ + @GetEndpoint("/sns/jscode2session") + Code2SessionResult code2Session(@QueryParam Code2SessionParam code2SessionParam); +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/WechatUtil.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java similarity index 65% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/WechatUtil.java rename to njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java index 50aa995..8dff1c4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/WechatUtil.java +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java @@ -1,21 +1,27 @@ -package com.njzscloud.supervisory.wechat; +package com.njzscloud.common.wechat; + import cn.hutool.core.lang.Assert; import cn.hutool.extra.spring.SpringUtil; import com.njzscloud.common.core.ex.Exceptions; -import com.njzscloud.supervisory.wechat.param.Code2SessionParam; -import com.njzscloud.supervisory.wechat.param.GetAccessTokenParam; -import com.njzscloud.supervisory.wechat.result.Code2SessionResult; -import com.njzscloud.supervisory.wechat.result.GetAccessTokenResult; +import com.njzscloud.common.http.HttpClientDecorator; +import com.njzscloud.common.wechat.param.Code2SessionParam; +import com.njzscloud.common.wechat.param.GetAccessTokenParam; +import com.njzscloud.common.wechat.result.Code2SessionResult; +import com.njzscloud.common.wechat.result.GetAccessTokenResult; import java.util.Date; public class WechatUtil { - private static final WechatApi API = SpringUtil.getBean(WechatApi.class); - + private static final WechatApi API; private static String accessToken = ""; private static long tokenExpTime = 0; + static { + HttpClientDecorator decorator = SpringUtil.getBean(HttpClientDecorator.class); + API = decorator.decorate(WechatApi.class); + } + public static Code2SessionResult code2Session(Code2SessionParam param) { auth(); return API.code2Session(param.setAccess_token(accessToken)); diff --git a/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/config/WechatAutoConfiguration.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/config/WechatAutoConfiguration.java new file mode 100644 index 0000000..3e26d32 --- /dev/null +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/config/WechatAutoConfiguration.java @@ -0,0 +1,9 @@ +package com.njzscloud.common.wechat.config; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties(WechatProperties.class) +public class WechatAutoConfiguration { +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/WechatProperties.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/config/WechatProperties.java similarity index 83% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/WechatProperties.java rename to njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/config/WechatProperties.java index 6f2517e..4b4e923 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/WechatProperties.java +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/config/WechatProperties.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.config; +package com.njzscloud.common.wechat.config; import lombok.Getter; import lombok.Setter; @@ -14,4 +14,5 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class WechatProperties { private String appId; private String appSecret; + private String baseUrl; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/param/Code2SessionParam.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/param/Code2SessionParam.java similarity index 85% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/param/Code2SessionParam.java rename to njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/param/Code2SessionParam.java index 855e1ec..2976ce7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/param/Code2SessionParam.java +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/param/Code2SessionParam.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.wechat.param; +package com.njzscloud.common.wechat.param; import cn.hutool.extra.spring.SpringUtil; -import com.njzscloud.supervisory.config.WechatProperties; +import com.njzscloud.common.wechat.config.WechatProperties; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/param/GetAccessTokenParam.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/param/GetAccessTokenParam.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/param/GetAccessTokenParam.java rename to njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/param/GetAccessTokenParam.java index 6183829..25bf45f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/param/GetAccessTokenParam.java +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/param/GetAccessTokenParam.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.wechat.param; +package com.njzscloud.common.wechat.param; import cn.hutool.extra.spring.SpringUtil; -import com.njzscloud.supervisory.config.WechatProperties; +import com.njzscloud.common.wechat.config.WechatProperties; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/result/Code2SessionResult.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/result/Code2SessionResult.java similarity index 89% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/result/Code2SessionResult.java rename to njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/result/Code2SessionResult.java index 94d4ca9..cb2940a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/result/Code2SessionResult.java +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/result/Code2SessionResult.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.wechat.result; +package com.njzscloud.common.wechat.result; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/result/GetAccessTokenResult.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/result/GetAccessTokenResult.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/result/GetAccessTokenResult.java rename to njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/result/GetAccessTokenResult.java index 819ea5e..0836c36 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/result/GetAccessTokenResult.java +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/result/GetAccessTokenResult.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.wechat.result; +package com.njzscloud.common.wechat.result; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-common/njzscloud-common-wechat/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-wechat/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..6e8c67d --- /dev/null +++ b/njzscloud-common/njzscloud-common-wechat/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration = \ + com.njzscloud.common.wechat.config.WechatAutoConfiguration diff --git a/njzscloud-common/pom.xml b/njzscloud-common/pom.xml index 47410ed..a778414 100644 --- a/njzscloud-common/pom.xml +++ b/njzscloud-common/pom.xml @@ -27,6 +27,8 @@ njzscloud-common-sn njzscloud-common-gen njzscloud-common-mqtt + njzscloud-common-http + njzscloud-common-wechat diff --git a/njzscloud-svr/pom.xml b/njzscloud-svr/pom.xml index fd273aa..8489537 100644 --- a/njzscloud-svr/pom.xml +++ b/njzscloud-svr/pom.xml @@ -21,6 +21,14 @@ com.njzscloud njzscloud-common-core + + com.njzscloud + njzscloud-common-http + + + com.njzscloud + njzscloud-common-wechat + com.njzscloud njzscloud-common-mp diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/constant/TruckCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/constant/TruckCategory.java deleted file mode 100644 index f76b692..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/constant/TruckCategory.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.njzscloud.supervisory.biz.constant; - -import com.njzscloud.common.core.ienum.DictStr; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * 字典代码：truck_category - * 字典名称：车辆类型 - */ -@Getter -@RequiredArgsConstructor -public enum TruckCategory implements DictStr { - HookTruck("HookTruck", "勾臂车"), - FiveSmallTruck("FiveSmallTruck", "五小工程车"), - DumpTruck("DumpTruck", "渣土车"), - OtherTruck("OtherTruck", "其他车型"), - ; - private final String val; - private final String txt; -} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/JimiApiAutoConfiguration.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/JimiApiAutoConfiguration.java index 4d0b54f..3bf97ae 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/JimiApiAutoConfiguration.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/JimiApiAutoConfiguration.java @@ -1,6 +1,6 @@ package com.njzscloud.supervisory.config; -import com.njzscloud.common.core.http.HttpClientDecorator; +import com.njzscloud.common.http.HttpClientDecorator; import com.njzscloud.supervisory.gps.tuqiang.jimi.support.JimiApi; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/WechatAutoConfiguration.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/WechatAutoConfiguration.java deleted file mode 100644 index 7669d44..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/WechatAutoConfiguration.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.njzscloud.supervisory.config; - -import com.njzscloud.common.core.http.HttpClientDecorator; -import com.njzscloud.supervisory.wechat.WechatApi; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties(WechatProperties.class) -public class WechatAutoConfiguration { - - @Bean - public WechatApi wechatApi(HttpClientDecorator httpClientDecorator) { - return httpClientDecorator.decorate(WechatApi.class); - } -} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java index 18a955a..ebe1ccf 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java @@ -127,11 +127,11 @@ public class DeviceInfoService extends ServiceImpl> dispatchPaging(PageParam pageParam, OrderPagingSearchParam orderPagingSearchParam) { return R.success(orderInfoService .dispatchPaging(pageParam, orderPagingSearchParam)); } - + */ /** * 审核分页查询 */ @@ -191,7 +191,7 @@ public class OrderInfoController { */ @PostMapping("/truck_coming") public R truckComing(@RequestBody TruckComingOrderParam truckComingOrderParam) { - orderInfoService.truckComing(truckComingOrderParam); + orderInfoService.truckComing(truckComingOrderParam, 1); return R.success(); } @@ -200,7 +200,7 @@ public class OrderInfoController { */ @PostMapping("/truck_leaving") public R truckLeaving(@RequestBody TruckLeavingOrderParam truckLeavingOrderParam) { - orderInfoService.truckLeaving(truckLeavingOrderParam); + orderInfoService.truckLeaving(truckLeavingOrderParam, 1); return R.success(); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java index e49a7ac..37a2a5c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java @@ -2,7 +2,6 @@ package com.njzscloud.supervisory.order.pojo.result; import com.njzscloud.supervisory.biz.constant.AuditStatus; import com.njzscloud.supervisory.biz.constant.BizObj; -import com.njzscloud.supervisory.biz.constant.TruckCategory; import com.njzscloud.supervisory.goods.contant.MoneyStrategy; import com.njzscloud.supervisory.order.contant.*; import lombok.Getter; @@ -25,10 +24,7 @@ public class OrderPagingResult { * 昵称 */ private String nickname; - /** - * 车辆类型 - */ - private TruckCategory truckCategory; + /** * 手机号 */ @@ -403,7 +399,10 @@ public class OrderPagingResult { * 车牌号 */ private String licensePlate; - + /** + * 车辆类型 + */ + private String truckCategory; /** * 行驶证 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java index 0fbd62f..817668a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java @@ -2,7 +2,6 @@ package com.njzscloud.supervisory.order.pojo.result; import com.njzscloud.supervisory.biz.constant.AuditStatus; import com.njzscloud.supervisory.biz.constant.BizObj; -import com.njzscloud.supervisory.biz.constant.TruckCategory; import com.njzscloud.supervisory.goods.contant.MoneyStrategy; import com.njzscloud.supervisory.order.contant.*; import lombok.Getter; @@ -422,7 +421,7 @@ public class TrainBillResult { * 空重; 单位：吨 */ private Integer historyTareWeight; - private TruckCategory truckCategory; + private String truckCategory; // endregion diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index d3cfc49..8ef1025 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -30,6 +30,7 @@ import com.njzscloud.supervisory.order.contant.OrderCategory; import com.njzscloud.supervisory.order.contant.OrderStatus; import com.njzscloud.supervisory.order.contant.OrderViewType; import com.njzscloud.supervisory.order.mapper.OrderInfoMapper; +import com.njzscloud.supervisory.order.pojo.entity.OrderCargoPlaceEntity; import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity; import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity; import com.njzscloud.supervisory.order.pojo.param.*; @@ -71,19 +72,6 @@ public class OrderInfoService extends ServiceImpl roles = userDetail.getRoles(); if (SecurityUtil.isAdmin() || roles.contains(Constant.ROLE_STATION_MANAGE)) { + Long stationId = orderPagingSearchParam.getStationId(); + Assert.notNull(stationId, () -> Exceptions.clierr("请选择站点")); ew - .eq("a.station_id", orderPagingSearchParam.getStationId()) + .eq("a.station_id", stationId) .eq("a.order_status", OrderStatus.YiYuYue) .isNull("a.trans_company_id ") ; @@ -229,8 +217,10 @@ public class OrderInfoService extends ServiceImpl roles = userDetail.getRoles(); if (SecurityUtil.isAdmin() || roles.contains(Constant.ROLE_STATION_MANAGE)) { + Long stationId = orderPagingSearchParam.getStationId(); + Assert.notNull(stationId, () -> Exceptions.clierr("请选择站点")); ew - .eq("a.station_id", orderPagingSearchParam.getStationId()) + .eq("a.station_id", stationId) .in("a.order_status", OrderStatus.DaiPaiDan, OrderStatus.DaiJieDan, OrderStatus.YiJieDan) ; return; @@ -266,8 +256,10 @@ public class OrderInfoService extends ServiceImpl roles = userDetail.getRoles(); if (SecurityUtil.isAdmin() || roles.contains(Constant.ROLE_STATION_MANAGE)) { + Long stationId = orderPagingSearchParam.getStationId(); + Assert.notNull(stationId, () -> Exceptions.clierr("请选择站点")); ew - .eq("a.station_id", orderPagingSearchParam.getStationId()) + .eq("a.station_id", stationId) .in("a.order_status", OrderStatus.QingYunZhong, OrderStatus.YiJinChang, OrderStatus.YiChuChang) ; return; @@ -304,8 +296,10 @@ public class OrderInfoService extends ServiceImpl roles = userDetail.getRoles(); if (SecurityUtil.isAdmin() || roles.contains(Constant.ROLE_STATION_MANAGE)) { + Long stationId = orderPagingSearchParam.getStationId(); + Assert.notNull(stationId, () -> Exceptions.clierr("请选择站点")); ew - .eq("a.station_id", orderPagingSearchParam.getStationId()) + .eq("a.station_id", stationId) .eq("a.order_status", OrderStatus.YiWanCheng) ; return; @@ -327,8 +321,10 @@ public class OrderInfoService extends ServiceImpl roles = userDetail.getRoles(); if (SecurityUtil.isAdmin() || roles.contains(Constant.ROLE_STATION_MANAGE)) { + Long stationId = orderPagingSearchParam.getStationId(); + Assert.notNull(stationId, () -> Exceptions.clierr("请选择站点")); ew - .eq("a.station_id", orderPagingSearchParam.getStationId()) + .eq("a.station_id", stationId) .eq("a.order_status", OrderStatus.YiQuXiao) ; return; @@ -339,8 +335,10 @@ public class OrderInfoService extends ServiceImpl roles = userDetail.getRoles(); if (SecurityUtil.isAdmin() || roles.contains(Constant.ROLE_STATION_MANAGE)) { + Long stationId = orderPagingSearchParam.getStationId(); + Assert.notNull(stationId, () -> Exceptions.clierr("请选择站点")); ew - .eq("a.station_id", orderPagingSearchParam.getStationId()) + .eq("a.station_id", stationId) .ne("a.auto_order", 3) ; return; @@ -478,8 +476,10 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("您没有权限确认此单")); baseMapper.busyTruck(truckId, Boolean.TRUE); + OrderCargoPlaceEntity cargoPlaceEntity = orderCargoPlaceService.getById(orderInfo.getCargoPlaceId()); + String area = cargoPlaceEntity.getArea(); + BizAuditConfigEntity bizAuditConfigEntity = bizAuditConfigService.getOne(Wrappers.lambdaQuery(BizAuditConfigEntity.class).eq(BizAuditConfigEntity::getArea, area)); + AuditStatus auditStatus = AuditStatus.DaiShenHe; + if (bizAuditConfigEntity != null) { + String areaRole = bizAuditConfigEntity.getAreaRole(); + String cityRole = bizAuditConfigEntity.getCityRole(); + if (areaRole != null && cityRole != null) { + auditStatus = AuditStatus.QuDaiShenHe; + } else if (areaRole == null && cityRole != null) { + auditStatus = AuditStatus.ShiDaiShenHe; + } + } this.updateById(new OrderInfoEntity() .setId(orderInfo.getId()) + .setAuditStatus(auditStatus) .setTruckId(truckId) .setOrderStatus(OrderStatus.YiJieDan) ); @@ -627,9 +642,11 @@ public class OrderInfoService extends ServiceImpl自动、1-->手动 */ @Transactional(rollbackFor = Exception.class) - public void truckComing(TruckComingOrderParam truckComingOrderParam) { + public void truckComing(TruckComingOrderParam truckComingOrderParam, int i) { OrderInfoEntity orderInfoEntity = this.getById(truckComingOrderParam.getOrderId()); Assert.notNull(orderInfoEntity, () -> Exceptions.clierr("订单不存在")); OrderStatus orderStatus = orderInfoEntity.getOrderStatus(); @@ -639,6 +656,7 @@ public class OrderInfoService extends ServiceImpl自动、1-->手动 */ @Transactional(rollbackFor = Exception.class) - public void truckLeaving(TruckLeavingOrderParam truckLeavingOrderParam) { + public void truckLeaving(TruckLeavingOrderParam truckLeavingOrderParam, int i) { OrderInfoEntity orderInfoEntity = this.getById(truckLeavingOrderParam.getOrderId()); Assert.notNull(orderInfoEntity, () -> Exceptions.clierr("订单不存在")); OrderStatus orderStatus = orderInfoEntity.getOrderStatus(); @@ -657,6 +677,7 @@ public class OrderInfoService extends ServiceImpl menuResources = authMapper.selectUserMenu(userId); diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java index 46599af..9bc2afd 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java @@ -13,6 +13,9 @@ import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.common.security.contant.AuthWay; import com.njzscloud.common.security.util.SecurityUtil; +import com.njzscloud.common.wechat.WechatUtil; +import com.njzscloud.common.wechat.param.Code2SessionParam; +import com.njzscloud.common.wechat.result.Code2SessionResult; import com.njzscloud.supervisory.biz.constant.BizObj; import com.njzscloud.supervisory.biz.pojo.param.AddBizCompanyParam; import com.njzscloud.supervisory.biz.service.BizCompanyService; @@ -25,9 +28,6 @@ import com.njzscloud.supervisory.sys.user.pojo.entity.UserEntity; import com.njzscloud.supervisory.sys.user.pojo.param.*; import com.njzscloud.supervisory.sys.user.pojo.result.UserAccountDetailResult; import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult; -import com.njzscloud.supervisory.wechat.WechatUtil; -import com.njzscloud.supervisory.wechat.param.Code2SessionParam; -import com.njzscloud.supervisory.wechat.result.Code2SessionResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/WechatApi.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/WechatApi.java deleted file mode 100644 index 369eab3..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wechat/WechatApi.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njzscloud.supervisory.wechat; - -import com.njzscloud.common.core.http.annotation.GetEndpoint; -import com.njzscloud.common.core.http.annotation.QueryParam; -import com.njzscloud.common.core.http.annotation.RemoteServer; -import com.njzscloud.supervisory.wechat.param.Code2SessionParam; -import com.njzscloud.supervisory.wechat.param.GetAccessTokenParam; -import com.njzscloud.supervisory.wechat.result.Code2SessionResult; -import com.njzscloud.supervisory.wechat.result.GetAccessTokenResult; - -@RemoteServer(value = "https://api.weixin.qq.com") -public interface WechatApi { - - /** - * 获取access_token - */ - @GetEndpoint("/cgi-bin/token") - GetAccessTokenResult getAccessToken(@QueryParam GetAccessTokenParam getAccessTokenParam); - - /** - * 小程序登录 - */ - @GetEndpoint("/sns/jscode2session") - Code2SessionResult code2Session(@QueryParam Code2SessionParam code2SessionParam); -} diff --git a/njzscloud-svr/src/main/resources/application-dev.yml b/njzscloud-svr/src/main/resources/application-dev.yml index 84d4eb3..0dedbe0 100644 --- a/njzscloud-svr/src/main/resources/application-dev.yml +++ b/njzscloud-svr/src/main/resources/application-dev.yml @@ -56,3 +56,4 @@ mybatis-plus: wechat: app-id: wx3c06d9dd4e56c58d app-secret: ff280a71a4c06fc2956178f8c472ef96 + base-url: https://api.weixin.qq.com diff --git a/njzscloud-svr/src/main/resources/mapper/biz/BizProjectMapper.xml b/njzscloud-svr/src/main/resources/mapper/biz/BizProjectMapper.xml index dbb1723..2009e48 100644 --- a/njzscloud-svr/src/main/resources/mapper/biz/BizProjectMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/biz/BizProjectMapper.xml @@ -6,6 +6,7 @@ + diff --git a/njzscloud-svr/src/main/resources/mapper/station/StationManageMapper.xml b/njzscloud-svr/src/main/resources/mapper/station/StationManageMapper.xml index 245071c..7fef466 100644 --- a/njzscloud-svr/src/main/resources/mapper/station/StationManageMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/station/StationManageMapper.xml @@ -56,9 +56,10 @@ b.contacts, b.phone, a.station_id, + b.open, b.company_name station_name FROM station_manage a - INNER JOIN biz_company b ON b.id = a.station_id AND b.station = 1 AND b.deleted = 0 AND b.open = 1 + INNER JOIN biz_company b ON b.id = a.station_id AND b.station = 1 AND b.deleted = 0 INNER JOIN sys_user c ON c.id = a.user_id AND c.deleted = 0 ${ew.customSqlSegment} @@ -107,6 +108,7 @@ b.lng, b.lat, b.contacts, + b.open, b.phone, b.id station_id, b.company_name station_name @@ -114,6 +116,5 @@ INNER JOIN sys_user c ON c.id = 1 AND c.deleted = 0 WHERE b.station = 1 AND b.deleted = 0 - AND b.open = 1 diff --git a/pom.xml b/pom.xml index 8aeec2e..19582b7 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,16 @@ njzscloud-common-sichen 0.0.1 + + com.njzscloud + njzscloud-common-wechat + 0.0.1 + + + com.njzscloud + njzscloud-common-http + 0.0.1 + com.njzscloud njzscloud-common-sn