Commit 21c33c4467ae31924cc3acce6b4247b63a9ef66a
Merge remote-tracking branch 'origin/master'
Showing
4 changed files
with
74 additions
and
8 deletions
02.直播云/2.1 获取推流直播播放地址.md
0 → 100644
| 1 | +### 获取推流直播播放地址（ugc） | ||
| 2 | +----- | ||
| 3 | +#### http://api.cnlive.com/open/api2/live_epg/play | ||
| 4 | +----- | ||
| 5 | +#### 接口说明: | ||
| 6 | + | ||
| 7 | +----- | ||
| 8 | +#### 请求方式: HTTP GET | ||
| 9 | +----- | ||
| 10 | +#### 返回格式: 200 | ||
| 11 | +----- | ||
| 12 | +#### 请求参数说明: | ||
| 13 | +| 参数名 | 参数类型 | 必选 | 参数说明 | | ||
| 14 | +| :----------- | :------: | :------: | :------: | | ||
| 15 | +| appId | string | true | 应用ID | | ||
| 16 | +| activityId| string | true | 活动ID，确保SP下的唯一性 | | ||
| 17 | +| sign | String | true | 签名规则见<a href="http://help.open.cnlive.com/common.html">签名详情</a> | | ||
| 18 | + | ||
| 19 | + | ||
| 20 | + | ||
| 21 | +#### 返回结果 json | ||
| 22 | +```json | ||
| 23 | + { | ||
| 24 | + "errorMessage":"成功", | ||
| 25 | + "data":{ | ||
| 26 | + "location":"rtmp://wsrtmp4.live.cnlive.com/cdn/xinyingshi?wsSecret=f10722a1a2ffd198772b2ac8cf1c0afb&wsTime=57a3f066" | ||
| 27 | + }, | ||
| 28 | + "errorCode":"0" | ||
| 29 | + } | ||
| 30 | +``` | ||
| 0 | \ No newline at end of file | 31 | \ No newline at end of file |
04.用户云/1.2 第三方登录.md
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | <td>thirdPartyPlat</td> | 16 | <td>thirdPartyPlat</td> |
| 17 | <td>true</td> | 17 | <td>true</td> |
| 18 | <td>int</td> | 18 | <td>int</td> |
| 19 | - <td>第三方平台编号 [platform ： 1:sina weibo 2:qq weibo 3:renren 5:weixin]</td> | 19 | + <td>第三方平台编号 [platform ： 1:sina weibo 2:qq weibo 3:weixin 4:renren]</td> |
| 20 | </tr> | 20 | </tr> |
| 21 | <tr> | 21 | <tr> |
| 22 | <td>thirdPartyId</td> | 22 | <td>thirdPartyId</td> |
| @@ -79,10 +79,42 @@ | @@ -79,10 +79,42 @@ | ||
| 79 | ``` | 79 | ``` |
| 80 | 80 | ||
| 81 | { | 81 | { |
| 82 | - "uid": "122", | ||
| 83 | - "nickName": "鱼儿", | ||
| 84 | - "gender": "f", | ||
| 85 | - "location": "China", | ||
| 86 | - "faceUrl": "http://www.cnlive.com/selfplatform/upload/face/201462/c3646d4e-5f08-4f0b-9ec0-2ff0d4f393ea.jpg", | ||
| 87 | - "token": "12345678901234567890123456789012", | 82 | + "errorCode": "0", |
| 83 | + "errorMessage": "成功", | ||
| 84 | + "data": { | ||
| 85 | + "uid": "1459939", | ||
| 86 | + "nickName": "Test_714", | ||
| 87 | + "gender": "f", | ||
| 88 | + "location": "China BeiJing", | ||
| 89 | + "faceUrl": "http://120.92.63.41:8080/mobile/images/mobilehead/default/face_60X60.jpg", | ||
| 90 | + "token": "dx63Akz2nDQFBtcomqkLuJQ8xsalShCL3IJTmeDjARQ=" | ||
| 91 | + } | ||
| 92 | +} | ||
| 93 | +{ | ||
| 94 | + "errorCode": "1", | ||
| 95 | + "errorMessage": "请求参数无效" | ||
| 96 | +} | ||
| 97 | +{ | ||
| 98 | + "errorCode": "41014", | ||
| 99 | + "errorMessage": "第三方平台编号无效" | ||
| 100 | +} | ||
| 101 | +{ | ||
| 102 | + "errorCode": "41013", | ||
| 103 | + "errorMessage": "性别无效" | ||
| 104 | +} | ||
| 105 | +{ | ||
| 106 | + "errorCode": "41015", | ||
| 107 | + "errorMessage": "地址不能超过120个汉字" | ||
| 108 | +} | ||
| 109 | +{ | ||
| 110 | + "errorCode": "41016", | ||
| 111 | + "errorMessage": "头像不能超过255位" | ||
| 112 | +} | ||
| 113 | +{ | ||
| 114 | + "errorCode": "41008", | ||
| 115 | + "errorMessage": "该昵称已存在" | ||
| 116 | +} | ||
| 117 | +{ | ||
| 118 | + "errorCode": "40005", | ||
| 119 | + "errorMessage": "其他错误" | ||
| 88 | } | 120 | } |
| 89 | \ No newline at end of file | 121 | \ No newline at end of file |
04.用户云/1.4 密码注册.md