Commit a61366c42809b63f31102e2e1fff94c2c6a93c30

Authored by 翁力
2 parents ecefbb46 343b182d

Merge remote-tracking branch 'origin/master'

Conflicts:
	04.用户云/1.4 注册前发手机验证码.md
.settings/org.eclipse.core.resources.prefs
1 1 eclipse.preferences.version=1
2   -encoding//04.\u7528\u6237\u4E91/1.4\ \u5BC6\u7801\u6CE8\u518C\u524D\u53D1\u624B\u673A\u9A8C\u8BC1\u7801.md=UTF-8
  2 +encoding//04.\u7528\u6237\u4E91/1.4\ \u6CE8\u518C\u6216\u4FEE\u6539\u624B\u673A\u53F7\u524D\u53D1\u624B\u673A\u9A8C\u8BC1\u7801.md=UTF-8
3 3 encoding//04.\u7528\u6237\u4E91/1.8\ \u66F4\u65B0\u7528\u6237\u9644\u52A0\u4FE1\u606F.md=UTF-8
4   -encoding//04.\u7528\u6237\u4E91/2.1\ \u4FEE\u6539\u5BC6\u7801.md=UTF-8
5 4 encoding//10.\u6D88\u606F\u4E91/1.1\ \u53D1\u9001\u77ED\u4FE1\u63A5\u53E3.md=UTF-8
... ...
04.用户云/1.5 注册.md
... ... @@ -28,13 +28,13 @@
28 28 <td>verificationCode</td>
29 29 <td>false</td>
30 30 <td>string</td>
31   - <td>手机验证码</td>
  31 + <td>手机验证码(手机号注册时必填)</td>
32 32 </tr>
33 33 <tr>
34 34 <td>invitationCode</td>
35   - <td>true</td>
  35 + <td>false</td>
36 36 <td>string</td>
37   - <td>邀请码(没有填0)</td>
  37 + <td>邀请码</td>
38 38 </tr>
39 39 <tr>
40 40 <td>uuid</td>
... ...
04.用户云/1.7 找回或修改密码前发手机验证码.md
1   -/*
2   - Title: 1.1 手机号验证码
3   - Sort: 11
4   -*/
5   -#### URL: http://api.cnlive.com/open/api/CnliveMobile/json/sendVerifyCode
6   ------
7   -#### 请求方式: POST
8   ------
9   -#### 返回格式: JSON
10   ------
11   -#### 请求参数说明:
  1 +#### 璇锋眰鍙傛暟璇存槑:
12 2 <table class="table table-bordered table-striped table-condensed">
13 3 <tr>
14   - <th>参数</th>
15   - <th>必选</th>
16   - <th>类型</th>
17   - <th>说明</th>
  4 + <th>鍙傛暟</th>
  5 + <th>蹇呴</th>
  6 + <th>绫诲瀷</th>
  7 + <th>璇存槑</th>
18 8 </tr>
19 9 <tr>
20 10 <td>appId</td>
21 11 <td>true</td>
22 12 <td>string</td>
23   - <td>应用ID</td>
  13 + <td>搴旂敤ID</td>
24 14 </tr>
25 15 <tr>
26 16 <td>mobile</td>
27 17 <td>true</td>
28 18 <td>string</td>
29   - <td>手机号</td>
  19 + <td>鎵嬫満鍙</td>
30 20 </tr>
31 21 <tr>
32   - <td>type</td>
33   - <td>true</td>
34   - <td>string</td>
35   - <td>验证码类型: 0-手机号注册时发送验证码,1-手机号找回密码时发送验证码,2-仅给手机号发送验证码(例如:快捷登录)</td>
36   - </tr>
37   - <tr>
38 22 <td>clientPlat</td>
39 23 <td>true</td>
40 24 <td>string</td>
41   - <td>客户端平台[i:IOS客户端,a:Android客户端]</td>
  25 + <td>瀹㈡埛绔钩鍙癧i锛欼OS瀹㈡埛绔紝a锛欰ndroid瀹㈡埛绔痌</td>
42 26 </tr>
43 27 <tr>
44 28 <td>sign</td>
45 29 <td>true</td>
46 30 <td>string</td>
47   - <td>签名</td>
  31 + <td>绛惧悕</td>
48 32 </tr>
49 33 </table>
50 34  
51 35 -----
52   -#### 返回格式说明:
  36 +#### 杩斿洖鏍煎紡璇存槑:
53 37 ```
54 38 {
55 39 errorCode:"0",
56   - errorMsg:"成功"
  40 + errorMsg:"鎴愬姛"
57 41 }
58 42 {
59   - errorCode:"xxx", //错误代码(非0)
60   - errorMsg:"失败" //错误信息
  43 + errorCode:"xxx", //閿欒浠g爜(闈級
  44 + errorMsg:"澶辫触" //閿欒淇℃伅
61 45 }
62 46  
63 47 ```
64 48 \ No newline at end of file
... ...
04.用户云/2.2 上传头像.md
... ... @@ -36,6 +36,12 @@
36 36 <td>string</td>
37 37 <td>平台TOKEN</td>
38 38 </tr>
  39 + <tr>
  40 + <td>sign</td>
  41 + <td>true</td>
  42 + <td>string</td>
  43 + <td>签名</td>
  44 + </tr>
39 45 </table>
40 46  
41 47 -----
... ...
04.用户云/2.3 查询用户信息.md
... ... @@ -56,7 +56,9 @@
56 56 "gender": "n",
57 57 "location": "",
58 58 "faceUrl": "http://120.92.63.41:8080/images/mobilehead/2016/08/1470390809311.jpg",
59   - "extInfo": ""
  59 + "extInfo": "",
  60 + "mobile": "13912928282",
  61 + "email": "wlee@cnlive.com"
60 62 }
61 63 }
62 64  
... ...
04.用户云/2.4 修改用户单项信息.md
... ... @@ -42,6 +42,12 @@
42 42 <td>string</td>
43 43 <td>平台TOKEN</td>
44 44 </tr>
  45 + <tr>
  46 + <td>sign</td>
  47 + <td>true</td>
  48 + <td>string</td>
  49 + <td>签名</td>
  50 + </tr>
45 51 </table>
46 52  
47 53 -----
... ...