Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Controller/UserController.class.php

@@ -1120,8 +1120,11 @@ class UserController extends BaseController
         if ($user['code_type'] != 2) {
             $this -> sms_verify($user['phone'], $user['code']);
         }
-        if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['password'])){
-        	$this -> set_message(1027, "fail", "密码必须6-15位字母和数字组合");
+        // if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['password'])){
+        // 	$this -> set_message(1027, "fail", "密码必须6-15位字母和数字组合");
+        // }
+        if(!preg_match('/^[0-9a-zA-Z]{6,12}$/', $user['password'])){
+            $this -> set_message(1027, "fail", "密码长度为6-12位");
         }
         
         $result = $userApi -> updatePassword($user['user_id'], $user['password']);