, any>(apiUrl.syncDoc, { data });
},
/**
diff --git a/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts b/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts
index 31380144..a3555ddc 100644
--- a/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts
+++ b/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts
@@ -181,6 +181,35 @@ actionButtons.value = [
});
},
show: (row: any) => row.isFolder === 0
+ },
+ {
+ text: "同步",
+ confirm: {
+ options: { draggable: false },
+ popconfirmProps: { width: 300 },
+ message: params => {
+ const row = params.row;
+ return row.isFolder
+ ? `确定要同步[${row.docTitle}]下所有接口吗？`
+ : `确定要同步[${row.docTitle}]吗？`;
+ }
+ },
+ props: (_: any) => ({
+ type: "primary"
+ }),
+ onConfirm(params: ButtonsCallBackParams) {
+ loading.value = true;
+ api
+ .syncDoc(params.row.id)
+ .then(() => {
+ loading.value = false;
+ ElMessage.success("同步成功");
+ search();
+ })
+ .catch(() => {
+ loading.value = false;
+ });
+ }
}
];
@@ -203,7 +232,7 @@ export function handleSyncApi() {
.then(() => {
loading.value = true;
api
- .syncDoc(docAppId.value)
+ .syncAppDoc(docAppId.value)
.then(() => {
loading.value = false;
ElMessage.success("同步成功");
diff --git a/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue b/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue
index ab0ec2c7..fdd5ea3d 100644
--- a/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue
+++ b/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue
@@ -43,7 +43,7 @@ import { Search } from "@element-plus/icons-vue";
:action-bar="{
buttons: actionButtons,
confirmType: 'popconfirm',
- width: 120
+ width: 150
}"
adaptive
>
@@ -60,7 +60,9 @@ import { Search } from "@element-plus/icons-vue";
- 同步接口
+
+ 同步全部接口
+
diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/impl/OpenPaymentImpl.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/impl/OpenPaymentImpl.java
index 3bac2532..9b3ee7ab 100644
--- a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/impl/OpenPaymentImpl.java
+++ b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/impl/OpenPaymentImpl.java
@@ -1,11 +1,13 @@
package com.gitee.sop.payment.impl;
import com.gitee.sop.payment.open.OpenPayment;
+import com.gitee.sop.payment.open.req.PayOrderSearchRequest;
import com.gitee.sop.payment.open.req.PayTradeWapPayRequest;
+import com.gitee.sop.payment.open.resp.PayOrderSearchResponse;
import com.gitee.sop.payment.open.resp.PayTradeWapPayResponse;
+import java.util.UUID;
import org.apache.dubbo.config.annotation.DubboService;
-import java.util.UUID;
/**
@@ -22,4 +24,14 @@ public class OpenPaymentImpl implements OpenPayment {
payTradeWapPayResponse.setPageRedirectionData(UUID.randomUUID().toString());
return payTradeWapPayResponse;
}
+
+ @Override
+ public PayOrderSearchResponse orderSearch(PayOrderSearchRequest request) {
+ PayOrderSearchResponse payOrderSearchResponse = new PayOrderSearchResponse();
+ payOrderSearchResponse.setOrderNo(request.getOrderNo());
+ payOrderSearchResponse.setPayNo("xxxx");
+ payOrderSearchResponse.setPayUserId(111L);
+ payOrderSearchResponse.setPayUserName("Jim");
+ return payOrderSearchResponse;
+ }
}
diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/OpenPayment.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/OpenPayment.java
index d69246f5..0f1e78c6 100644
--- a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/OpenPayment.java
+++ b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/OpenPayment.java
@@ -1,6 +1,8 @@
package com.gitee.sop.payment.open;
+import com.gitee.sop.payment.open.req.PayOrderSearchRequest;
import com.gitee.sop.payment.open.req.PayTradeWapPayRequest;
+import com.gitee.sop.payment.open.resp.PayOrderSearchResponse;
import com.gitee.sop.payment.open.resp.PayTradeWapPayResponse;
import com.gitee.sop.support.annotation.Open;
import io.swagger.annotations.Api;
@@ -15,13 +17,18 @@ import io.swagger.annotations.ApiOperation;
public interface OpenPayment {
@ApiOperation(
- value = "手机网站支付接口2.0",
+ value = "手机网站支付接口",
notes = "该接口是页面跳转接口，用于生成用户访问跳转链接。" +
"请在服务端执行SDK中pageExecute方法，读取响应中的body()结果。" +
"该结果用于跳转到页面，返回到用户浏览器渲染或重定向跳转到页面。" +
"具体使用方法请参考 接入指南"
)
- @Open(value = "pay.trade.wap.pay", version = "2.0")
+ @Open("pay.trade.wap.pay")
PayTradeWapPayResponse tradeWapPay(PayTradeWapPayRequest request);
+
+ @ApiOperation(value = "订单查询接口")
+ @Open("pay.order.search")
+ PayOrderSearchResponse orderSearch(PayOrderSearchRequest request);
+
}
diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayOrderSearchRequest.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayOrderSearchRequest.java
new file mode 100644
index 00000000..3981427f
--- /dev/null
+++ b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayOrderSearchRequest.java
@@ -0,0 +1,17 @@
+package com.gitee.sop.payment.open.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author 六如
+ */
+@Data
+public class PayOrderSearchRequest {
+
+ @ApiModelProperty(value = "订单编号", required = true, example = "xxxx")
+ @Length(max = 64) // 最大长度
+ private String orderNo;
+
+}
diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayTradeWapPayRequest.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayTradeWapPayRequest.java
index 2845053b..9b97eae3 100644
--- a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayTradeWapPayRequest.java
+++ b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayTradeWapPayRequest.java
@@ -10,7 +10,7 @@ import java.math.BigDecimal;
import java.util.List;
/**
- * alipay.trade.wap.pay(手机网站支付接口2.0)
+ * pay.trade.wap.pay(手机网站支付接口)
*
* @author 六如
* https://opendocs.alipay.com/open/29ae8cb6_alipay.trade.wap.pay?pathHash=1ef587fd&ref=api&scene=21
@@ -40,7 +40,7 @@ public class PayTradeWapPayRequest {
private String subject;
@ApiModelProperty(
- value = "销售产品码，商家和支付宝签约的产品码。手机网站支付为：QUICK_WAP_WAY",
+ value = "销售产品码，商家和支付平台签约的产品码。手机网站支付为：QUICK_WAP_WAY",
required = true,
example = "QUICK_WAP_WAY"
)
@@ -76,7 +76,7 @@ public class PayTradeWapPayRequest {
private String time_expire;
@ApiModelProperty(
- value = "商户传入业务信息，具体值要和支付宝约定，应用于安全，营销等参数直传场景，格式为json格式",
+ value = "商户传入业务信息，具体值要和支付平台约定，应用于安全，营销等参数直传场景，格式为json格式",
example = "{\"mc_create_trade_ip\":\"127.0.0.1\"}"
)
@Length(max = 512)
@@ -84,7 +84,7 @@ public class PayTradeWapPayRequest {
@ApiModelProperty(
- value = "公用回传参数，如果请求时传递了该参数，则返回给商户时会回传该参数。支付宝只会在同步返回（包括跳转回商户网站）和异步通知时将该参数原样返回。本参数必须进行UrlEncode之后才可以发送给支付宝。",
+ value = "公用回传参数，如果请求时传递了该参数，则返回给商户时会回传该参数。支付平台只会在同步返回（包括跳转回商户网站）和异步通知时将该参数原样返回。本参数必须进行UrlEncode之后才可以发送给支付平台。",
example = "merchantBizType%3d3C%26merchantBizNo%3d2016010101111"
)
@Length(max = 512)
@@ -137,7 +137,7 @@ public class PayTradeWapPayRequest {
private BigDecimal price;
@ApiModelProperty(
- value = "支付宝定义的统一商品编号",
+ value = "支付平台定义的统一商品编号",
example = "20010001"
)
@Length(max = 32)
diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayOrderSearchResponse.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayOrderSearchResponse.java
new file mode 100644
index 00000000..96d7c40b
--- /dev/null
+++ b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayOrderSearchResponse.java
@@ -0,0 +1,23 @@
+package com.gitee.sop.payment.open.resp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 六如
+ */
+@Data
+public class PayOrderSearchResponse {
+
+ @ApiModelProperty(value = "订单编号", example = "xxxx")
+ private String orderNo;
+
+ @ApiModelProperty(value = "支付编号", example = "xxxx")
+ private String payNo;
+
+ @ApiModelProperty(value = "支付人id", example = "111")
+ private Long payUserId;
+
+ @ApiModelProperty(value = "支付人姓名", example = "Jim")
+ private String payUserName;
+}
diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayTradeWapPayResponse.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayTradeWapPayResponse.java
index 0b54edfb..3b2ae2b8 100644
--- a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayTradeWapPayResponse.java
+++ b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayTradeWapPayResponse.java
@@ -10,7 +10,7 @@ import lombok.Data;
public class PayTradeWapPayResponse {
@ApiModelProperty(
- value = "用于跳转支付宝页面的信息，POST和GET方法生成内容不同：使用POST方法执行，结果为html form表单，在浏览器渲染即可；使用GET方法会得到支付宝URL，需要打开或重定向到该URL。建议使用POST方式。具体使用方法请参考",
+ value = "用于跳转支付平台页面的信息，POST和GET方法生成内容不同：使用POST方法执行，结果为html form表单，在浏览器渲染即可；使用GET方法会得到支付平台URL，需要打开或重定向到该URL。建议使用POST方式。具体使用方法请参考",
required = true,
example = "请参考响应示例"
)
diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/controller/IndexController.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/controller/IndexController.java
index c820d566..031f3f5a 100644
--- a/sop-gateway/src/main/java/com/gitee/sop/gateway/controller/IndexController.java
+++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/controller/IndexController.java
@@ -41,7 +41,7 @@ public class IndexController {
* @apiNote 参数描述
参数 类型 是否必填 最大长度 描述 示例值
- app_id String 是 32 支付宝分配给开发者的应用ID 2014072300007148
+ app_id String 是 32 平台分配给开发者的应用ID 2014072300007148
method String 是 128 接口名称 alipay.trade.fastpay.refund.query
format String 否 40 仅支持JSON JSON
charset String 是 10 请求使用的编码格式，如utf-8,gbk,gb2312等 utf-8
diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequest.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequest.java
index a9fafe01..9aac4acc 100644
--- a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequest.java
+++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequest.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
* 请求参数名定义
*
* 参数 类型 是否必填 最大长度 描述 示例值
- * app_id String 是 32 支付宝分配给开发者的应用ID 2014072300007148
+ * app_id String 是 32 平台分配给开发者的应用ID 2014072300007148
* method String 是 128 接口名称 alipay.trade.fastpay.refund.query
* format String 否 40 仅支持JSON JSON
* charset String 是 10 请求使用的编码格式，如utf-8,gbk,gb2312等 utf-8
@@ -20,7 +20,7 @@ import java.io.Serializable;
* sign String 是 344 商户请求参数的签名串，详见签名 详见示例
* timestamp String 是 19 发送请求的时间，格式"yyyy-MM-dd HH:mm:ss" 2014-07-24 03:07:50
* version String 是 3 调用的接口版本，固定为：1.0 1.0
- * notify_url String 否 256 支付宝服务器主动通知商户服务器里指定的页面http/https路径。 http://api.test.alipay.net/atinterface/receive_notify.htm
+ * notify_url String 否 256 平台服务器主动通知商户服务器里指定的页面http/https路径。 http://api.test.alipay.net/atinterface/receive_notify.htm
* app_auth_token String 否 40 详见应用授权概述
* biz_content String 是 请求参数的集合，最大长度不限，除公共参数外所有请求参数都必须放在这个参数中传递，具体参照各产品快速接入文档
*
@@ -99,7 +99,7 @@ public class ApiRequest implements Serializable {
private String version;
/**
- * 支付宝服务器主动通知商户服务器里指定的页面http/https路径
+ * 平台服务器主动通知商户服务器里指定的页面http/https路径
*
* @mock http://ww.xx.com/callback
*/
diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipayConstants.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipayConstants.java
deleted file mode 100644
index 40a8dc4e..00000000
--- a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipayConstants.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Alipay.com Inc.
- * Copyright (c) 2004-2012 All Rights Reserved.
- */
-package com.gitee.sop.gateway.service.validate.alipay;
-
-/**
- *
- * @author runzhi
- */
-public class AlipayConstants {
-
- public static final String SIGN_TYPE = "sign_type";
-
- public static final String SIGN_TYPE_RSA = "RSA";
-
- /**
- * sha256WithRsa 算法请求类型
- */
- public static final String SIGN_TYPE_RSA2 = "RSA2";
-
- public static final String SIGN_ALGORITHMS = "SHA1WithRSA";
-
- public static final String SIGN_SHA256RSA_ALGORITHMS = "SHA256WithRSA";
-
- public static final String ENCRYPT_TYPE_AES = "AES";
-
- public static final String APP_ID = "app_id";
-
- public static final String FORMAT = "format";
-
- public static final String METHOD = "method";
-
- public static final String TIMESTAMP = "timestamp";
-
- public static final String VERSION = "version";
-
- public static final String SIGN = "sign";
-
- public static final String ALIPAY_SDK = "alipay_sdk";
-
- public static final String ACCESS_TOKEN = "auth_token";
-
- public static final String APP_AUTH_TOKEN = "app_auth_token";
-
- public static final String TERMINAL_TYPE = "terminal_type";
-
- public static final String TERMINAL_INFO = "terminal_info";
-
- public static final String CHARSET = "charset";
-
- public static final String NOTIFY_URL = "notify_url";
-
- public static final String RETURN_URL = "return_url";
-
- public static final String ENCRYPT_TYPE = "encrypt_type";
-
- //-----===-------///
-
- public static final String BIZ_CONTENT_KEY = "biz_content";
-
- /** 默认时间格式 **/
- public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
-
- /** Date默认时区 **/
- public static final String DATE_TIMEZONE = "GMT+8";
-
- /** UTF-8字符集 **/
- public static final String CHARSET_UTF8 = "UTF-8";
-
- /** GBK字符集 **/
- public static final String CHARSET_GBK = "GBK";
-
- /** JSON 应格式 */
- public static final String FORMAT_JSON = "json";
-
- /** XML 应格式 */
- public static final String FORMAT_XML = "xml";
-
- /** SDK版本号 */
- public static final String SDK_VERSION = "alipay-sdk-java-3.6.0.ALL";
-
- public static final String PROD_CODE = "prod_code";
-
- /** 老版本失败节点 */
- public static final String ERROR_RESPONSE = "error_response";
-
- /** 新版本节点后缀 */
- public static final String RESPONSE_SUFFIX = "_response";
-
- /** 加密后XML返回报文的节点名字 */
- public static final String RESPONSE_XML_ENCRYPT_NODE_NAME = "response_encrypted";
-
- /** 批量请求id **/
- public static final String BATCH_REQUEST_ID = "batch_request_id";
-
-}
diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/StreamUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/StreamUtil.java
deleted file mode 100644
index c4435eec..00000000
--- a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/StreamUtil.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Alipay.com Inc.
- * Copyright (c) 2004-2012 All Rights Reserved.
- */
-package com.gitee.sop.gateway.service.validate.alipay;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-
-/**
- * @author runzhi
- */
-public class StreamUtil {
- private StreamUtil() {
- }
-
- private static final int DEFAULT_BUFFER_SIZE = 8192;
-
- public static void io(InputStream in, OutputStream out) throws IOException {
- io(in, out, -1);
- }
-
- public static void io(InputStream in, OutputStream out, int bufferSize) throws IOException {
- if (bufferSize == -1) {
- bufferSize = DEFAULT_BUFFER_SIZE;
- }
-
- byte[] buffer = new byte[bufferSize];
- int amount;
-
- while ((amount = in.read(buffer)) >= 0) {
- out.write(buffer, 0, amount);
- }
- }
-
- public static void io(Reader in, Writer out) throws IOException {
- io(in, out, -1);
- }
-
- public static void io(Reader in, Writer out, int bufferSize) throws IOException {
- if (bufferSize == -1) {
- bufferSize = DEFAULT_BUFFER_SIZE >> 1;
- }
-
- char[] buffer = new char[bufferSize];
- int amount;
-
- while ((amount = in.read(buffer)) >= 0) {
- out.write(buffer, 0, amount);
- }
- }
-
- public static OutputStream synchronizedOutputStream(OutputStream out) {
- return new SynchronizedOutputStream(out);
- }
-
- public static OutputStream synchronizedOutputStream(OutputStream out, Object lock) {
- return new SynchronizedOutputStream(out, lock);
- }
-
- public static String readText(InputStream in) throws IOException {
- return readText(in, null, -1);
- }
-
- public static String readText(InputStream in, String encoding) throws IOException {
- return readText(in, encoding, -1);
- }
-
- public static String readText(InputStream in, String encoding, int bufferSize)
- throws IOException {
- Reader reader = (encoding == null) ? new InputStreamReader(in) : new InputStreamReader(in,
- encoding);
-
- return readText(reader, bufferSize);
- }
-
- public static String readText(Reader reader) throws IOException {
- return readText(reader, -1);
- }
-
- public static String readText(Reader reader, int bufferSize) throws IOException {
- StringWriter writer = new StringWriter();
-
- io(reader, writer, bufferSize);
- return writer.toString();
- }
-
- private static class SynchronizedOutputStream extends OutputStream {
- private OutputStream out;
- private Object lock;
-
- SynchronizedOutputStream(OutputStream out) {
- this(out, out);
- }
-
- SynchronizedOutputStream(OutputStream out, Object lock) {
- this.out = out;
- this.lock = lock;
- }
-
- @Override
- public void write(int datum) throws IOException {
- synchronized (lock) {
- out.write(datum);
- }
- }
-
- @Override
- public void write(byte[] data) throws IOException {
- synchronized (lock) {
- out.write(data);
- }
- }
-
- @Override
- public void write(byte[] data, int offset, int length) throws IOException {
- synchronized (lock) {
- out.write(data, offset, length);
- }
- }
-
- @Override
- public void flush() throws IOException {
- synchronized (lock) {
- out.flush();
- }
- }
-
- @Override
- public void close() throws IOException {
- synchronized (lock) {
- out.close();
- }
- }
- }
-}
diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/StringUtils.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/StringUtils.java
deleted file mode 100644
index 419cef65..00000000
--- a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/StringUtils.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.gitee.sop.gateway.service.validate.alipay;
-
-/**
- * 字符串工具类。
- *
- * @author carver.gu
- * @since 1.0, Sep 12, 2009
- */
-public final class StringUtils {
-
- private StringUtils() {
- }
-
- /**
- * 检查指定的字符串是否为空。
- *
- * - SysUtils.isEmpty(null) = true
- * - SysUtils.isEmpty("") = true
- * - SysUtils.isEmpty(" ") = true
- * - SysUtils.isEmpty("abc") = false
- *
- *
- * @param value 待检查的字符串
- * @return true/false
- */
- public static boolean isEmpty(String value) {
- if (value == null || value.length() == 0) {
- return true;
- }
- for (int i = 0; i < value.length(); i++) {
- if (!Character.isWhitespace(value.charAt(i))) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * 检查对象是否为数字型字符串,包含负数开头的。
- */
- public static boolean isNumeric(Object obj) {
- if (obj == null) {
- return false;
- }
- char[] chars = obj.toString().toCharArray();
- int length = chars.length;
- if (length < 1) {
- return false;
- }
-
- int i = 0;
- if (length > 1 && chars[0] == '-') {
- i = 1;
- }
-
- for (; i < length; i++) {
- if (!Character.isDigit(chars[i])) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * 检查指定的字符串列表是否不为空。
- */
- public static boolean areNotEmpty(String... values) {
- boolean result = true;
- if (values == null || values.length == 0) {
- result = false;
- } else {
- for (String value : values) {
- result &= !isEmpty(value);
- }
- }
- return result;
- }
-
- /**
- * 把通用字符编码的字符串转化为汉字编码。
- */
- public static String unicodeToChinese(String unicode) {
- StringBuilder out = new StringBuilder();
- if (!isEmpty(unicode)) {
- for (int i = 0; i < unicode.length(); i++) {
- out.append(unicode.charAt(i));
- }
- }
- return out.toString();
- }
-
- /**
- * 过滤不可见字符
- */
- public static String stripNonValidXMLCharacters(String input) {
- if (input == null || ("".equals(input))) {
- return "";
- }
- StringBuilder out = new StringBuilder();
- char current;
- for (int i = 0; i < input.length(); i++) {
- current = input.charAt(i);
- if ((current == 0x9) || (current == 0xA) || (current == 0xD)
- || ((current >= 0x20) && (current <= 0xD7FF))
- || ((current >= 0xE000) && (current <= 0xFFFD))
- || ((current >= 0x10000) && (current <= 0x10FFFF))) {
- out.append(current);
- }
- }
- return out.toString();
- }
-
- public static String leftPad(String str, int size, char padChar) {
- if (str == null) {
- return null;
- } else {
- int pads = size - str.length();
- if (pads <= 0) {
- return str;
- } else {
- return pads > 8192 ? leftPad(str, size, String.valueOf(padChar)) : padding(pads, padChar).concat(str);
- }
- }
- }
-
- public static String leftPad(String str, int size, String padStr) {
- if (str == null) {
- return null;
- } else {
- if (isEmpty(padStr)) {
- padStr = " ";
- }
-
- int padLen = padStr.length();
- int strLen = str.length();
- int pads = size - strLen;
- if (pads <= 0) {
- return str;
- } else if (padLen == 1 && pads <= 8192) {
- return leftPad(str, size, padStr.charAt(0));
- } else if (pads == padLen) {
- return padStr.concat(str);
- } else if (pads < padLen) {
- return padStr.substring(0, pads).concat(str);
- } else {
- char[] padding = new char[pads];
- char[] padChars = padStr.toCharArray();
-
- for (int i = 0; i < pads; ++i) {
- padding[i] = padChars[i % padLen];
- }
-
- return (new String(padding)).concat(str);
- }
- }
- }
-
- private static String padding(int repeat, char padChar) {
- if (repeat < 0) {
- throw new IndexOutOfBoundsException("Cannot pad a negative amount: " + repeat);
- } else {
- char[] buf = new char[repeat];
-
- for (int i = 0; i < buf.length; ++i) {
- buf[i] = padChar;
- }
-
- return new String(buf);
- }
- }
-}
diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySigner.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/PlatformSigner.java
similarity index 91%
rename from sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySigner.java
rename to sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/PlatformSigner.java
index 534f9d3b..4ba660cb 100644
--- a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySigner.java
+++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/PlatformSigner.java
@@ -1,4 +1,4 @@
-package com.gitee.sop.gateway.service.validate.alipay;
+package com.gitee.sop.gateway.service.validate.sign;
import com.gitee.sop.gateway.config.ApiConfig;
@@ -16,14 +16,14 @@ import java.util.HashMap;
import java.util.Map;
/**
- * 支付宝签名验证实现。
+ * 平台签名验证实现。
*
* @author 六如
- * @see 支付宝签名
+ * @see 平台签名
*/
@Slf4j
@Component
-public class AlipaySigner implements Signer {
+public class PlatformSigner implements Signer {
@Autowired
private ApiConfig apiConfig;
@@ -42,7 +42,7 @@ public class AlipaySigner implements Signer {
}
Map params = buildParams(apiRequest);
try {
- return AlipaySignature.rsaCheckV2(params, publicKey, charset, signType, apiConfig);
+ return SignUtil.rsaCheckV2(params, publicKey, charset, signType, apiConfig);
} catch (SignException e) {
ErrorEnum errorEnum = e.getErrorEnum();
log.error("验签错误, code={}, subCode={}, apiRequest={}",
diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySignature.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/SignUtil.java
similarity index 88%
rename from sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySignature.java
rename to sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/SignUtil.java
index 66dfcef3..b11e539e 100644
--- a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySignature.java
+++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/SignUtil.java
@@ -2,7 +2,7 @@
* Alipay.com Inc.
* Copyright (c) 2004-2012 All Rights Reserved.
*/
-package com.gitee.sop.gateway.service.validate.alipay;
+package com.gitee.sop.gateway.service.validate.sign;
import com.gitee.sop.gateway.config.ApiConfig;
@@ -10,6 +10,8 @@ import com.gitee.sop.gateway.exception.SignException;
import com.gitee.sop.gateway.message.ErrorEnum;
import com.gitee.sop.gateway.service.validate.SignConfig;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.crypto.Cipher;
import java.io.ByteArrayInputStream;
@@ -17,6 +19,7 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.PrivateKey;
import java.security.PublicKey;
@@ -31,7 +34,13 @@ import java.util.Map;
/**
* @author runzhi
*/
-public class AlipaySignature {
+public class SignUtil {
+
+ private static final String SIGN_TYPE_RSA = "RSA";
+ private static final String SIGN_TYPE_RSA2 = "RSA2";
+ private static final String SIGN_ALGORITHMS = "SHA1WithRSA";
+ private static final String SIGN_SHA256RSA_ALGORITHMS = "SHA256WithRSA";
+ private static final String CHARSET_GBK = "GBK";
/**
* RSA最大加密明文大小
@@ -45,19 +54,20 @@ public class AlipaySignature {
/**
- * @param sortedParams
- * @return
+ * 返回签名内容
+ *
+ * @param params 入参
+ * @return 返回签名内容
*/
- public static String getSignContent(Map sortedParams) {
- StringBuffer content = new StringBuffer();
- List keys = new ArrayList(sortedParams.keySet());
+ public static String getSignContent(Map params) {
+ StringBuilder content = new StringBuilder();
+ List keys = new ArrayList(params.keySet());
Collections.sort(keys);
int index = 0;
- for (int i = 0; i < keys.size(); i++) {
- String key = keys.get(i);
- String value = String.valueOf(sortedParams.get(key));
- if (StringUtils.areNotEmpty(key, value)) {
- content.append((index == 0 ? "" : "&") + key + "=" + value);
+ for (String key : keys) {
+ String value = String.valueOf(params.get(key));
+ if (!StringUtils.isAnyBlank(key, value)) {
+ content.append(index == 0 ? "" : "&").append(key).append("=").append(value);
index++;
}
}
@@ -67,17 +77,17 @@ public class AlipaySignature {
/**
* rsa内容签名
*
- * @param content
- * @param publicKey
- * @param charset
- * @return
+ * @param content 内容
+ * @param publicKey 公钥
+ * @param charset 字符集
+ * @return 返回签名串
*/
public static String rsaSign(String content, String publicKey, String charset,
String signType) throws SignException {
- if (AlipayConstants.SIGN_TYPE_RSA.equals(signType)) {
+ if (SIGN_TYPE_RSA.equals(signType)) {
return rsaSign(content, publicKey, charset);
- } else if (AlipayConstants.SIGN_TYPE_RSA2.equals(signType)) {
+ } else if (SIGN_TYPE_RSA2.equals(signType)) {
return rsa256Sign(content, publicKey, charset);
} else {
throw new SignException(ErrorEnum.ISV_INVALID_SIGNATURE_TYPE);
@@ -88,20 +98,20 @@ public class AlipaySignature {
/**
* sha256WithRsa 加签
*
- * @param content
- * @param privateKey
- * @param charset
- * @return
+ * @param content 内容
+ * @param privateKey 私钥
+ * @param charset 字符集
+ * @return 返回签名串
*/
public static String rsa256Sign(String content, String privateKey,
String charset) throws SignException {
try {
- PrivateKey priKey = getPrivateKeyFromPKCS8(AlipayConstants.SIGN_TYPE_RSA,
+ PrivateKey priKey = getPrivateKeyFromPKCS8(SIGN_TYPE_RSA,
new ByteArrayInputStream(privateKey.getBytes()));
java.security.Signature signature = java.security.Signature
- .getInstance(AlipayConstants.SIGN_SHA256RSA_ALGORITHMS);
+ .getInstance(SIGN_SHA256RSA_ALGORITHMS);
signature.initSign(priKey);
@@ -123,19 +133,19 @@ public class AlipaySignature {
/**
* sha1WithRsa 加签
*
- * @param content
- * @param publicKey
- * @param charset
- * @return
+ * @param content 内容
+ * @param publicKey 公钥
+ * @param charset 字符集
+ * @return 返回签名串
*/
public static String rsaSign(String content, String publicKey,
String charset) throws SignException {
try {
- PrivateKey priKey = getPrivateKeyFromPKCS8(AlipayConstants.SIGN_TYPE_RSA,
+ PrivateKey priKey = getPrivateKeyFromPKCS8(SIGN_TYPE_RSA,
new ByteArrayInputStream(publicKey.getBytes()));
java.security.Signature signature = java.security.Signature
- .getInstance(AlipayConstants.SIGN_ALGORITHMS);
+ .getInstance(SIGN_ALGORITHMS);
signature.initSign(priKey);
@@ -171,7 +181,7 @@ public class AlipaySignature {
KeyFactory keyFactory = KeyFactory.getInstance(algorithm);
- byte[] encodedKey = StreamUtil.readText(ins, "UTF-8").getBytes();
+ byte[] encodedKey = IOUtils.toString(ins, StandardCharsets.UTF_8).getBytes();
encodedKey = Base64.decodeBase64(encodedKey);
@@ -253,11 +263,11 @@ public class AlipaySignature {
public static boolean rsaCheck(String content, String sign, String publicKey, String charset,
String signType) throws SignException {
- if (AlipayConstants.SIGN_TYPE_RSA.equals(signType)) {
+ if (SIGN_TYPE_RSA.equals(signType)) {
return rsaCheckContent(content, sign, publicKey, charset);
- } else if (AlipayConstants.SIGN_TYPE_RSA2.equals(signType)) {
+ } else if (SIGN_TYPE_RSA2.equals(signType)) {
return rsa256CheckContent(content, sign, publicKey, charset);
@@ -274,7 +284,7 @@ public class AlipaySignature {
new ByteArrayInputStream(publicKey.getBytes()));
java.security.Signature signature = java.security.Signature
- .getInstance(AlipayConstants.SIGN_SHA256RSA_ALGORITHMS);
+ .getInstance(SIGN_SHA256RSA_ALGORITHMS);
signature.initVerify(pubKey);
@@ -297,7 +307,7 @@ public class AlipaySignature {
new ByteArrayInputStream(publicKey.getBytes()));
java.security.Signature signature = java.security.Signature
- .getInstance(AlipayConstants.SIGN_ALGORITHMS);
+ .getInstance(SIGN_ALGORITHMS);
signature.initVerify(pubKey);
@@ -318,7 +328,7 @@ public class AlipaySignature {
KeyFactory keyFactory = KeyFactory.getInstance(algorithm);
StringWriter writer = new StringWriter();
- StreamUtil.io(new InputStreamReader(ins), writer);
+ IOUtils.copy(new InputStreamReader(ins), writer);
byte[] encodedKey = writer.toString().getBytes();
@@ -331,7 +341,7 @@ public class AlipaySignature {
* 验签并解密
*
* @param params 参数
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param isCheckSign 是否验签
* @param isDecrypt 是否解密
@@ -359,7 +369,7 @@ public class AlipaySignature {
* 验签并解密
*
* @param params 参数
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param isCheckSign 是否验签
* @param isDecrypt 是否解密
@@ -388,7 +398,7 @@ public class AlipaySignature {
* 目前适用于公众号
*
* @param bizContent 待加密、签名内容
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param charset 字符集，如UTF-8, GBK, GB2312
* @param isEncrypt 是否加密，true-加密 false-不加密
@@ -409,7 +419,7 @@ public class AlipaySignature {
boolean isSign) throws SignException {
StringBuilder sb = new StringBuilder();
if (StringUtils.isEmpty(charset)) {
- charset = AlipayConstants.CHARSET_GBK;
+ charset = CHARSET_GBK;
}
sb.append("");
if (isEncrypt) {
@@ -444,7 +454,7 @@ public class AlipaySignature {
* 目前适用于公众号
*
* @param bizContent 待加密、签名内容
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param charset 字符集，如UTF-8, GBK, GB2312
* @param isEncrypt 是否加密，true-加密 false-不加密
@@ -465,7 +475,7 @@ public class AlipaySignature {
boolean isSign, String signType) throws SignException {
StringBuilder sb = new StringBuilder();
if (StringUtils.isEmpty(charset)) {
- charset = AlipayConstants.CHARSET_GBK;
+ charset = CHARSET_GBK;
}
sb.append("");
if (isEncrypt) {
@@ -510,9 +520,9 @@ public class AlipaySignature {
public static String rsaEncrypt(String content, String publicKey,
String charset) throws SignException {
try {
- PublicKey pubKey = getPublicKeyFromX509(AlipayConstants.SIGN_TYPE_RSA,
+ PublicKey pubKey = getPublicKeyFromX509(SIGN_TYPE_RSA,
new ByteArrayInputStream(publicKey.getBytes()));
- Cipher cipher = Cipher.getInstance(AlipayConstants.SIGN_TYPE_RSA);
+ Cipher cipher = Cipher.getInstance(SIGN_TYPE_RSA);
cipher.init(Cipher.ENCRYPT_MODE, pubKey);
byte[] data = StringUtils.isEmpty(charset) ? content.getBytes()
: content.getBytes(charset);
@@ -553,9 +563,9 @@ public class AlipaySignature {
public static String rsaDecrypt(String content, String publicKey,
String charset) throws SignException {
try {
- PrivateKey priKey = getPrivateKeyFromPKCS8(AlipayConstants.SIGN_TYPE_RSA,
+ PrivateKey priKey = getPrivateKeyFromPKCS8(SIGN_TYPE_RSA,
new ByteArrayInputStream(publicKey.getBytes()));
- Cipher cipher = Cipher.getInstance(AlipayConstants.SIGN_TYPE_RSA);
+ Cipher cipher = Cipher.getInstance(SIGN_TYPE_RSA);
cipher.init(Cipher.DECRYPT_MODE, priKey);
byte[] encryptedData = StringUtils.isEmpty(charset)
? Base64.decodeBase64(content.getBytes())
diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenClient.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenClient.java
index 5f28c27d..d91fd3bc 100644
--- a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenClient.java
+++ b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenClient.java
@@ -12,7 +12,7 @@ import com.gitee.sop.sdk.common.SopSdkErrors;
import com.gitee.sop.sdk.exception.SdkException;
import com.gitee.sop.sdk.request.BaseRequest;
import com.gitee.sop.sdk.sign.SopSignException;
-import com.gitee.sop.sdk.sign.SopSignature;
+import com.gitee.sop.sdk.sign.SignUtil;
import com.gitee.sop.sdk.sign.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -155,10 +155,10 @@ public class OpenClient {
}
form.put(this.openConfig.getAppKeyName(), this.appId);
- String content = SopSignature.getSignContent(form);
+ String content = SignUtil.getSignContent(form);
String sign;
try {
- sign = SopSignature.rsaSign(content, privateKey, openConfig.getCharset(), openConfig.getSignType());
+ sign = SignUtil.rsaSign(content, privateKey, openConfig.getCharset(), openConfig.getSignType());
} catch (SopSignException e) {
throw new SdkException("构建签名错误", e);
}
@@ -168,7 +168,7 @@ public class OpenClient {
String resp = doExecute(this.url, requestForm, Collections.emptyMap());
if (log.isDebugEnabled()) {
log.debug("----------- 请求信息 -----------"
- + "\n请求参数：" + SopSignature.getSignContent(form)
+ + "\n请求参数：" + SignUtil.getSignContent(form)
+ "\n待签名内容：" + content
+ "\n签名(sign)：" + sign
+ "\n----------- 返回结果 -----------"
@@ -274,7 +274,7 @@ public class OpenClient {
try {
String charset = this.openConfig.getCharset();
String signType = this.openConfig.getSignType();
- return SopSignature.rsaCheck(signContent, sign, publicKeyPlatform, charset, signType);
+ return SignUtil.rsaCheck(signContent, sign, publicKeyPlatform, charset, signType);
} catch (SopSignException e) {
log.error("验证服务端sign出错，signContent：" + signContent, e);
return false;
diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SopSignature.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SignUtil.java
similarity index 98%
rename from sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SopSignature.java
rename to sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SignUtil.java
index 811ae669..8b11676d 100644
--- a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SopSignature.java
+++ b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SignUtil.java
@@ -22,10 +22,9 @@ import java.util.List;
import java.util.Map;
/**
- *
- * @author runzhi
+ * 签名工具
*/
-public class SopSignature {
+public class SignUtil {
/** RSA最大加密明文大小 */
private static final int MAX_ENCRYPT_BLOCK = 117;
@@ -49,20 +48,19 @@ public class SopSignature {
/**
- *
+ * 获取签名内容
* @param sortedParams
* @return
*/
public static String getSignContent(Map sortedParams) {
- StringBuffer content = new StringBuffer();
+ StringBuilder content = new StringBuilder();
List keys = new ArrayList(sortedParams.keySet());
Collections.sort(keys);
int index = 0;
- for (int i = 0; i < keys.size(); i++) {
- String key = keys.get(i);
+ for (String key : keys) {
String value = String.valueOf(sortedParams.get(key));
if (StringUtils.areNotEmpty(key, value)) {
- content.append((index == 0 ? "" : "&") + key + "=" + value);
+ content.append(index == 0 ? "" : "&").append(key).append("=").append(value);
index++;
}
}
@@ -71,7 +69,7 @@ public class SopSignature {
/**
* rsa内容签名
- *
+ *
* @param content
* @param privateKey
* @param charset
@@ -96,7 +94,7 @@ public class SopSignature {
/**
* sha256WithRsa 加签
- *
+ *
* @param content
* @param privateKey
* @param charset
@@ -132,7 +130,7 @@ public class SopSignature {
/**
* sha1WithRsa 加签
- *
+ *
* @param content
* @param privateKey
* @param charset
@@ -237,12 +235,12 @@ public class SopSignature {
return rsaCheckContent(content, sign, publicKey, charset);
}
-
+
public static boolean rsaCheckV1(Map params, String publicKey,
String charset,String signType) throws SopSignException {
String sign = params.get("sign");
String content = getSignCheckContentV1(params);
-
+
return rsaCheck(content, sign, publicKey, charset,signType);
}
@@ -253,12 +251,12 @@ public class SopSignature {
return rsaCheckContent(content, sign, publicKey, charset);
}
-
+
public static boolean rsaCheckV2(Map params, String publicKey,
String charset,String signType) throws SopSignException {
String sign = String.valueOf(params.get("sign"));
String content = getSignCheckContentV2(params);
-
+
return rsaCheck(content, sign, publicKey, charset,signType);
}
@@ -379,7 +377,7 @@ public class SopSignature {
return bizContent;
}
-
+
/**
* 验签并解密
*
@@ -470,7 +468,7 @@ public class SopSignature {
}
return sb.toString();
}
-
+
/**
* 加密并签名
* 目前适用于公众号
@@ -530,7 +528,7 @@ public class SopSignature {
/**
* 公钥加密
- *
+ *
* @param content 待加密内容
* @param publicKey 公钥
* @param charset 字符集，如UTF-8, GBK, GB2312
@@ -551,7 +549,7 @@ public class SopSignature {
int offSet = 0;
byte[] cache;
int i = 0;
- // 对数据分段加密
+ // 对数据分段加密
while (inputLen - offSet > 0) {
if (inputLen - offSet > MAX_ENCRYPT_BLOCK) {
cache = cipher.doFinal(data, offSet, MAX_ENCRYPT_BLOCK);
@@ -575,7 +573,7 @@ public class SopSignature {
/**
* 私钥解密
- *
+ *
* @param content 待解密内容
* @param privateKey 私钥
* @param charset 字符集，如UTF-8, GBK, GB2312
@@ -597,7 +595,7 @@ public class SopSignature {
int offSet = 0;
byte[] cache;
int i = 0;
- // 对数据分段解密
+ // 对数据分段解密
while (inputLen - offSet > 0) {
if (inputLen - offSet > MAX_DECRYPT_BLOCK) {
cache = cipher.doFinal(encryptedData, offSet, MAX_DECRYPT_BLOCK);
diff --git a/sop-test/src/main/java/com/gitee/sop/test/alipay/AlipaySignature.java b/sop-test/src/main/java/com/gitee/sop/test/alipay/AlipaySignature.java
index 2836f113..913242ad 100644
--- a/sop-test/src/main/java/com/gitee/sop/test/alipay/AlipaySignature.java
+++ b/sop-test/src/main/java/com/gitee/sop/test/alipay/AlipaySignature.java
@@ -345,7 +345,7 @@ public class AlipaySignature {
*
}
*
* @param params
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param isCheckSign 是否验签
* @param isDecrypt 是否解密
@@ -383,7 +383,7 @@ public class AlipaySignature {
*
}
*
* @param params
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param isCheckSign 是否验签
* @param isDecrypt 是否解密
@@ -412,7 +412,7 @@ public class AlipaySignature {
* 加密并签名
* 目前适用于公众号
* @param bizContent 待加密、签名内容
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param charset 字符集，如UTF-8, GBK, GB2312
* @param isEncrypt 是否加密，true-加密 false-不加密
@@ -465,7 +465,7 @@ public class AlipaySignature {
* 加密并签名
* 目前适用于公众号
* @param bizContent 待加密、签名内容
- * @param alipayPublicKey 支付宝公钥
+ * @param alipayPublicKey 平台公钥
* @param cusPrivateKey 商户私钥
* @param charset 字符集，如UTF-8, GBK, GB2312
* @param isEncrypt 是否加密，true-加密 false-不加密
diff --git a/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java b/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java
index 2b28dce8..fe98fc52 100644
--- a/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java
+++ b/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java
@@ -10,7 +10,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * 模仿支付宝客户端请求接口
+ * 客户端请求接口
*/
public class AlipayClientPostTest extends TestBase {
@@ -21,7 +21,7 @@ public class AlipayClientPostTest extends TestBase {
/**
参数 类型 是否必填 最大长度 描述 示例值
- app_id String 是 32 支付宝分配给开发者的应用ID 2014072300007148
+ app_id String 是 32 平台分配给开发者的应用ID 2014072300007148
method String 是 128 接口名称 alipay.trade.fastpay.refund.query
format String 否 40 仅支持JSON JSON
charset String 是 10 请求使用的编码格式，如utf-8,gbk,gb2312等 utf-8
@@ -39,12 +39,12 @@ public class AlipayClientPostTest extends TestBase {
// 公共请求参数
Map params = new HashMap();
params.put("app_id", appId);
- params.put("method", "alipay.trade.wap.pay");
+ params.put("method", "pay.trade.wap.pay");
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", "2.0");
+ params.put("version", "1.0");
// 业务参数
Map bizContent = new HashMap<>();
diff --git a/sop-website/sop-website-frontend/src/views/doc/api/index.ts b/sop-website/sop-website-frontend/src/views/doc/api/index.ts
index 833b80ba..93a741f3 100644
--- a/sop-website/sop-website-frontend/src/views/doc/api/index.ts
+++ b/sop-website/sop-website-frontend/src/views/doc/api/index.ts
@@ -45,9 +45,13 @@ export const showSandBoxUrl = computed(() => {
return docDetail.value.docInfoConfig?.openSandboxUrl?.length > 0;
});
+export const showDoc = computed(() => {
+ return docDetail.value?.docInfoView?.url?.length > 0;
+});
+
/*
参数 类型 是否必填 最大长度 描述 示例值
- app_id String 是 32 支付宝分配给开发者的应用ID 2014072300007148
+ app_id String 是 32 平台分配给开发者的应用ID 2014072300007148
method String 是 128 接口名称 alipay.trade.fastpay.refund.query
format String 否 40 仅支持JSON JSON
charset String 是 10 请求使用的编码格式，如utf-8,gbk,gb2312等 utf-8
diff --git a/sop-website/sop-website-frontend/src/views/doc/api/index.vue b/sop-website/sop-website-frontend/src/views/doc/api/index.vue
index f927c7be..42a8f503 100644
--- a/sop-website/sop-website-frontend/src/views/doc/api/index.vue
+++ b/sop-website/sop-website-frontend/src/views/doc/api/index.vue
@@ -13,7 +13,8 @@ import {
handleNodeClick,
showUrl,
showProdUrl,
- showSandBoxUrl
+ showSandBoxUrl,
+ showDoc
} from "./index";
import { ApiParamTable } from "@/components/ApiParamTable";
import MavonEditor from "mavon-editor";
@@ -39,7 +40,7 @@ const defaultProps = {
:value="item.id"
/>
-