Wesmiler OTC 提交更新 0729

app/Http/Controllers/Api/LoginController.php

@@ -57,12 +57,18 @@ class LoginController extends webApp
             return message($params, false);
         }
 
+        // 验证注册来源
         $headers = request()->header();
         $host = isset($headers['host'])? $headers['host'] : '';
         $referer = isset($headers['referer'])? $headers['referer'] : $host;
         $referer = $referer? preg_replace("/^http:\/\/|https:\/\//",'', $referer) : '';
-
-        var_dump($referer);
+        $referer = isset($referer[0])? $referer[0] : '';
+        $query = explode('.', $referer);
+        $source = isset($query[0])? $query[0] : '';
+        $params['user_type'] = 1;
+        if(in_array($source, ['api','bc'])){
+            $params['user_type'] = 5;
+        }
 
         if($params['code'] != 123456 && !$this->checkCode($params['username'], $params['code'], 'reg')){
             return message($this->error, false);
@@ -86,12 +92,12 @@ class LoginController extends webApp
     {
         $validator = new MemberValidator();
         if(!is_array($validator->check(['mobile'=> $username],'mobile'))){
-             if(!EmailService::make()->check($username, $code, $scene)){
-                 $this->error = EmailService::make()->getError();
-                 return false;
-             }
+            if(!EmailService::make()->check($username, $code, $scene)){
+                $this->error = EmailService::make()->getError();
+                return false;
+            }
 
-             return true;
+            return true;
         }else{
             if(!SmsService::make()->check($username, $code, $scene)){
                 $this->error = SmsService::make()->getError();

app/Http/Controllers/Oapi/LoginController.php

@@ -43,7 +43,7 @@ class LoginController extends webApp
             ]);
         }
 
-        $params = $validator->check($params, 'login');
+        $params = $validator->check($params, 'apiLogin');
         if(!is_array($params)){
             return message($params, false);
         }
@@ -59,7 +59,7 @@ class LoginController extends webApp
     public function register(MemberValidator  $validator)
     {
         $params = request()->all();
-        $params = $validator->check($params, 'reg');
+        $params = $validator->check($params, 'apiRegister');
         if(!is_array($params)){
             return message($params, false);
         }
@@ -78,7 +78,7 @@ class LoginController extends webApp
             return message(MemberService::make()->getError(), false);
         }
 
-        return message(2004, true, $result);
+        return message(2008, true);
     }
 
 

app/Http/Controllers/Oapi/MemberController.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\Http\Controllers\Oapi;
+use App\Http\Validator\MemberValidator;
 use App\Services\Api\MemberService;
 
 /**
@@ -26,8 +27,26 @@ class MemberController extends webApp
         }
     }
 
-    public function modifyAccount()
+    /**
+     * 修改账号
+     * @param MemberValidator $validator
+     * @return array
+     */
+    public function modify(MemberValidator  $validator)
     {
+        if(empty($this->userId)){
+            return message(6012, false);
+        }
+        $params = request()->all();
+        $params = $validator->check($params, 'apiModify');
+        if(!is_array($params)){
+            return message($params, false);
+        }
 
+        if(MemberService::make()->modify($this->userId, $params)){
+            return message(6013, true);
+        }else{
+            return message(MemberService::make()->getError(), false);
+        }
     }
 }

app/Http/Controllers/Oapi/webApp.php

@@ -11,11 +11,8 @@
 
 namespace App\Http\Controllers\Oapi;
 
-use App\Helpers\Jwt;
 use App\Http\Controllers\BaseController;
-use App\Models\ApiModel;
 use App\Services\Api\MemberService;
