cf_cloud/wx-finance-sdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复段错误, 修复代理不生效

Browse Source
This commit is contained in:
pangdahua 2020-06-01 17:09:59 +08:00
parent cc26d5bff3
commit f2625b99f2
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wxwork_finance_sdk.c
View File

@ -33,7 +33,6 @@ ZEND_DECLARE_MODULE_GLOBALS(wxwork_finance_sdk)
/* True global resources - no need for thread safety here */ /* True global resources - no need for thread safety here */
static int le_wxwork_finance_sdk; static int le_wxwork_finance_sdk;
const static char *VERSION = "1.0";
static zend_class_entry *wxwork_finance_sdk_ce; static zend_class_entry *wxwork_finance_sdk_ce;
static zend_class_entry *wxwork_finance_sdk_exception_ce; static zend_class_entry *wxwork_finance_sdk_exception_ce;
@ -81,19 +80,15 @@ PHP_METHOD(WxworkFinanceSdk, __construct)
if (proxy_host_zval != NULL) { if (proxy_host_zval != NULL) {
zval *proxy_password_zval = zend_hash_find(Z_ARR_P(option_zval), zend_string_init("proxy_password", sizeof("proxy_password") - 1, 0)); zval *proxy_password_zval = zend_hash_find(Z_ARR_P(option_zval), zend_string_init("proxy_password", sizeof("proxy_password") - 1, 0));
zend_update_property_string(ce, this, "proxy_host", sizeof("proxy_host") - 1, Z_STRVAL_P(proxy_host_zval)); zend_update_property_string(ce, this, "_proxy_host", sizeof("_proxy_host") - 1, Z_STRVAL_P(proxy_host_zval));
if (proxy_password_zval != NULL) { if (proxy_password_zval != NULL) {
zend_update_property_string(ce, this, "proxy_password", sizeof("proxy_password") - 1, Z_STRVAL_P(proxy_password_zval)); zend_update_property_string(ce, this, "_proxy_password", sizeof("_proxy_password") - 1, Z_STRVAL_P(proxy_password_zval));
zval_ptr_dtor(proxy_password_zval);
} }
zval_ptr_dtor(proxy_host_zval);
} }
zval *timeout_zval = zend_hash_find(Z_ARR_P(option_zval), zend_string_init("timeout", sizeof("timeout") - 1, 0)); zval *timeout_zval = zend_hash_find(Z_ARR_P(option_zval), zend_string_init("timeout", sizeof("timeout") - 1, 0));
if (timeout_zval != NULL) { if (timeout_zval != NULL) {
zend_update_property_long(ce, this, "_timeout", sizeof("_timeout") - 1, zval_get_long(timeout_zval)); zend_update_property_long(ce, this, "_timeout", sizeof("_timeout") - 1, zval_get_long(timeout_zval));
zval_ptr_dtor(timeout_zval);
} }
} }
} }
@ -122,7 +117,6 @@ PHP_METHOD(WxworkFinanceSdk, getChatData)
zval *proxy_host_zval = zend_read_property(ce, this, "_proxy_host", sizeof("_proxy_host") - 1, 0, NULL); zval *proxy_host_zval = zend_read_property(ce, this, "_proxy_host", sizeof("_proxy_host") - 1, 0, NULL);
zval *proxy_password_zval = zend_read_property(ce, this, "_proxy_password", sizeof("_proxy_password") - 1, 0, NULL); zval *proxy_password_zval = zend_read_property(ce, this, "_proxy_password", sizeof("_proxy_password") - 1, 0, NULL);
zval *timeout_zval = zend_read_property(ce, this, "_timeout", sizeof("_timeout") - 1, 0, NULL); zval *timeout_zval = zend_read_property(ce, this, "_timeout", sizeof("_timeout") - 1, 0, NULL);
int ret = GetChatData(sdk, (int)seq, (int)limit, Z_STRVAL_P(proxy_host_zval), Z_STRVAL_P(proxy_password_zval), zval_get_long(timeout_zval), chat_data); int ret = GetChatData(sdk, (int)seq, (int)limit, Z_STRVAL_P(proxy_host_zval), Z_STRVAL_P(proxy_password_zval), zval_get_long(timeout_zval), chat_data);
if (0 != ret) { if (0 != ret) {
zend_throw_exception(wxwork_finance_sdk_exception_ce, "Call WeWorkFinanceSdk_t GetChatData error", ret); zend_throw_exception(wxwork_finance_sdk_exception_ce, "Call WeWorkFinanceSdk_t GetChatData error", ret);
@ -305,8 +299,6 @@ PHP_MINIT_FUNCTION(wxwork_finance_sdk)
// request timeout // request timeout
zend_declare_property_long(wxwork_finance_sdk_ce, "_timeout", sizeof("_timeout") - 1, 10, ZEND_ACC_PRIVATE); zend_declare_property_long(wxwork_finance_sdk_ce, "_timeout", sizeof("_timeout") - 1, 10, ZEND_ACC_PRIVATE);
zend_declare_class_constant_string(wxwork_finance_sdk_ce, "VERSION", sizeof("VERSION") - 1, VERSION);
return SUCCESS; return SUCCESS;
} }

5
wxwork_finance_sdk.php
View File

@ -1,11 +1,8 @@
<?php <?php
echo "version=", WxworkFinanceSdk::VERSION, PHP_EOL;
try { try {
$obj = new WxworkFinanceSdk("wwd08coe7d775abaaa", "zJ6k0naVVQ--gt9PUSSEvs03zW_nlDVmjAkPOTAfrew", [ $obj = new WxworkFinanceSdk("wwd08coe7d775abaaa", "zJ6k0naVVQ--gt9PUSSEvs03zW_nlDVmjAkPOTAfrew", [
"proxy_host" => "hello",
"proxy_password" => "world", "proxy_password" => "world",
"timeout" => -2, "timeout" => -2,
]); ]);
@ -13,7 +10,7 @@ $obj = new WxworkFinanceSdk("wwd08coe7d775abaaa", "zJ6k0naVVQ--gt9PUSSEvs03zW_nl
$privateKey = file_get_contents('private.pem'); $privateKey = file_get_contents('private.pem');
$chats = json_decode($obj->getChatData(0, 100), true); $chats = json_decode($obj->getChatData(0, 100), true);
var_dump($chats);
foreach ($chats['chatdata'] as $val) { foreach ($chats['chatdata'] as $val) {
$decryptRandKey = null; $decryptRandKey = null;
openssl_private_decrypt(base64_decode($val['encrypt_random_key']), $decryptRandKey, $privateKey, OPENSSL_PKCS1_PADDING); openssl_private_decrypt(base64_decode($val['encrypt_random_key']), $decryptRandKey, $privateKey, OPENSSL_PKCS1_PADDING);