20
This commit is contained in:
@@ -56,6 +56,33 @@ class CommonController extends BaseController{
|
||||
$config['recharge_status_list'] = \app\enum\RechargeStatus::toArray();
|
||||
$config['withdrawl_status_list'] = \app\enum\WithdrawlStatus::toArray();
|
||||
$config['server_status_list'] = \app\enum\ServerStatus::toArray();
|
||||
$config['see_point_awards'] = [
|
||||
[
|
||||
'name'=>'S1',
|
||||
'award'=>0.05,
|
||||
'total'=>50,
|
||||
],
|
||||
[
|
||||
'name'=>'S2',
|
||||
'award'=>0.1,
|
||||
'total'=>100,
|
||||
],
|
||||
[
|
||||
'name'=>'S3',
|
||||
'award'=>0.15,
|
||||
'total'=>1000,
|
||||
],
|
||||
[
|
||||
'name'=>'S4',
|
||||
'award'=>0.2,
|
||||
'total'=>5000,
|
||||
],
|
||||
[
|
||||
'name'=>'S5',
|
||||
'award'=>0.25,
|
||||
'total'=>20000,
|
||||
]
|
||||
];
|
||||
//$config['getFriendList'] = $request->IM->friend->getFriendList('100006');
|
||||
return $this->success(__('successful'), $config);
|
||||
}
|
||||
@@ -97,7 +124,9 @@ class CommonController extends BaseController{
|
||||
* 注册会员
|
||||
*
|
||||
* @Apidoc\Method ("POST")
|
||||
* @Apidoc\Param("type", type="string",require=true, desc="注册方式:email,mobile")
|
||||
* @Apidoc\Param("email", type="string",require=true, desc="邮箱")
|
||||
* @Apidoc\Param("mobile", type="string",require=true, desc="手机号码")
|
||||
* @Apidoc\Param("password", type="string",require=true, desc="密码")
|
||||
* @Apidoc\Param("trade_password", type="string",require=true, desc="交易密码")
|
||||
* @Apidoc\Param("invite_code", type="string",require=true, desc="推荐码")
|
||||
@@ -121,7 +150,7 @@ class CommonController extends BaseController{
|
||||
}
|
||||
$username = $email;
|
||||
unset($mobile);
|
||||
//captcha_verfiy('email','register',$email,false);
|
||||
captcha_verfiy('email','register',$email,false);
|
||||
}
|
||||
if ($type == 'mobile') {
|
||||
if(!$mobile || !Validate::regex($mobile, "^1\d{10}$")){
|
||||
@@ -129,10 +158,10 @@ class CommonController extends BaseController{
|
||||
}
|
||||
$username = $mobile;
|
||||
unset($email);
|
||||
//captcha_verfiy('mobile','register',$mobile,false);
|
||||
captcha_verfiy('mobile','register',$mobile,false);
|
||||
}
|
||||
if ($type == 'username') {
|
||||
if(!$email || !Validate::is($email, "email")){
|
||||
if(!$username){
|
||||
return $this->error(__('Username is incorrect'));
|
||||
}
|
||||
}
|
||||
@@ -151,9 +180,18 @@ class CommonController extends BaseController{
|
||||
'role_id' => 1,
|
||||
'group_id' => 0,
|
||||
'region' => '86',
|
||||
'nickname' => input('nickname','用户_'.substr($username,7)),
|
||||
'nickname' => input('nickname'),
|
||||
'avatar' => '/static/avatar/'.rand(0,17).'.png',
|
||||
];
|
||||
if(empty($extends['nickname'])){
|
||||
if($type == 'mobile'){
|
||||
$extends['nickname'] = '用户_'.substr($username,7);
|
||||
}else if($type == 'email'){
|
||||
$extends['nickname'] = '用户_'.substr(explode('@',$username)[0],7);
|
||||
}else{
|
||||
$extends['nickname'] = $username;
|
||||
}
|
||||
}
|
||||
if ($invite_code) {
|
||||
if(strlen($invite_code) == 12){
|
||||
//系统生产的一次性推荐吗
|
||||
@@ -203,10 +241,12 @@ class CommonController extends BaseController{
|
||||
* 登录
|
||||
* @Apidoc\Method("POST")
|
||||
* @Apidoc\Param("username", type="string",require=false, desc="用户名登录必填")
|
||||
* @Apidoc\Param("email", type="string",require=false, desc="邮箱登录必填")
|
||||
* @Apidoc\Param("mobile", type="string",require=false, desc="手机号登录必填")
|
||||
* @Apidoc\Param("type", type="string",require=true,default="mobile",desc="登录方式,username,mobile,email")
|
||||
* @Apidoc\Param("password", type="string",require=false, desc="密码的登录必填")
|
||||
* @Apidoc\Param("code", type="string",require=false, desc="验证码登录必填")
|
||||
* @Apidoc\Param("platform", type="string",require=false, desc="平台",default="web")
|
||||
* @Apidoc\Param("region", type="string",require=false,default="86", desc="区域,手机号登录必填")
|
||||
*/
|
||||
public function login(Request $request){
|
||||
@@ -321,11 +361,13 @@ class CommonController extends BaseController{
|
||||
* @Apidoc\Param("email", type="string",require=true, desc="邮箱")
|
||||
* @Apidoc\Param("newpassword", type="string",require=true, desc="新密码")
|
||||
* @Apidoc\Param("code", type="string",require=true, desc="邮箱验证码,event=reset_trade_pwd")
|
||||
* @Apidoc\Param("verify_type", type="string",require=true, desc="验证方式,email,mobile")
|
||||
*/
|
||||
public function reset_trade_pwd()
|
||||
{
|
||||
$email = input("email");
|
||||
$mobile = input("mobile");
|
||||
$verify_type = input("verify_type");
|
||||
$newpassword = input("newpassword");
|
||||
if (!$newpassword) {
|
||||
return $this->error(__('Invalid parameters'));
|
||||
@@ -334,7 +376,6 @@ class CommonController extends BaseController{
|
||||
if (!Validate::check(['newpassword' => $newpassword], ['newpassword' => 'require|regex:\S{6,32}'])) {
|
||||
return $this->error(__('Trade password must be 6-32 characters'));
|
||||
}
|
||||
|
||||
if (!$mobile && !$email){
|
||||
try{
|
||||
$user = \support\Jwt::getUser();
|
||||
@@ -342,7 +383,14 @@ class CommonController extends BaseController{
|
||||
$user = false;
|
||||
}
|
||||
if($user){
|
||||
captcha_verfiy('mobile','reset_trade_pwd',$user->mobile);
|
||||
|
||||
if($verify_type == 'email'){
|
||||
captcha_verfiy('email','reset_trade_pwd',$user->email);
|
||||
}else if($verify_type == 'mobile'){
|
||||
captcha_verfiy('mobile','reset_trade_pwd',$user->mobile);
|
||||
}else{
|
||||
return $this->error(__('Unknown verify type'));
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if ($mobile && Validate::regex($mobile, "^1\d{10}$")) {
|
||||
@@ -402,12 +450,13 @@ class CommonController extends BaseController{
|
||||
$list[$code] = time();
|
||||
cache($key,$list);
|
||||
cache('exp_'.$key,time());
|
||||
// addJob([
|
||||
// 'email' => $email,
|
||||
// 'title' => __("Mt email code"),
|
||||
// 'event' => $event,
|
||||
// 'code' => $code
|
||||
// ],'Email');
|
||||
addJob([
|
||||
'email' => $email,
|
||||
'title' => __(Config('site.name').' 验证码'),
|
||||
'event' => $event,
|
||||
'code' => $code
|
||||
],'Email');
|
||||
\support\Log::channel('mail')->alert("邮件验证码：".$code.'，邮箱：'.$email);
|
||||
return $this->success(__('Email sent successfully'),[
|
||||
'code'=> $debug ? $code : ''
|
||||
]);
|
||||
@@ -443,6 +492,7 @@ class CommonController extends BaseController{
|
||||
'event' => $event,
|
||||
'code' => $code
|
||||
],'Sms');
|
||||
\support\Log::channel('mail')->alert("短信验证码：".$code.'，手机号：'.$mobile);
|
||||
return $this->success(__('SMS sent successfully'),[
|
||||
'code'=> $debug ? $code : ''
|
||||
]);
|
||||
|
||||
Reference in New Issue
Block a user