-use App\Services\ConfigService;
 use App\Services\RedisService;
 
 /**
@@ -74,7 +71,7 @@ class webApp extends BaseController
             $requestCount = RedisService::get($cacheKey);
             $requestCount = $requestCount? $requestCount : 0;
             if($requestCount >= 10){
-                return message(1028, false, null, 403);
+                return response()->json(message(1028, false, null, 403));
             }
 
             // 登录验证
@@ -87,7 +84,13 @@ class webApp extends BaseController
                 $this->apiId = isset($userInfo['api_id'])? $userInfo['api_id'] : $this->apiId;
             }
 
-            RedisService::set($cacheKey, $requestCount+1, rand(1,2));
+            if(RedisService::exists($cacheKey)){
+                RedisService::incr($cacheKey, 1);
+            }else{
+                RedisService::incr($cacheKey, 1);
+                RedisService::expire($cacheKey, 5);
+            }
+
             return $next($request);
         });
     }

app/Http/Validator/MemberValidator.php

@@ -20,6 +20,7 @@ class MemberValidator extends BaseValidator
         'bank_front_img'=> 'required|max:150',
         'bank_back_img'=> 'required|max:150',
         'credit_score_img'=> 'required|max:150',
+        'token'=> 'required|max:100',
     ];
 
     // 当前模型所有错误提示信息
@@ -33,6 +34,7 @@ class MemberValidator extends BaseValidator
         'mobile' => ':attribute格式不正确',
         'email' => ':attribute格式不正确',
         'username' => ':attribute格式不正确',
+        'new_username' => ':attribute格式不正确',
         'realname' => ':attribute格式不正确',
         'idcard' => ':attribute格式不正确',
         'password' => ':attribute格式不正确',
@@ -56,6 +58,7 @@ class MemberValidator extends BaseValidator
         'bank_back_img' => '银行卡反面',
         'credit_score_img' => '信誉分截图',
         'api_key' => '接口密钥参数',
+        'token' => '授权TOKEN',
     ];
 
     // 当前模型所有验证场景
@@ -68,8 +71,10 @@ class MemberValidator extends BaseValidator
         'auth'=> ['realname','idcard','idcard_front_img','idcard_back_img','idcard_hand_img','bank_front_img','bank_back_img'],
         'business_auth'=> ['realname','idcard','idcard_front_img','idcard_back_img','idcard_hand_img'],
         'login'=> ['username','password'],
+        'reg'=> ['username','password'],
         'apiLogin'=> ['username','password','api_key'],
         'apiRegister'=> ['username','password','api_key'],
+        'apiModify'=> ['username','new_username','password','token'],
         'forget'=> ['username','code'],
         'save'=> ['username','realname','gender'],
         'mobile'=> ['mobile'],

app/Services/Api/MemberService.php

@@ -267,7 +267,6 @@ class MemberService extends BaseService
             'api_id' => $apiId,
             'user_type' => $userType ? $userType : 3,
             'password' => get_password($password . md5($password . 'otc')),
-            'trade_password' => get_password($password . md5($password . 'otc')),
             'mobile' => isPhone($username) ? $username : '',
             'idcard' => isset($params['idcard'])? $params['idcard'] : '',
             'realname' => isset($params['realname'])? $params['realname'] : '',

app/Services/Common/MemberService.php

@@ -189,7 +189,10 @@ class MemberService extends BaseService
         }
 
         if(isset($data['idcard_check']) && $data['idcard_check']==1){
-            $data['safe_level'] = $data['safe_level']==2? 3 : $data['safe_level'];
+            $safeLevel = isset($data['safe_level'])? isset($data['safe_level']) : 2;
+            $data['safe_level'] = $safeLevel==2? 3 : $safeLevel;
+
+
         }
 
         unset($data['city']);

app/Services/Oapi/TradeOrderService.php

@@ -186,7 +186,7 @@ class TradeOrderService extends BaseService
         $notifyUrl = isset($params['notify_url']) ? trim($params['notify_url']) : '';
         $tradeType = $tradeType==3? $tradeType : 2;
 
-        // 外汇平台需要注册登录
+        // BC平台需要注册登录
         if ($userId <= 0 && $tradeType == 3) {
             $this->error = '1013';
             return false;
@@ -392,7 +392,12 @@ class TradeOrderService extends BaseService
         }
 
         $this->model->commit();
-        return ['token'=> isset($params['token'])? $params['token'] : '', 'order_no'=> $data['order_no']];
+
+        $host = env('WEB_URL','');
+        $host = $host? $host : request()->header('HOST');
+        $token = isset($params['token'])? $params['token'] : '';
+        $url = $host.'/h5/#/pages/h5/confirm?order_no='.$data['order_no'].'&token='.$token;
+        return ['token'=> $token, 'order_no'=> $data['order_no'],'url'=> $url];
     }
 
     /**
@@ -571,7 +576,12 @@ class TradeOrderService extends BaseService
         }
 
         $this->model->commit();
-        return ['token'=> isset($params['token'])? $params['token'] : '', 'order_no'=> $data['order_no']];
+
+        $host = env('WEB_URL','');
+        $host = $host? $host : request()->header('HOST');
+        $token = isset($params['token'])? $params['token'] : '';
+        $url = $host.'/h5/#/pages/h5/confirm?order_no='.$data['order_no'].'&token='.$token;
+        return ['token'=> $token, 'order_no'=> $data['order_no'],'url'=> $url];
     }
 
     /**