Merge branch 'master' into registry-nacos

changelog.md

@@ -1,5 +1,13 @@
 # changelog
 
+## 1.13.6
+
+- 修复@RequestBody不能绑定问题
+
+## 1.13.5
+
+- 修复postJson下version获取不到问题
+
 ## 1.13.4
 
 - 修复admin服务列表最后更新时间不显示问题

sop-admin/sop-admin-server/pom.xml

@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-registry-api</artifactId>
-			<version>1.13.4-SNAPSHOT</version>
+			<version>1.13.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- easyopen starter -->

sop-common/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.gitee.sop</groupId>
 	<artifactId>sop-common</artifactId>
-	<version>1.13.4-SNAPSHOT</version>
+	<version>1.13.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>

sop-common/sop-gateway-common/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>1.13.4-SNAPSHOT</version>
+        <version>1.13.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-gateway-common</artifactId>
-    <version>1.13.4-SNAPSHOT</version>
+    <version>1.13.6-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-gateway-common</name>

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/param/GatewayParamBuilder.java

@@ -22,4 +22,9 @@ public class GatewayParamBuilder extends BaseParamBuilder<ServerWebExchange> {
     public String getIP(ServerWebExchange ctx) {
         return ctx.getRequest().getRemoteAddress().getAddress().getHostAddress();
     }
+
+    @Override
+    public void setVersionInHeader(ServerWebExchange ctx, String headerName, String version) {
+        ctx.getRequest().getHeaders().add(headerName, version);
+    }
 }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/BaseParamBuilder.java

