From 8e65b7e626ddfeeb0294a623801804c0d7c69c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=89=E6=AD=86?= Date: Sat, 7 May 2022 11:25:40 +0800 Subject: [PATCH] update --- CHANGELOG | 12 ++++++- composer.json | 11 ++----- java/pom.xml | 2 +- .../com/alipay/easysdk/factory/Factory.java | 30 +---------------- .../easysdk/factory/MultipleFactory.java | 30 +---------------- .../alipay/easysdk/factory/FactoryTest.java | 32 ------------------- php/src/Kernel/AlipayConstants.php | 2 +- 7 files changed, 17 insertions(+), 102 deletions(-) delete mode 100644 java/src/test/java/com/alipay/easysdk/factory/FactoryTest.java diff --git a/CHANGELOG b/CHANGELOG index 0389c09..21d716d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,11 @@ 最新变更 -修复PHP7.4及其以上环境下，根证书解析报错的问题。 +java删除Factory.getClient方法 +php删除php中多余的composer包 Java版本 +2022-05-06 Version: 2.2.2 +1. 删除Factory.getClient方法 + 2021-09-04 Version: 2.2.1 1. 修复Okhttp Response没有主动关闭的问题。 @@ -114,6 +118,12 @@ Factory.Util.AES().Encrypt AES加密 PHP版本 +2022-05-06 Version: 2.2.2 +1. php删除php中多余的composer包 + +2021-09-24 Version: 2.2.1 +1. 修复PHP7.4及其以上环境下，根证书解析报错的问题。 + 2021-01-18 Version: 2.2.0 1. 增加sdkExecute功能。 2. 增加fileExecute功能。 diff --git a/composer.json b/composer.json index 6a1ecd6..2849fd3 100755 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name":"alipaysdk/easysdk", "description":"支付宝官方 Alipay Easy SDK", "type":"library", - "version":"2.2.1", + "version":"2.2.2", "authors":[ { "name":"junying.wjy", @@ -32,15 +32,8 @@ "ext-simplexml":"*", "ext-mbstring":"*", "ext-openssl":"*", - "pimple/pimple": "^3.0", - "xin/container":"^2.0.1", - "guzzlehttp/guzzle":">=6.3", - "psr/log": "^1.1", "ext-xmlwriter": "*", - "songshenzong/support": "^2.0", - "danielstjules/stringy": "^3.1", - "mtdowling/jmespath.php": "^2.4", - "adbario/php-dot-notation": "^2.2", + "guzzlehttp/guzzle":">=6.3", "alibabacloud/tea": "^3.1", "alibabacloud/tea-fileform": "^0.3.2" }, diff --git a/java/pom.xml b/java/pom.xml index 493e715..0de6929 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alipay.sdk alipay-easysdk - 2.2.1 + 2.2.2 Alipay Easy SDK https://open.alipay.com Alipay Easy SDK for Java diff --git a/java/src/main/java/com/alipay/easysdk/factory/Factory.java b/java/src/main/java/com/alipay/easysdk/factory/Factory.java index 0190e6f..12db128 100644 --- a/java/src/main/java/com/alipay/easysdk/factory/Factory.java +++ b/java/src/main/java/com/alipay/easysdk/factory/Factory.java @@ -11,8 +11,6 @@ import com.alipay.easysdk.kms.aliyun.AliyunKMSSigner; import com.aliyun.tea.TeaModel; -import java.lang.reflect.Constructor; - /** * 客户端工厂，用于快速配置和访问各种场景下的API Client * @@ -23,7 +21,7 @@ */ public class Factory { - public static final String SDK_VERSION = "alipay-easysdk-java-2.1.2"; + public static final String SDK_VERSION = "alipay-easysdk-java-2.2.2"; /** * 将一些初始化耗时较多的信息缓存在上下文中 @@ -48,32 +46,6 @@ public static void setOptions(Config options) { } } - /** - * 获取调用OpenAPI所需的客户端实例 - * 本方法用于调用SDK扩展包中的API Client下的方法 - * - * 注：返回的实例不可重复使用，只可用于单次调用 - * - * @param client API Client的类型对象 - * @return client实例，用于发起单次调用 - */ - public static T getClient(Class client) { - try { - Constructor constructor = client.getConstructor(Client.class); - context.setSdkVersion(getSdkVersion(client)); - return constructor.newInstance(new Client(context)); - } catch (Exception e) { - throw new RuntimeException("" + e.getMessage(), e); - } - } - - private static String getSdkVersion(Class client) { - return context.getSdkVersion() + "-" + client.getCanonicalName() - .replace("com.alipay.easysdk.", "") - .replace(".Client", "") - .replace(".", "-"); - } - /** * 支付能力相关 */ diff --git a/java/src/main/java/com/alipay/easysdk/factory/MultipleFactory.java b/java/src/main/java/com/alipay/easysdk/factory/MultipleFactory.java index b8a0fc8..67e5366 100644 --- a/java/src/main/java/com/alipay/easysdk/factory/MultipleFactory.java +++ b/java/src/main/java/com/alipay/easysdk/factory/MultipleFactory.java @@ -12,15 +12,13 @@ import com.alipay.easysdk.kms.aliyun.AliyunKMSSigner; import com.aliyun.tea.TeaModel; -import java.lang.reflect.Constructor; - /** * @author junying * @version : MultipleFactory.java, v 0.1 2020年12月23日 2:14 下午 junying Exp $ */ public class MultipleFactory { - public final String SDK_VERSION = "alipay-easysdk-java-2.1.2"; + public final String SDK_VERSION = "alipay-easysdk-java-2.2.2"; /** * 将一些初始化耗时较多的信息缓存在上下文中 @@ -45,32 +43,6 @@ public void setOptions(Config options) { } } - /** - * 获取调用OpenAPI所需的客户端实例 - * 本方法用于调用SDK扩展包中的API Client下的方法 - *

