Merge pull request #135 from jdcloud-apigateway/master

publish jdcloud-sdk-python 1.6.104

Author: jdcloud-apigateway

jdcloud_sdk/services/cdn/ChangeLog.md

@@ -1,11 +1,14 @@
 # 更新历史 #
-API版本：0.10.24
+API版本：0.10.25
 
 
 
 
 | 发布时间   | 版本号 | 更新                                                       | 说明 |
 | ---------- | ------ | ---------------------------------------------------------- | ---- |
+| 2021-06-30  | 0.10.27  |deeplog日志收集接口增加pin参数|
+| 2021-02-01  | 0.10.26  |统计查询新增cacheType |
+| 2020-12-25  | 0.10.25  |统计查询新增直播流帧率码率观看人数查询接口 |
 | 2020-11-05  | 0.10.24  |增加控制台获取地域运行商新接口 |
 | 2020-10-14  | 0.10.23  |增加子账号设置与查询刷新预热额度接口 |
 | 2020-08-25  | 0.10.22  |点播域名创建支持指定模板 |

jdcloud_sdk/services/cdn/apis/CheckWhetherIpBelongToJCloudRequest.py

@@ -21,7 +21,7 @@
 
 class CheckWhetherIpBelongToJCloudRequest(JDCloudRequest):
     """
-    获取所有上层节点的ip
+    获取所有上层节点的ip，仅支持中国境内上层节点IP地址查询
     """
 
     def __init__(self, parameters, header=None, version="v1"):

jdcloud_sdk/services/cdn/apis/ConfigHttp2Request.py

@@ -21,7 +21,7 @@
 
 class ConfigHttp2Request(JDCloudRequest):
     """
-    http2配置
+    http2配置，中国境外/全球加速域名暂不支持该配置
     """
 
     def __init__(self, parameters, header=None, version="v1"):

jdcloud_sdk/services/cdn/apis/CreateCacheRuleRequest.py

@@ -51,7 +51,7 @@ def setWeight(self, weight):
 
     def setTtl(self, ttl):
         """
-        :param ttl: (Optional) 缓存时间,单位秒
+        :param ttl: (Optional) 缓存时间,单位秒，中国境内加速域名最长可配置2年，中国境外/全球加速域名最长可配置1年
         """
         self.ttl = ttl
 

jdcloud_sdk/services/cdn/apis/CreateDomainGroupRequest.py

@@ -43,7 +43,7 @@ def __init__(self, ):
 
     def setShareCache(self, shareCache):
         """
-        :param shareCache: (Optional) 是否共享内存
+        :param shareCache: (Optional) 是否共享内存，共享缓存仅对中国境内加速域名生效
         """
         self.shareCache = shareCache
 

jdcloud_sdk/services/cdn/apis/CreateRefreshTaskRequest.py

@@ -21,7 +21,7 @@
 
 class CreateRefreshTaskRequest(JDCloudRequest):
     """
-    创建刷新预热任务
+    创建刷新预热任务，
     """
 
     def __init__(self, parameters, header=None, version="v1"):
@@ -41,7 +41,7 @@ def __init__(self, ):
 
     def setTaskType(self, taskType):
         """
-        :param taskType: (Optional) 刷新预热类型,(url:url刷新,dir:目录刷新,prefetch:预热)
+        :param taskType: (Optional) 刷新预热类型,(url:url刷新,dir:目录刷新,prefetch:预热)，中国境外/全球加速域名暂不支持预热功能
         """
         self.taskType = taskType
 

jdcloud_sdk/services/cdn/apis/QueryDirBandwidthRequest.py

@@ -41,6 +41,7 @@ def __init__(self, ):
         self.domain = None
         self.dirs = None
         self.regions = None
+        self.cacheType = None
 
     def setStartTime(self, startTime):
         """
@@ -72,3 +73,9 @@ def setRegions(self, regions):
         """
         self.regions = regions
 
+    def setCacheType(self, cacheType):
+        """
+        :param cacheType: (Optional) 查询节点层级，可选值:[all,edge,mid],默认查询all,edge边缘 mid中间
+        """
+        self.cacheType = cacheType
+

jdcloud_sdk/services/cdn/apis/QueryDirStatsDataRequest.py

@@ -40,6 +40,7 @@ def __init__(self, ):
         self.endTime = None
         self.domain = None
         self.dirs = None
+        self.cacheType = None
 
     def setStartTime(self, startTime):
         """
@@ -65,3 +66,9 @@ def setDirs(self, dirs):
         """
         self.dirs = dirs
 
+    def setCacheType(self, cacheType):
+        """
+        :param cacheType: (Optional) 查询节点层级，可选值:[all,edge,mid],默认查询all,edge边缘 mid中间
+        """
+        self.cacheType = cacheType
+

jdcloud_sdk/services/cdn/apis/QueryJDBoxStatisticsDataWithGroupRequest.py