@@ -31,6 +31,14 @@ public abstract class BaseParamBuilder<T> implements ParamBuilder<T> {
      */
     public abstract String getIP(T ctx);
 
+    /**
+     * 将版本号添加到header中
+     * @param ctx 请求request
+     * @param headerName headerName
+     * @param version 版本号
+     */
+    public abstract void setVersionInHeader(T ctx, String headerName, String version);
+
     @Override
     public ApiParam build(T ctx) {
         ApiParam apiParam = this.newApiParam(ctx);
@@ -40,6 +48,7 @@ public abstract class BaseParamBuilder<T> implements ParamBuilder<T> {
         }
         this.initOtherProperty(apiParam);
         apiParam.setIp(this.getIP(ctx));
+        this.setVersionInHeader(ctx, ParamNames.HEADER_VERSION_NAME, apiParam.fetchVersion());
         return apiParam;
     }
 

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamNames.java

@@ -45,5 +45,7 @@ public class ParamNames {
     /** 返回sign名称 */
     public static String RESPONSE_SIGN_NAME = "sign";
 
+    public static String HEADER_VERSION_NAME = "sop-version";
+
 
 }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/result/BaseExecutorAdapter.java

@@ -37,6 +37,7 @@ public abstract class BaseExecutorAdapter<T, R> implements ResultExecutor<T, R>
     private static final ErrorMeta SUCCESS_META = ErrorEnum.SUCCESS.getErrorMeta();
     private static final ErrorMeta ISP_UNKNOW_ERROR_META = ErrorEnum.ISP_UNKNOW_ERROR.getErrorMeta();
     private static final ErrorMeta ISP_BIZ_ERROR = ErrorEnum.BIZ_ERROR.getErrorMeta();
+    private static final ErrorMeta ISV_MISSING_METHOD_META = ErrorEnum.ISV_MISSING_METHOD.getErrorMeta();
 
     public static final String GATEWAY_CODE_NAME = "code";
     public static final String GATEWAY_MSG_NAME = "msg";
@@ -90,6 +91,10 @@ public abstract class BaseExecutorAdapter<T, R> implements ResultExecutor<T, R>
             responseData = JSON.parseObject(serviceResult);
             responseData.put(GATEWAY_CODE_NAME, ISP_BIZ_ERROR.getCode());
             responseData.put(GATEWAY_MSG_NAME, ISP_BIZ_ERROR.getError().getMsg());
+        } else if(responseStatus == HttpStatus.NOT_FOUND.value()) {
+            responseData = JSON.parseObject(serviceResult);
+            responseData.put(GATEWAY_CODE_NAME, ISV_MISSING_METHOD_META.getCode());
+            responseData.put(GATEWAY_MSG_NAME, ISV_MISSING_METHOD_META.getError().getCode());
         } else {
             this.storeError(request, ErrorType.UNKNOWN);
             // 微服务端有可能返回500错误

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/param/ZuulParamBuilder.java

@@ -53,6 +53,11 @@ public class ZuulParamBuilder extends BaseParamBuilder<RequestContext> {
         return RequestUtil.getIP(ctx.getRequest());
     }
 
+    @Override
+    public void setVersionInHeader(RequestContext ctx, String headerName, String version) {
+        ctx.addZuulRequestHeader(headerName, version);
+    }
+
     @Override
     protected ApiParam newApiParam(RequestContext ctx) {
         ApiParam apiParam = super.newApiParam(ctx);

sop-common/sop-registry-api/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gitee.sop</groupId>
     <artifactId>sop-registry-api</artifactId>
-    <version>1.13.4-SNAPSHOT</version>
+    <version>1.13.6-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

sop-common/sop-service-common/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>1.13.4-SNAPSHOT</version>
+        <version>1.13.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-service-common</artifactId>
-    <version>1.13.4-SNAPSHOT</version>
+    <version>1.13.6-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-service-common</name>

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/bean/ParamNames.java

@@ -45,5 +45,7 @@ public class ParamNames {
     /** 时间戳格式 */
     public static String TIMESTAMP_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
+    public static String HEADER_VERSION_NAME = "sop-version";
+
 
 }

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/AlipayServiceConfiguration.java

@@ -3,11 +3,8 @@ package com.gitee.sop.servercommon.configuration;
 import com.gitee.sop.servercommon.bean.ServiceConfig;
 import com.gitee.sop.servercommon.param.SopHandlerMethodArgumentResolver;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
-import java.util.List;
-
 /**
  * 具备支付宝开放平台服务提供能力
  * @author tanghc
@@ -22,13 +19,6 @@ public class AlipayServiceConfiguration extends BaseServiceConfiguration {
     @Autowired
     private RequestMappingHandlerAdapter requestMappingHandlerAdapter;
 
-    @Override
-    protected void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        super.addArgumentResolvers(argumentResolvers);
-        SopHandlerMethodArgumentResolver sopHandlerMethodArgumentResolver = ServiceConfig.getInstance().getMethodArgumentResolver();
-        argumentResolvers.add(sopHandlerMethodArgumentResolver);
-    }
-
     @Override
     protected void doAfter() {
         super.doAfter();

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingRequestCondition.java

@@ -15,7 +15,6 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 public class ApiMappingRequestCondition implements RequestCondition<ApiMappingRequestCondition> {
 
-    public static final String UTF_8 = "UTF-8";
     private String defaultVersion = ServiceConfig.getInstance().getDefaultVersion();
 
     private ApiMappingInfo apiMappingInfo;
@@ -46,7 +45,10 @@ public class ApiMappingRequestCondition implements RequestCondition<ApiMappingRe
     }
 
     protected String getVersion(HttpServletRequest request) {
-        String version = request.getParameter(ParamNames.VERSION_NAME);
+        String version = request.getHeader(ParamNames.HEADER_VERSION_NAME);
+        if (version == null) {
+            version = request.getParameter(ParamNames.VERSION_NAME);
+        }
         return version == null ? defaultVersion : version;
     }
 
@@ -61,13 +63,7 @@ public class ApiMappingRequestCondition implements RequestCondition<ApiMappingRe
      */
     @Override
     public int compareTo(ApiMappingRequestCondition other, HttpServletRequest request) {
-        if (null != apiMappingInfo && null == other.apiMappingInfo) {
+        return this.apiMappingInfo.getVersion().compareTo(other.apiMappingInfo.getVersion());
-            return 1;
-        } else if (null == apiMappingInfo && null != other.apiMappingInfo) {
-            return -1;
-        } else {
-            return 0;
-        }
     }
 
 }

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java

@@ -17,12 +17,15 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
+import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -42,14 +45,29 @@ public class ApiArgumentResolver implements SopHandlerMethodArgumentResolver {
     @Override
     public void setRequestMappingHandlerAdapter(RequestMappingHandlerAdapter requestMappingHandlerAdapter) {
         this.requestMappingHandlerAdapter = requestMappingHandlerAdapter;
+        List<HandlerMethodArgumentResolver> argumentResolversNew = new ArrayList<>(64);
+        // 先加自己
+        argumentResolversNew.add(this);
+        HandlerMethodArgumentResolver lastOne = null;
+        for (HandlerMethodArgumentResolver argumentResolver : Objects.requireNonNull(requestMappingHandlerAdapter.getArgumentResolvers())) {
+            // RequestResponseBodyMethodProcessor暂存起来，放在最后面
+            if (argumentResolver instanceof RequestResponseBodyMethodProcessor) {
+                lastOne = argumentResolver;
+            } else {
+                argumentResolversNew.add(argumentResolver);
+            }
+        }
+        if (lastOne != null) {
+            argumentResolversNew.add(lastOne);
+        }
+        this.requestMappingHandlerAdapter.setArgumentResolvers(argumentResolversNew);
     }
 
     @Override
     public boolean supportsParameter(MethodParameter methodParameter) {
-        boolean hasAnnotation = methodParameter.getMethodAnnotation(ApiMapping.class) != null
-                || methodParameter.getMethodAnnotation(ApiAbility.class) != null;
         // 有注解
-        return hasAnnotation;
+        return methodParameter.getMethodAnnotation(ApiMapping.class) != null
+                || methodParameter.getMethodAnnotation(ApiAbility.class) != null;
     }
 
     @Override

sop-example/sop-auth/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>1.13.4-SNAPSHOT</version>
+			<version>1.13.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

sop-example/sop-auth/src/test/java/com/gitee/sop/sopauth/RefreshTokenTest.java

@@ -26,7 +26,7 @@ public class RefreshTokenTest extends TestCase {
         OpenAuthTokenAppRequest request = new OpenAuthTokenAppRequest();
         OpenAuthTokenAppModel model = new OpenAuthTokenAppModel();
         model.setGrant_type("refresh_token");
-        model.setRefresh_token("856faf8d77d3b985c1073557ce6ea724");
+        model.setRefresh_token("c9e4003c06fe59066eed73d64ea074ca");
         request.setBizModel(model);
 
         OpenAuthTokenAppResponse response = openClient.execute(request);

sop-example/sop-book/sop-book-web/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>1.13.4-SNAPSHOT</version>
+            <version>1.13.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>

sop-example/sop-easyopen/pom.xml

@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>1.13.4-SNAPSHOT</version>
+			<version>1.13.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

sop-example/sop-springmvc/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>1.13.4-SNAPSHOT</version>
+            <version>1.13.6-SNAPSHOT</version>
         </dependency>
         <!-- eureka 服务发现 -->
         <dependency>

sop-example/sop-story/sop-story-web/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>1.13.4-SNAPSHOT</version>
+            <version>1.13.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>

sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java

@@ -30,7 +30,7 @@ public class AlipayController {
     // http://localhost:2222/story_get
     // 原生的接口，可正常调用
     @RequestMapping("story_get")
-    public Story getStory4() {
+    public Story story_get() {
         Story story = new Story();
         story.setId(1);
         story.setName("海底小纵队(原生)");
@@ -117,7 +117,7 @@ public class AlipayController {
     // http://localhost:2222/getStory2?version=2.1
     // 遗留接口具备开放平台能力，在原来的基础上加版本号
     @ApiAbility(version = "2.1")
-    @RequestMapping("getStory2")
+    @GetMapping("getStory2")
     public Story getStory2_1() {
         Story story = new Story();
         story.setId(1);

sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java

@@ -6,6 +6,7 @@ import com.gitee.sop.servercommon.bean.OpenContext;
 import com.gitee.sop.story.api.domain.Story;
 import com.gitee.sop.storyweb.controller.param.StoryParam;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
@@ -23,7 +24,7 @@ public class PostJsonController {
      * @return
      */
     @ApiMapping("demo.post.json")
-    public Story postJson(StoryParam param) {
+    public Story postJson(@RequestBody StoryParam param) {
         // 获取开放平台请求参数
         OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext();
         List<Object> params = Arrays.asList(
@@ -37,5 +38,25 @@ public class PostJsonController {
         return story;
     }
 
+    /**
+     * 演示客户端使用json方式请求（application/json）
+     * @param param
+     * @return
+     */
+    @ApiMapping(value = "demo.post.json", version = "1.2")
+    public Story postJson2(StoryParam param) {
+        // 获取开放平台请求参数
+        OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext();
+        List<Object> params = Arrays.asList(
+                openContext.getAppId(),
+                openContext.getMethod(),
+                openContext.getVersion()
+        );
+        Story story = new Story();
+        story.setId(1);
+        story.setName("1.2 参数：" + param.getName() + ", openParams:" + StringUtils.join(params));
+        return story;
+    }
+
 
 }

sop-gateway/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>1.13.4-SNAPSHOT</version>
+            <version>1.13.6-SNAPSHOT</version>
         </dependency>
 
         <!-- ↓↓↓ 使用spring cloud zuul ↓↓↓ -->

sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenHttp.java

@@ -118,7 +118,7 @@ public class OpenHttp {
      * @return
      * @throws IOException
      */
-    public String request(String url, Map<String, String> form, Map<String, String> header, String method) throws IOException {
+    public String request(String url, Map<String, String> form, Map<String, String> header, HTTPMethod method) throws IOException {
         Request.Builder requestBuilder = buildRequestBuilder(url, form, method);
         // 添加header
         addHeader(requestBuilder, header);
@@ -134,21 +134,21 @@ public class OpenHttp {
         }
     }
 
-    public static Request.Builder buildRequestBuilder(String url, Map<String, String> form, String method) {
+    public static Request.Builder buildRequestBuilder(String url, Map<String, String> form, HTTPMethod method) {
         switch (method) {
-            case "get":
+            case GET:
                 return new Request.Builder()
                         .url(buildHttpUrl(url, form))
                         .get();
-            case "head":
+            case HEAD:
                 return new Request.Builder()
                         .url(buildHttpUrl(url, form))
                         .head();
-            case "put":
+            case PUT:
                 return new Request.Builder()
                         .url(url)
                         .put(buildFormBody(form));
-            case "delete":
+            case DELETE:
                 return new Request.Builder()
                         .url(url)
                         .delete(buildFormBody(form));
@@ -241,5 +241,22 @@ public class OpenHttp {
         this.httpClient = httpClient;
     }
 
+    public enum HTTPMethod {
+        GET,
+        POST,
+        PUT,
+        HEAD,
+        DELETE;
 
+        private HTTPMethod() {
+        }
+
+        public String value() {
+            return this.name();
+        }
+
+        public static HTTPMethod fromValue(String v) {
+            return valueOf(v.toUpperCase());
+        }
+    }
 }

sop-test/src/main/java/com/gitee/sop/test/HttpTool.java

@@ -111,7 +111,7 @@ public class HttpTool {
      * @throws IOException
      */
     public String request(String url, Map<String, String> form, Map<String, String> header, HTTPMethod method) throws IOException {
-        Request.Builder requestBuilder = buildRequestBuilder(url, form, method.value());
+        Request.Builder requestBuilder = buildRequestBuilder(url, form, method);
         // 添加header
         addHeader(requestBuilder, header);
 
@@ -153,21 +153,21 @@ public class HttpTool {
         }
     }
 
-    public static Request.Builder buildRequestBuilder(String url, Map<String, String> form, String method) {
+    public static Request.Builder buildRequestBuilder(String url, Map<String, String> form, HTTPMethod method) {
         switch (method) {
-            case "get":
+            case GET:
                 return new Request.Builder()
                         .url(buildHttpUrl(url, form))
                         .get();
-            case "head":
+            case HEAD:
                 return new Request.Builder()
                         .url(buildHttpUrl(url, form))
                         .head();
-            case "put":
+            case PUT:
                 return new Request.Builder()
                         .url(url)
                         .put(buildFormBody(form));
-            case "delete":
+            case DELETE:
                 return new Request.Builder()
                         .url(url)
                         .delete(buildFormBody(form));

sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java

@@ -231,4 +231,35 @@ public class AlipayClientPostTest extends TestBase {
         System.out.println(responseData);
     }
 
+    @Test
+    public void testGetStory2() throws AlipayApiException {
+        // 公共请求参数
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("app_id", appId);
+        params.put("method", "getStory2");
+        params.put("version", "1.0");
+        params.put("format", "json");
+        params.put("charset", "utf-8");
+        params.put("sign_type", "RSA2");
+        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        // 业务参数
+        Map<String, String> bizContent = new HashMap<>();
+
+        params.put("biz_content", JSON.toJSONString(bizContent));
+
+        System.out.println("----------- 请求信息 -----------");
+        System.out.println("请求参数：" + buildParamQuery(params));
+        System.out.println("商户秘钥：" + privateKey);
+        String content = AlipaySignature.getSignContent(params);
+        System.out.println("待签名内容：" + content);
+        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
+        System.out.println("签名(sign)：" + sign);
+
+        params.put("sign", sign);
+
+        System.out.println("----------- 返回结果 -----------");
+        String responseData = get(url, params);// 发送请求
+        System.out.println(responseData);
+    }
+
 }

sop-test/src/test/java/com/gitee/sop/test/PostJsonTest.java

@@ -49,7 +49,41 @@ public class PostJsonTest extends TestBase {
         params.put("sign", sign);
 
         System.out.println("----------- 返回结果 -----------");
-        String responseData = get(url, params);// 发送请求
+        String responseData = postJson(url, params);// 发送请求
+        System.out.println(responseData);
+    }
+
+    @Test
+    public void testPostJson2() throws Exception {
+
+        // 公共请求参数
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("app_id", appId);
+        params.put("method", "demo.post.json");
+        params.put("format", "json");
+        params.put("charset", "utf-8");
+        params.put("sign_type", "RSA2");
+        params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        params.put("version", "1.2");
+
+        // 业务参数
+        Map<String, String> bizContent = new HashMap<>();
+        bizContent.put("name", "葫芦娃");
+
+        params.put("biz_content", JSON.toJSONString(bizContent));
+
+        System.out.println("----------- 请求信息 -----------");
+        System.out.println("请求参数：" + buildParamQuery(params));
+        System.out.println("商户秘钥：" + privateKey);
+        String content = AlipaySignature.getSignContent(params);
+        System.out.println("待签名内容：" + content);
+        String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8");
+        System.out.println("签名(sign)：" + sign);
+
+        params.put("sign", sign);
+
+        System.out.println("----------- 返回结果 -----------");
+        String responseData = postJson(url, params);// 发送请求
         System.out.println(responseData);
     }
 

sop-website/website-server/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-registry-api</artifactId>
-            <version>1.13.4-SNAPSHOT</version>
+            <version>1.13.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>

sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java

@@ -111,7 +111,7 @@ public class HttpTool {
      * @throws IOException
      */
     public String request(String url, Map<String, String> form, Map<String, String> header, HTTPMethod method) throws IOException {
-        Request.Builder requestBuilder = buildRequestBuilder(url, form, method.value());
+        Request.Builder requestBuilder = buildRequestBuilder(url, form, method);
         // 添加header
         addHeader(requestBuilder, header);
 
@@ -153,21 +153,21 @@ public class HttpTool {
         }
     }
 
-    public static Request.Builder buildRequestBuilder(String url, Map<String, String> form, String method) {
+    public static Request.Builder buildRequestBuilder(String url, Map<String, String> form, HTTPMethod method) {
         switch (method) {
-            case "get":
+            case GET:
                 return new Request.Builder()
                         .url(buildHttpUrl(url, form))
                         .get();
-            case "head":
+            case HEAD:
                 return new Request.Builder()
                         .url(buildHttpUrl(url, form))
                         .head();
-            case "put":
+            case PUT:
                 return new Request.Builder()
                         .url(url)
                         .put(buildFormBody(form));
-            case "delete":
+            case DELETE:
                 return new Request.Builder()
                         .url(url)
                         .delete(buildFormBody(form));
@@ -262,6 +262,9 @@ public class HttpTool {
         HEAD,
         DELETE;
 
+        private HTTPMethod() {
+        }
+
         public String value() {
             return this.name();
         }