备份提交
This commit is contained in:
parent
1cc051711f
commit
32ad81fc7b
@ -56,7 +56,7 @@ class Oauth2Controller extends ControllerBase{
|
||||
}
|
||||
//如果请求数据整体不为空
|
||||
else{
|
||||
//准备获取appid
|
||||
//准备获取所传appid
|
||||
$rs['errmsg'] = "";
|
||||
//如果未获取到appid
|
||||
if(empty($request_arr['appid'])){
|
||||
@ -72,7 +72,7 @@ class Oauth2Controller extends ControllerBase{
|
||||
}
|
||||
//如果以上判断都通过
|
||||
else{
|
||||
//准备判断appid是否有效
|
||||
//准备判断所传appid是否有效
|
||||
$appid = $request_arr['appid'];
|
||||
//查询接口信息
|
||||
$AppInfo = AppInfo::findFirst("AppId = '$appid' AND Enable = 0");
|
||||
@ -211,22 +211,22 @@ class Oauth2Controller extends ControllerBase{
|
||||
}
|
||||
//如果请求数据整体不为空
|
||||
else{
|
||||
//准备获取appid、appsecrect和code
|
||||
//准备获取所传appid、appsecrect和code
|
||||
//注意:
|
||||
//接口中的appsecrect字段本身就是用了错别词,比secret多了一个字母
|
||||
//但接口信息表AppInfo里的AppSecret字段则没有多出一个字母,要当心
|
||||
$rs['errmsg'] = "";
|
||||
//如果未获取到appid
|
||||
//如果未获取到所传appid
|
||||
if(empty($request_arr['appid'])){
|
||||
//告知用户"appid is empty;"
|
||||
$rs['errmsg'].= "appid is empty;";
|
||||
}
|
||||
//如果未获取到appsecrect
|
||||
//如果未获取到所传appsecrect
|
||||
if(empty($request_arr['appsecrect'])){
|
||||
//告知用户"appsecrect is empty;"
|
||||
$rs['errmsg'].= "appsecrect is empty;";
|
||||
}
|
||||
//如果未获取到code
|
||||
//如果未获取到所传code
|
||||
if(empty($request_arr['code'])){
|
||||
//告知用户"code is empty;"
|
||||
$rs['errmsg'].= "code is empty;";
|
||||
@ -240,7 +240,7 @@ class Oauth2Controller extends ControllerBase{
|
||||
}
|
||||
//如果以上判断都通过
|
||||
else{
|
||||
//准备判断appid是否有效
|
||||
//准备判断所传appid是否有效
|
||||
$appid = $request_arr['appid'];
|
||||
//查询接口信息
|
||||
$AppInfo = AppInfo::findFirst("AppId = '$appid' AND Enable = 0");
|
||||
@ -321,7 +321,7 @@ class Oauth2Controller extends ControllerBase{
|
||||
}
|
||||
//如果appsecrect匹配
|
||||
else{
|
||||
//准备判断code是否匹配
|
||||
//准备判断所传code是否匹配
|
||||
$code = $request_arr['code'];
|
||||
//查询临时code
|
||||
$TempCode = TempCode::findFirst("AppId = '$appid' AND Code = '$code'");
|
||||
@ -334,27 +334,27 @@ class Oauth2Controller extends ControllerBase{
|
||||
}
|
||||
//如果有查询到临时code
|
||||
else{
|
||||
//准备判断code是否已失效
|
||||
//准备判断所传code是否已失效
|
||||
$expire_time = $TempCode->ExpireTime;
|
||||
//如果code已失效
|
||||
//如果所传code已失效
|
||||
if($current_datetime>=$expire_time){
|
||||
//告知用户"authorize code is expired,err detail:code 已过期"
|
||||
$rs['errmsg'] = "authorize code is expired,err detail:code 已过期";
|
||||
$rs['errcode'] = 80103;
|
||||
$rs['data'] = null;
|
||||
}
|
||||
//如果code未失效
|
||||
//如果所传code未失效
|
||||
else{
|
||||
//准备判断code是否已使用过
|
||||
//准备判断所传code是否已使用过
|
||||
$is_used = $TempCode->IsUsed;
|
||||
//如果code已使用过
|
||||
//如果所传code已使用过
|
||||
if(!empty($is_used)){
|
||||
//告知用户"authorize code is used,err detail:code已使用"
|
||||
$rs['errmsg'] = "authorize code is used,err detail:code已使用";
|
||||
$rs['errcode'] = 80104;
|
||||
$rs['data'] = null;
|
||||
}
|
||||
//如果code未使用过
|
||||
//如果所传code未使用过
|
||||
else{
|
||||
//开启事务
|
||||
$this->db->begin();
|
||||
|
||||
@ -85,24 +85,24 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果请求数据整体不为空
|
||||
else{
|
||||
//准备获取appid、手机号、access_token和短信内容
|
||||
//准备获取所传appid、手机号、access_token和短信内容
|
||||
$rs['errmsg'] = "";
|
||||
//如果未获取到appid
|
||||
//如果未获取到所传appid
|
||||
if(empty($request_arr['appid'])){
|
||||
//告知用户"appid is empty;"
|
||||
$rs['errmsg'].= "appid is empty;";
|
||||
}
|
||||
//如果未获取到手机号
|
||||
//如果未获取到所传手机号
|
||||
if(empty($request_arr['mobile'])){
|
||||
//告知用户"mobile is empty;"
|
||||
$rs['errmsg'].= "mobile is empty;";
|
||||
}
|
||||
//如果未获取到access_token
|
||||
//如果未获取到所传access_token
|
||||
if(empty($request_arr['access_token'])){
|
||||
//告知用户"access_token is empty;"
|
||||
$rs['errmsg'].= "access_token is empty;";
|
||||
}
|
||||
//如果未获取到短信内容
|
||||
//如果未获取到所传短信内容
|
||||
if(empty($request_arr['content'])){
|
||||
//告知用户"content is empty;"
|
||||
$rs['errmsg'].= "content is empty;";
|
||||
@ -116,7 +116,7 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果以上判断都通过
|
||||
else{
|
||||
//准备判断appid是否有效
|
||||
//准备判断所传appid是否有效
|
||||
$appid = $request_arr['appid'];
|
||||
//查询接口信息
|
||||
$AppInfo = AppInfo::findFirst("AppId = '$appid' AND Enable = 0");
|
||||
@ -186,7 +186,7 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果更新成功
|
||||
else{
|
||||
//准备判断access_token是否有效
|
||||
//准备判断所传access_token是否有效
|
||||
$access_token = $request_arr['access_token'];
|
||||
//查询接口信息
|
||||
$AccessToken = AccessToken::findFirst("AppId = '$appid' AND (AccessToken = '$access_token' OR PrevAccessToken = '$access_token')");
|
||||
@ -203,7 +203,7 @@ class SmsController extends ControllerBase{
|
||||
$ExpireTime = $AccessToken->ExpireTime;
|
||||
//获取前access_token到期时间
|
||||
$PrevExpireTime = date("Y-m-d H:i:s", strtotime($AccessToken->ExpireTime)-14400+600);
|
||||
//如果access_token匹配前access_token
|
||||
//如果所传access_token匹配前access_token
|
||||
if($access_token==$AccessToken->PrevAccessToken){
|
||||
//如果前access_token已过期
|
||||
//注意:
|
||||
@ -216,7 +216,7 @@ class SmsController extends ControllerBase{
|
||||
$rs['data'] = null;
|
||||
}
|
||||
}
|
||||
//如果access_token匹配现access_token
|
||||
//如果所传access_token匹配现access_token
|
||||
else{
|
||||
//如果现access_token已过期
|
||||
if($current_datetime>$ExpireTime){
|
||||
@ -310,19 +310,19 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果请求数据整体不为空
|
||||
else{
|
||||
//准备获取appid、手机号和access_token
|
||||
//准备获取所传appid、手机号和access_token
|
||||
$rs['errmsg'] = "";
|
||||
//如果未获取到appid
|
||||
//如果未获取到所传appid
|
||||
if(empty($request_arr['appid'])){
|
||||
//告知用户"appid is empty;"
|
||||
$rs['errmsg'].= "appid is empty;";
|
||||
}
|
||||
//如果未获取到手机号
|
||||
//如果未获取到所传手机号
|
||||
if(empty($request_arr['mobile'])){
|
||||
//告知用户"mobile is empty;"
|
||||
$rs['errmsg'].= "mobile is empty;";
|
||||
}
|
||||
//如果未获取到access_token
|
||||
//如果未获取到所传access_token
|
||||
if(empty($request_arr['access_token'])){
|
||||
//告知用户"access_token is empty;"
|
||||
$rs['errmsg'].= "access_token is empty;";
|
||||
@ -336,14 +336,14 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果以上判断都通过
|
||||
else{
|
||||
//获取验证码长度
|
||||
//获取所传验证码长度
|
||||
//注意:
|
||||
//原代码逻辑中验证码长度小于等于0则取默认值4
|
||||
//此处先遵循原代码逻辑,而不按照文档限制判断
|
||||
$len = !empty($request_arr['len'])?$request_arr['len']:4;
|
||||
$len = (int)$len;
|
||||
$len = $len>0?$len:4;
|
||||
//如果验证码长度小于2或大于10
|
||||
//如果所传验证码长度小于2或大于10
|
||||
//注意:
|
||||
//原代码逻辑中验证码长度为大于等于1而小于等于9
|
||||
//此处则先遵循文档,而不按照原代码逻辑限制判断
|
||||
@ -353,25 +353,25 @@ class SmsController extends ControllerBase{
|
||||
$rs['errcode'] = 61451;
|
||||
$rs['data'] = null;
|
||||
}
|
||||
//如果验证码长度大于等于2且小于等于10
|
||||
//如果所传验证码长度大于等于2且小于等于10
|
||||
else{
|
||||
//获取验证码类型:1 纯数字 2 字母加数字
|
||||
//获取所传验证码类型:1 纯数字 2 字母加数字
|
||||
//注意:
|
||||
//原代码逻辑中验证码类型小于等于0则取默认值1
|
||||
//此处先遵循原代码逻辑,而不按照文档限制判断
|
||||
$type = !empty($request_arr['type'])?$request_arr['type']:1;
|
||||
$type = (int)$type;
|
||||
$type = $type>0?$type:1;
|
||||
//如果验证码类型不是1或2
|
||||
//如果所传验证码类型不是1或2
|
||||
if($type!=1 && $type!=2){
|
||||
//告知用户"参数错误 error detail:"
|
||||
$rs['errmsg'] = "参数错误 error detail:";
|
||||
$rs['errcode'] = 61451;
|
||||
$rs['data'] = null;
|
||||
}
|
||||
//如果验证码类型是1或2
|
||||
//如果所传验证码类型是1或2
|
||||
else{
|
||||
//准备判断appid是否有效
|
||||
//准备判断所传appid是否有效
|
||||
$appid = $request_arr['appid'];
|
||||
//查询接口信息
|
||||
$AppInfo = AppInfo::findFirst("AppId = '$appid' AND Enable = 0");
|
||||
@ -441,7 +441,7 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果更新成功
|
||||
else{
|
||||
//准备判断access_token是否有效
|
||||
//准备判断所传access_token是否有效
|
||||
$access_token = $request_arr['access_token'];
|
||||
//查询接口信息
|
||||
$AccessToken = AccessToken::findFirst("AppId = '$appid' AND (AccessToken = '$access_token' OR PrevAccessToken = '$access_token')");
|
||||
@ -458,7 +458,7 @@ class SmsController extends ControllerBase{
|
||||
$ExpireTime = $AccessToken->ExpireTime;
|
||||
//获取前access_token到期时间
|
||||
$PrevExpireTime = date("Y-m-d H:i:s", strtotime($AccessToken->ExpireTime)-14400+600);
|
||||
//如果access_token匹配前access_token
|
||||
//如果所传access_token匹配前access_token
|
||||
if($access_token==$AccessToken->PrevAccessToken){
|
||||
//如果前access_token已过期
|
||||
//注意:
|
||||
@ -471,7 +471,7 @@ class SmsController extends ControllerBase{
|
||||
$rs['data'] = null;
|
||||
}
|
||||
}
|
||||
//如果access_token匹配现access_token
|
||||
//如果所传access_token匹配现access_token
|
||||
else{
|
||||
//如果现access_token已过期
|
||||
if($current_datetime>$ExpireTime){
|
||||
@ -498,8 +498,8 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果以上未设置验证码或缓存中所传手机号对应的验证码已失效
|
||||
if(empty($authcode)){
|
||||
//生成验证码
|
||||
$authcode = $this->_get_auth_code($digit, $type);
|
||||
//按所传验证码长度及验证码类型生成并设置验证码
|
||||
$authcode = $this->_get_auth_code($len, $type);
|
||||
}
|
||||
//获取特定验证码短信模板
|
||||
$special_authcode_templates = $this->special_authcode_templates;
|
||||
@ -610,7 +610,7 @@ class SmsController extends ControllerBase{
|
||||
/**
|
||||
* 随机生成字符串
|
||||
*/
|
||||
function _get_auth_code($digit=4, $type=1){
|
||||
function _get_auth_code($len=4, $type=1){
|
||||
//初始纯数字字符串
|
||||
$str = "0123456789";
|
||||
//如果需要字母
|
||||
@ -618,7 +618,7 @@ class SmsController extends ControllerBase{
|
||||
//加上大写字母字符串,I、O两字母除外
|
||||
$str.= "ABCDEFGHJKLMNPQRSTUVWXYZ";
|
||||
}
|
||||
$code = substr(str_shuffle($str), 0, $digit);
|
||||
$code = substr(str_shuffle($str), 0, $len);
|
||||
return $code;
|
||||
}
|
||||
|
||||
@ -652,14 +652,14 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果请求数据整体不为空
|
||||
else{
|
||||
//准备获取appid和access_token
|
||||
//准备获取所传appid和access_token
|
||||
$rs['errmsg'] = "";
|
||||
//如果未获取到appid
|
||||
//如果未获取到所传appid
|
||||
if(empty($request_arr['appid'])){
|
||||
//告知用户"appid is empty;"
|
||||
$rs['errmsg'].= "appid is empty;";
|
||||
}
|
||||
//如果未获取到access_token
|
||||
//如果未获取到所传access_token
|
||||
if(empty($request_arr['access_token'])){
|
||||
//告知用户"access_token is empty;"
|
||||
$rs['errmsg'].= "access_token is empty;";
|
||||
@ -673,7 +673,7 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果以上判断都通过
|
||||
else{
|
||||
//准备判断appid是否有效
|
||||
//准备判断所传appid是否有效
|
||||
$appid = $request_arr['appid'];
|
||||
//查询接口信息
|
||||
$AppInfo = AppInfo::findFirst("AppId = '$appid' AND Enable = 0");
|
||||
@ -743,7 +743,7 @@ class SmsController extends ControllerBase{
|
||||
}
|
||||
//如果更新成功
|
||||
else{
|
||||
//准备判断access_token是否有效
|
||||
//准备判断所传access_token是否有效
|
||||
$access_token = $request_arr['access_token'];
|
||||
//查询接口信息
|
||||
$AccessToken = AccessToken::findFirst("AppId = '$appid' AND (AccessToken = '$access_token' OR PrevAccessToken = '$access_token')");
|
||||
@ -760,7 +760,7 @@ class SmsController extends ControllerBase{
|
||||
$ExpireTime = $AccessToken->ExpireTime;
|
||||
//获取前access_token到期时间
|
||||
$PrevExpireTime = date("Y-m-d H:i:s", strtotime($AccessToken->ExpireTime)-14400+600);
|
||||
//如果access_token匹配前access_token
|
||||
//如果所传access_token匹配前access_token
|
||||
if($access_token==$AccessToken->PrevAccessToken){
|
||||
//如果前access_token已过期
|
||||
//注意:
|
||||
@ -773,7 +773,7 @@ class SmsController extends ControllerBase{
|
||||
$rs['data'] = null;
|
||||
}
|
||||
}
|
||||
//如果access_token匹配现access_token
|
||||
//如果所传access_token匹配现access_token
|
||||
else{
|
||||
//如果现access_token已过期
|
||||
if($current_datetime>$ExpireTime){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user