Merge remote-tracking branch 'origin/master'

Conflicts: 04.用户云/1.4 注册前发手机验证码.md

Merge remote-tracking branch 'origin/master'
Conflicts: 04.用户云/1.4 注册前发手机验证码.md
翁力
2 parents ecefbb46 343b182d
Showing 6 changed files with 32 additions and 35 deletions
.settings/org.eclipse.core.resources.prefs
04.用户云/1.5 注册.md
04.用户云/1.7 找回或修改密码前发手机验证码.md
04.用户云/2.2 上传头像.md
04.用户云/2.3 查询用户信息.md
04.用户云/2.4 修改用户单项信息.md
 eclipse.preferences.version=1
-encoding//04.\u7528\u6237\u4E91/1.4\ \u5BC6\u7801\u6CE8\u518C\u524D\u53D1\u624B\u673A\u9A8C\u8BC1\u7801.md=UTF-8
+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
 encoding//04.\u7528\u6237\u4E91/1.8\ \u66F4\u65B0\u7528\u6237\u9644\u52A0\u4FE1\u606F.md=UTF-8
-encoding//04.\u7528\u6237\u4E91/2.1\ \u4FEE\u6539\u5BC6\u7801.md=UTF-8
 encoding//10.\u6D88\u606F\u4E91/1.1\ \u53D1\u9001\u77ED\u4FE1\u63A5\u53E3.md=UTF-8
@@ -28,13 +28,13 @@
 	    <td>verificationCode</td>
 	    <td>false</td>
 	    <td>string</td>
-	    <td>手机验证码</td>  
+	    <td>手机验证码（手机号注册时必填）</td>  
 	</tr>
 	<tr>
 	    <td>invitationCode</td>
-	    <td>true</td>
+	    <td>false</td>
 	    <td>string</td>
-	    <td>邀请码(没有填0)</td>  
+	    <td>邀请码</td>  
 	</tr>
 	<tr>
 	    <td>uuid</td>
-/* 
-   Title: 1.1 手机号验证码
-   Sort: 11 
-*/
-#### URL: http://api.cnlive.com/open/api/CnliveMobile/json/sendVerifyCode
------
-#### 请求方式: POST
------
-#### 返回格式: JSON
------
-#### 请求参数说明: 
+#### 璇锋眰鍙傛暟璇存槑: 
 <table class="table table-bordered table-striped table-condensed">
 	<tr>
-	    <th>参数</th>
-	    <th>必选</th>
-	    <th>类型</th>
-	    <th>说明</th>     
+	    <th>鍙傛暟</th>
+	    <th>蹇呴</th>
+	    <th>绫诲瀷</th>
+	    <th>璇存槑</th>     
 	</tr>
 	<tr>
 	    <td>appId</td>
 	    <td>true</td>
 	    <td>string</td>
-	    <td>应用ID</td>   
+	    <td>搴旂敤ID</td>   
 	</tr>
 	<tr>
 	    <td>mobile</td>
 	    <td>true</td>
 	    <td>string</td>
-	    <td>手机号</td>  
+	    <td>鎵嬫満鍙</td>  
 	</tr>
 	<tr>
-	    <td>type</td>
-	    <td>true</td>
-	    <td>string</td>
-	    <td>验证码类型： 0-手机号注册时发送验证码，1-手机号找回密码时发送验证码，2-仅给手机号发送验证码（例如：快捷登录）</td>  
-	</tr>	
-	<tr>
 	    <td>clientPlat</td>
 	    <td>true</td>
 	    <td>string</td>
-	    <td>客户端平台[i：IOS客户端，a：Android客户端]</td>  
+	    <td>瀹㈡埛绔钩鍙癧i锛欼OS瀹㈡埛绔紝a锛欰ndroid瀹㈡埛绔痌</td>  
 	</tr>
     <tr>
         <td>sign</td>
         <td>true</td>
         <td>string</td>
-        <td>签名</td>  
+        <td>绛惧悕</td>  
     </tr>
 </table>
 -----
-#### 返回格式说明:
+#### 杩斿洖鏍煎紡璇存槑:
 ```
 {
 	errorCode:"0",
-	errorMsg:"成功"
+	errorMsg:"鎴愬姛"
 }
 {
-	errorCode:"xxx",   //错误代码(非0）
-	errorMsg:"失败"   //错误信息
+	errorCode:"xxx",   //閿欒浠ｇ爜(闈級
+	errorMsg:"澶辫触"   //閿欒淇℃伅
 }
 ```
 \ No newline at end of file
@@ -36,6 +36,12 @@
         <td>string</td>
         <td>平台TOKEN</td>  
     </tr>
+    <tr>
+        <td>sign</td>
+        <td>true</td>
+        <td>string</td>
+        <td>签名</td>  
+    </tr>
 </table>
 -----
@@ -56,7 +56,9 @@
         "gender": "n",
         "location": "",
         "faceUrl": "http://120.92.63.41:8080/images/mobilehead/2016/08/1470390809311.jpg",
-        "extInfo": ""
+        "extInfo": "",
+        "mobile": "13912928282",
+        "email": "wlee@cnlive.com"
     }
 }
@@ -42,6 +42,12 @@
         <td>string</td>
         <td>平台TOKEN</td>  
     </tr>
+    <tr>
+        <td>sign</td>
+        <td>true</td>
+        <td>string</td>
+        <td>签名</td>  
+    </tr>
 </table>
 -----