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

master
tpingzhang 5 years ago
commit 157c4dab53

@ -833,10 +833,10 @@ class UserController extends BaseController
#实例化用户接口 #实例化用户接口
$userApi = new MemberApi(); $userApi = new MemberApi();
if(!preg_match('/^[0-9a-zA-Z]{6,15}$/', $user['account'])){ if(!preg_match('/^[0-9a-zA-Z]{6,15}$/', $user['account'])){
$this -> set_message(1027, "fail", "6-15位字母或数字"); $this -> set_message(1027, "fail", "账号为6-15位字母或数字");
} }
if(!preg_match('/^[0-9a-zA-Z]{6,15}$/', $user['password'])){ if(!preg_match('/^[0-9a-zA-Z]{6,15}$/', $user['password'])){
$this -> set_message(1027, "fail", "6-15位字母或数字"); $this -> set_message(1027, "fail", "密码为6-12位字母数字");
} }
/* if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['password'])){ /* if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['password'])){
@ -851,7 +851,7 @@ class UserController extends BaseController
} else {//用户1 } else {//用户1
if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['account'])){ if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['account'])){
$this -> set_message(1027, "fail", "6-12位字母或数字"); $this -> set_message(1027, "fail", "账号为6-12位字母或数字");
} }
$result = $userApi -> sdk_register_($user['account'], $user['password'], 1, 1, $user['promote_id'], get_promote_name($user['promote_id']), $phone = "", $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version'] ,$user['device_type'],$user['unique_code']); $result = $userApi -> sdk_register_($user['account'], $user['password'], 1, 1, $user['promote_id'], get_promote_name($user['promote_id']), $phone = "", $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version'] ,$user['device_type'],$user['unique_code']);
} }

Loading…
Cancel
Save