Skip to content

Commit 1e23d78

Browse files
jdcloud-apigatewayjdcloud-apigateway
authored
Merge pull request #134 from jdcloud-apigateway/master
publish jdcloud-sdk-python 1.6.103
2 parents 99ead1f + cc0453e commit 1e23d78

17 files changed

Lines changed: 298 additions & 23 deletions

‎jdcloud_sdk/services/captcha/ChangeLog.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# 更新历史 #
2-
API版本：1.0.0
2+
API版本：1.0.1
33

44
|发布时间|版本号|更新|说明|
55
|---|---|---|---|
6+
|2021-07-06|1.0.1|更新VerifyToken接口||
67
|2020-11-20|1.0.0|初始版本||

‎jdcloud_sdk/services/captcha/apis/GetSessionIdRequest.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def setSecret(self, secret):
6666

6767
def setUuid(self, uuid):
6868
"""
69-
:param uuid: (Optional) uuid，ios客户端传openudid, android客户端传androidid
69+
:param uuid: (Optional) uuid，ios客户端传openudid, android客户端传androidid, m, pc, wxapp客户端此值为空即可
7070
"""
7171
self.uuid = uuid
7272

@@ -84,13 +84,13 @@ def setUserAgent(self, userAgent):
8484

8585
def setFingerPrint(self, fingerPrint):
8686
"""
87-
:param fingerPrint: (Optional) 指纹，客户端sdk获取
87+
:param fingerPrint: (Optional) 指纹，ios和android客户端(clientType)从sdk获取, m, pc, wxapp客户端此值为空即可
8888
"""
8989
self.fingerPrint = fingerPrint
9090

9191
def setClientType(self, clientType):
9292
"""
93-
:param clientType: (Optional) 客户端类型, android, ios
93+
:param clientType: (Optional) 客户端类型, android, ios, pc, wxmapp, m
9494
"""
9595
self.clientType = clientType
9696

‎jdcloud_sdk/services/captcha/apis/VerifyTokenRequest.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ def __init__(self, ):
4040
self.sessionId = None
4141
self.appId = None
4242
self.sceneId = None
43+
self.secret = None
4344
self.ip = None
4445
self.userAgent = None
45-
self.fingerPrint = None
4646
self.clientType = None
4747
self.clientVersion = None
4848

@@ -70,6 +70,12 @@ def setSceneId(self, sceneId):
7070
"""
7171
self.sceneId = sceneId
7272

73+
def setSecret(self, secret):
74+
"""
75+
:param secret: (Optional) 密钥，从界面获取
76+
"""
77+
self.secret = secret
78+
7379
def setIp(self, ip):
7480
"""
7581
:param ip: (Optional) 客户端ip
@@ -82,15 +88,9 @@ def setUserAgent(self, userAgent):
8288
"""
8389
self.userAgent = userAgent
8490

85-
def setFingerPrint(self, fingerPrint):
86-
"""
87-
:param fingerPrint: (Optional) 指纹，客户端sdk获取
88-
"""
89-
self.fingerPrint = fingerPrint
90-
9191
def setClientType(self, clientType):
9292
"""
93-
:param clientType: (Optional) 客户端类型, android, ios
93+
:param clientType: (Optional) 客户端类型, 可选值: android, ios, pc, wxapp, m
9494
"""
9595
self.clientType = clientType
9696

‎jdcloud_sdk/services/captcha/client/CaptchaClient.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('captcha.jdcloud-api.com')
2828

29-
super(CaptchaClient, self).__init__(credential, config, 'captcha', '1.0.0', logger)
29+
super(CaptchaClient, self).__init__(credential, config, 'captcha', '1.0.1', logger)

‎jdcloud_sdk/services/captcha/models/AmountStatistics.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
20+
class AmountStatistics(object):
21+
22+
def __init__(self, free=None, charge=None, total=None):
23+
"""
24+
:param free: (Optional) 免费总数
25+
:param charge: (Optional) 付费总数
26+
:param total: (Optional) 总数
27+
"""
28+
29+
self.free = free
30+
self.charge = charge
31+
self.total = total

‎jdcloud_sdk/services/captcha/models/App.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def __init__(self, appName, appType, appOs, appId=None, androidPkgName=None, ios
2323
"""
2424
:param appId: (Optional) 应用id
2525
:param appName: 应用名称
26-
:param appType: 应用类型，可选值 app
26+
:param appType: 应用类型，可选值 app, pc, wxapp, m
2727
:param appOs: 应用系统，支持多选多选以逗号分隔, 选择appType是app时可选android,ios 其余为空
2828
:param androidPkgName: (Optional) android应用的package name（应用是android的时候androidPkgName必须）
2929
:param iosBundleId: (Optional) ios应用的bundle id（应用是ios的时候iosBundleId必须）