- * 注：返回的实例不可重复使用，只可用于单次调用 - * - * @param client API Client的类型对象 - * @return client实例，用于发起单次调用 - */ - public T getClient(Class client) { - try { - Constructor constructor = client.getConstructor(Client.class); - context.setSdkVersion(getSdkVersion(client)); - return constructor.newInstance(new Client(context)); - } catch (Exception e) { - throw new RuntimeException("" + e.getMessage(), e); - } - } - - private String getSdkVersion(Class client) { - return context.getSdkVersion() + "-" + client.getCanonicalName() - .replace("com.alipay.easysdk.", "") - .replace(".Client", "") - .replace(".", "-"); - } - /** * 获取支付通用API Client * diff --git a/java/src/test/java/com/alipay/easysdk/factory/FactoryTest.java b/java/src/test/java/com/alipay/easysdk/factory/FactoryTest.java deleted file mode 100644 index 89d5ae0..0000000 --- a/java/src/test/java/com/alipay/easysdk/factory/FactoryTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.alipay.easysdk.factory; - -import com.alipay.easysdk.TestAccount.Mini; -import com.alipay.easysdk.payment.common.Client; -import com.alipay.easysdk.payment.common.models.AlipayTradeRefundResponse; -import org.junit.Before; -import org.junit.Test; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; - -public class FactoryTest { - @Before - public void setUp() { - Factory.setOptions(Mini.CONFIG); - } - - @Test - public void testGetClient() throws Exception { - AlipayTradeRefundResponse response = Factory.getClient(Client.class).refund( - "64628156-f784-4572-9540-485b7c91b850", "0.01"); - - assertThat(response.code, is("10000")); - assertThat(response.msg, is("Success")); - assertThat(response.subCode, is(nullValue())); - assertThat(response.subMsg, is(nullValue())); - assertThat(response.httpBody, not(nullValue())); - assertThat(response.refundFee, is("0.01")); - } -} \ No newline at end of file diff --git a/php/src/Kernel/AlipayConstants.php b/php/src/Kernel/AlipayConstants.php index 6b16ee7..94d5921 100644 --- a/php/src/Kernel/AlipayConstants.php +++ b/php/src/Kernel/AlipayConstants.php @@ -28,7 +28,7 @@ class AlipayConstants const METHOD_FIELD = "method"; const RESPONSE_SUFFIX = "_response"; const ERROR_RESPONSE = "error_response"; - const SDK_VERSION = "alipay-easysdk-php-2.2.0"; + const SDK_VERSION = "alipay-easysdk-php-2.2.2"; /** * 默认字符集编码，EasySDK统一固定使用UTF-8编码，无需用户感知编码，用户面对的总是String而不是bytes