@@ -0,0 +1,109 @@
+# coding=utf8
+
+# Copyright 2018 JDCLOUD.COM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# NOTE: This class is auto generated by the jdcloud code generator program.
+
+from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
+
+
+class QueryJDBoxStatisticsDataWithGroupRequest(JDCloudRequest):
+    """
+    无线宝按group查询的统计接口
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(QueryJDBoxStatisticsDataWithGroupRequest, self).__init__(
+            '/jdBoxStatisticsWithGroup', 'POST', header, version)
+        self.parameters = parameters
+
+
+class QueryJDBoxStatisticsDataWithGroupParameters(object):
+
+    def __init__(self, ):
+        """
+        """
+
+        self.startTime = None
+        self.endTime = None
+        self.groupBy = None
+        self.fields = None
+        self.area = None
+        self.isp = None
+        self.period = None
+        self.category = None
+        self.macAddr = None
+        self.pluginPin = None
+
+    def setStartTime(self, startTime):
+        """
+        :param startTime: (Optional) 查询起始时间,时间戳
+        """
+        self.startTime = startTime
+
+    def setEndTime(self, endTime):
+        """
+        :param endTime: (Optional) 查询截止时间,时间戳
+        """
+        self.endTime = endTime
+
+    def setGroupBy(self, groupBy):
+        """
+        :param groupBy: (Optional) 取值范围：area，isp，pin ,mac_addr，category，多个用,隔开,多个维度的查询，必须要限制较短的时间间隔
+        """
+        self.groupBy = groupBy
+
+    def setFields(self, fields):
+        """
+        :param fields: (Optional) 查询的字段，取值范围(avgbandwidth,pv,flow)。多个用逗号分隔。默认为空，表示查询带宽流量
+        """
+        self.fields = fields
+
+    def setArea(self, area):
+        """
+        :param area: (Optional) 区域
+        """
+        self.area = area
+
+    def setIsp(self, isp):
+        """
+        :param isp: (Optional) 运营商
+        """
+        self.isp = isp
+
+    def setPeriod(self, period):
+        """
+        :param period: (Optional) 查询周期，当前取值范围：“oneMin,fiveMin”，分别表示1min，5min。默认为空，表示fiveMin
+        """
+        self.period = period
+
+    def setCategory(self, category):
+        """
+        :param category: (Optional) 业务类型
+        """
+        self.category = category
+
+    def setMacAddr(self, macAddr):
+        """
+        :param macAddr: (Optional) 设备id
+        """
+        self.macAddr = macAddr
+
+    def setPluginPin(self, pluginPin):
+        """
+        :param pluginPin: (Optional) 插件pin
+        """
+        self.pluginPin = pluginPin
+

jdcloud_sdk/services/cdn/apis/QueryLiveStatisticsAreaDataGroupByRequest.py

@@ -50,6 +50,7 @@ def __init__(self, ):
         self.scheme = None
         self.reqMethod = None
         self.cacheLevel = None
+        self.cacheType = None
 
     def setStartTime(self, startTime):
         """
@@ -71,7 +72,7 @@ def setDomain(self, domain):
 
     def setAppName(self, appName):
         """
-        :param appName: (Optional) app名
+        :param appName: (Optional) 查询的App名称，多个用逗号分隔。
         """
         self.appName = appName
 
@@ -83,19 +84,19 @@ def setFields(self, fields):
 
     def setArea(self, area):
         """
-        :param area: (Optional) 
+        :param area: (Optional) 查询的区域，如beijing,shanghai。多个用逗号分隔
         """
         self.area = area
 
     def setIsp(self, isp):
         """
-        :param isp: (Optional) 
+        :param isp: (Optional) 查询的运营商，cmcc,cnc,ct，表示移动、联通、电信。多个用逗号分隔
         """
         self.isp = isp
 
     def setStreamName(self, streamName):
         """
-        :param streamName: (Optional) 
+        :param streamName: (Optional) 查询的流名称，多个用逗号分隔。
         """
         self.streamName = streamName
 
@@ -107,31 +108,37 @@ def setPeriod(self, period):
 
     def setGroupBy(self, groupBy):
         """
-        :param groupBy: (Optional) 分组依据
+        :param groupBy: (Optional) 分组依据,可选值：[appname,streamname]，如果为空，则只按area/isp进行group。
         """
         self.groupBy = groupBy
 
     def setSubDomain(self, subDomain):
         """
-        :param subDomain: (Optional) 
+        :param subDomain: (Optional) 查询泛域名时，指定的子域名列表，多个用逗号分隔。非泛域名时，传入空即可
         """
         self.subDomain = subDomain
 
     def setScheme(self, scheme):
         """
-        :param scheme: (Optional) 查询的流协议
+        :param scheme: (Optional) 查询的流协议，取值范围："rtmp,hdl,hls"，多个用逗号分隔，默认为空，表示查询所有协议。
         """
         self.scheme = scheme
 
     def setReqMethod(self, reqMethod):
         """
-        :param reqMethod: (Optional) 
+        :param reqMethod: (Optional) 当前取值范围("GET,HEAD,forward,forward-hls,ingest,play,publish,detour-ingest,Forward-Origin")
         """
         self.reqMethod = reqMethod
 
     def setCacheLevel(self, cacheLevel):
         """
-        :param cacheLevel: (Optional) cacheLevel
+        :param cacheLevel: (Optional) cacheLevel，可选值：[L1,L2,L3]
         """
         self.cacheLevel = cacheLevel
 
+    def setCacheType(self, cacheType):
+        """
+        :param cacheType: (Optional) 查询节点层级，可选值:[all,edge,mid],默认查询all,edge边缘 mid中间
+        """
+        self.cacheType = cacheType
+