Skip to content

Commit 4aed1a2

Browse files
Merge pull request #146 from jdcloud-apigateway/master
starshield privatezone
2 parents 4592a7e + 77df1d9 commit 4aed1a2

259 files changed

Lines changed: 10414 additions & 40 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

jdcloud_sdk/services/cloudauth/client/CloudauthClient.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
2626
if config is None:
2727
config = Config('cloudauth.jdcloud-api.com')
2828

29-
super(CloudauthClient, self).__init__(credential, config, 'cloudauth', '1.0.3', logger)
29+
super(CloudauthClient, self).__init__(credential, config, 'cloudauth', '1.0.4', logger)

jdcloud_sdk/services/cloudauth/models/AccountInfo.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919

2020
class AccountInfo(object):
2121

22-
def __init__(self, orgName, bankCardNum, bankName, branchBankName, bankCode=None, cityCode=None, provinceCode=None):
22+
def __init__(self, orgName, bankCardNum, bankName, branchBankName, mobile=None, bankCode=None, cityCode=None, provinceCode=None):
2323
"""
24-
:param orgName: 组织名称
25-
:param bankCardNum: 银行卡号
24+
:param orgName: 机构名称
25+
:param bankCardNum: 企业银行账户
26+
:param mobile: (Optional) 企业手机号
2627
:param bankName: 银行名称
27-
:param branchBankName: 支行名称
28-
:param bankCode: (Optional) 银行代码
29-
:param cityCode: (Optional) 城市代码
30-
:param provinceCode: (Optional) 省份代码
28+
:param branchBankName: 开户行所在分行网点名称
29+
:param bankCode: (Optional) 开户行所在的银行编码
30+
:param cityCode: (Optional) 开户行所在的城市编码
31+
:param provinceCode: (Optional) 开户行所在的省份编码
3132
"""
3233

3334
self.orgName = orgName
3435
self.bankCardNum = bankCardNum
36+
self.mobile = mobile
3537
self.bankName = bankName
3638
self.branchBankName = branchBankName
3739
self.bankCode = bankCode

jdcloud_sdk/services/cloudauth/models/PersonalSpec.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class PersonalSpec(object):
2222
def __init__(self, checkType, personalUser, ):
2323
"""
2424
:param checkType: 认证方式(0 银行卡四要素,1 银行卡三要素,2 姓名身份证二要素,3 人像三要素,4 手机号三要素)
25+
选择其中一种方式,对应的参数则为必传项
2526
0 提交姓名、身份证号、银行卡号、手机号,与在银行开户时预留的信息比对
2627
1 提交姓名、身份证号、银行卡号,与在银行开户时预留的信息比对
2728
2 提交姓名、身份证号,与公安身份证信息比对

jdcloud_sdk/services/cloudauth/models/PersonalUser.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
class PersonalUser(object):
2121

22-
def __init__(self, name, idCard, bankcard, mobile, imgBase64, ):
22+
def __init__(self, name, idCard=None, bankcard=None, mobile=None, imgBase64=None):
2323
"""
2424
:param name: 姓名
25-
:param idCard: 身份证号码
26-
:param bankcard: 银行卡号
27-
:param mobile: 手机号
28-
:param imgBase64: 人像图片
25+
:param idCard: (Optional) 身份证号码
26+
:param bankcard: (Optional) 银行卡号
27+
:param mobile: (Optional) 手机号
28+
:param imgBase64: (Optional) 人像图片
2929
"""
3030

3131
self.name = name

jdcloud_sdk/services/cloudsign/client/CloudsignClient.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
2626
if config is None:
2727
config = Config('cloudsign.jdcloud-api.com')
2828

29-
super(CloudsignClient, self).__init__(credential, config, 'cloudsign', '1.1.1', logger)
29+
super(CloudsignClient, self).__init__(credential, config, 'cloudsign', '1.1.2', logger)

jdcloud_sdk/services/kms/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
| 发布时间 | 版本号 | 更新 | 说明 |
55
| ---------------| -----------|-----------|---------|
6+
| 2021-02-08 | 0.3.3 | createKey 接口, keyCfg -> keyRotateCfg 非必传参数| |
7+
| 2020-08-27 | 0.3.1 | 版本更新 | |
68
| 2019-11-19 | 0.3.0 | 功能修复 | |
79
| 2019-03-05 | 0.2.0 | 支持非对称密钥 | |
810
| 2018-08-01 | 0.1.1 | 优化函数名称 | |

jdcloud_sdk/services/kms/client/KmsClient.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
2626
if config is None:
2727
config = Config('kms.jdcloud-api.com')
2828

29-
super(KmsClient, self).__init__(credential, config, 'kms', '0.3.1', logger)
29+
super(KmsClient, self).__init__(credential, config, 'kms', '0.3.3', logger)

jdcloud_sdk/services/kms/models/KeyCfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
class KeyCfg(object):
2121

22-
def __init__(self, keyDescCfg, keyRotateCfg, ):
22+
def __init__(self, keyDescCfg, keyRotateCfg=None):
2323
"""
2424
:param keyDescCfg: 密钥描述配置
25-
:param keyRotateCfg: 对称密钥的轮换配置;非对称密钥的操作,不支持该配置
25+
:param keyRotateCfg: (Optional) 对称密钥的轮换配置;非对称密钥的操作,不支持该配置
2626
"""
2727

2828
self.keyDescCfg = keyDescCfg

jdcloud_sdk/services/kms/models/KeyDescCfg.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ def __init__(self, keyName, keyDesc, keyType=None):
2323
"""
2424
:param keyName: key名称,默认为""
2525
:param keyDesc: key描述,默认为""
26-
:param keyType: (Optional) 密钥类型: 1: rsa-2048, 0: aes-256,default: aes-256
26+
:param keyType: (Optional) 密钥类型:
27+
0: aes-256,default
28+
1: rsa-2048,
29+
2: reserved
30+
3: SM3-HMAC
31+
4: SM4
32+
2733
"""
2834

2935
self.keyName = keyName
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# 更新历史 #
2+
API版本:0.0.1
3+
4+
| 发布时间 | 版本号 | 更新 | 说明 |
5+
| ---------- | ------ | ------------- | -------------- |
6+
| 2020-06-18 | 0.0.1 | privatezone | * 初始版本 |

0 commit comments

Comments
 (0)