‎jdcloud_sdk/services/captcha/models/ModifyReq.py‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
20+
class ModifyReq(object):
21+
22+
def __init__(self, tracking=None):
23+
"""
24+
:param tracking: (Optional) 跟踪描述
25+
"""
26+
27+
self.tracking = tracking

‎jdcloud_sdk/services/captcha/models/OrderDetail.py‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
20+
class OrderDetail(object):
21+
22+
def __init__(self, pin=None, pkgname=None, balanceAmount=None, orderType=None, startTime=None, orderState=None, orderAmount=None, voucher=None, yue=None, paymentAmount=None):
23+
"""
24+
:param pin: (Optional) 用户名称
25+
:param pkgname: (Optional) 产品名称
26+
:param balanceAmount: (Optional) 规格
27+
:param orderType: (Optional) 付费类型
28+
:param startTime: (Optional) 下单时间，yyyy-mm-dd hh:mm:ss格式
29+
:param orderState: (Optional) 订单状态
30+
:param orderAmount: (Optional) 订单金额
31+
:param voucher: (Optional) 代金券
32+
:param yue: (Optional) 余额
33+
:param paymentAmount: (Optional) 实付款总额
34+
"""
35+
36+
self.pin = pin
37+
self.pkgname = pkgname
38+
self.balanceAmount = balanceAmount
39+
self.orderType = orderType
40+
self.startTime = startTime
41+
self.orderState = orderState
42+
self.orderAmount = orderAmount
43+
self.voucher = voucher
44+
self.yue = yue
45+
self.paymentAmount = paymentAmount

‎jdcloud_sdk/services/captcha/models/Sdk.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
20+
class Sdk(object):
21+
22+
def __init__(self, appId, sdkType, sdkVersion, ):
23+
"""
24+
:param appId: 应用id
25+
:param sdkType: sdk类型, 可选值android或者ios
26+
:param sdkVersion: sdk版本号
27+
"""
28+
29+
self.appId = appId
30+
self.sdkType = sdkType
31+
self.sdkVersion = sdkVersion

‎jdcloud_sdk/services/captcha/models/SessionData.py‎

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

2020
class SessionData(object):
2121

22-
def __init__(self, appId, sceneId, ip, userAgent, clientType, secret=None, uuid=None, fingerPrint=None, clientVersion=None):
22+
def __init__(self, appId, sceneId, secret, ip, userAgent, clientType, uuid=None, fingerPrint=None, clientVersion=None):
2323
"""
2424
:param appId: 应用id
2525
:param sceneId: 场景id
26-
:param secret: (Optional) 密钥，从界面获取
27-
:param uuid: (Optional) uuid，ios客户端传openudid, android客户端传androidid
26+
:param secret: 密钥，从界面获取
27+
:param uuid: (Optional) uuid，ios客户端传openudid, android客户端传androidid, pc和wxapp客户端可不传
2828
:param ip: 客户端ip
2929
:param userAgent: 客户端userAgent
3030
:param fingerPrint: (Optional) 指纹，客户端sdk获取
31-
:param clientType: 客户端类型, android, ios, pc, m
31+
:param clientType: 客户端类型, android, ios, pc, wxapp, m
3232
:param clientVersion: (Optional) 客户端版本，用户端app版本，可选
3333
"""
3434

0 commit comments

Comments
 (0)