|
@@ -7,13 +7,6 @@ use think\facade\Db;
|
|
|
class CheckAuth
|
|
|
{
|
|
|
protected $noCheck=[];
|
|
|
- // header头配置
|
|
|
- protected $header = [
|
|
|
- 'Access-Control-Allow-Credentials' => 'true',
|
|
|
- 'Access-Control-Max-Age' => 1800,
|
|
|
- 'Access-Control-Allow-Methods' => 'GET, POST, PATCH, PUT, DELETE, OPTIONS',
|
|
|
- 'Access-Control-Allow-Headers' => 'Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-CSRF-TOKEN, X-Requested-With,token',
|
|
|
- ];
|
|
|
/**
|
|
|
* 处理请求
|
|
|
*
|
|
@@ -26,20 +19,22 @@ class CheckAuth
|
|
|
if($request->isOptions()){
|
|
|
return json();
|
|
|
}
|
|
|
-// $header =$request->header();
|
|
|
-// $header = !empty($header) ? array_merge($this->header, $header) : $this->header;
|
|
|
-// if (!isset($header['Access-Control-Allow-Origin'])) {
|
|
|
-// $origin = $request->header('origin');
|
|
|
-// $header['Access-Control-Allow-Origin'] = $origin;
|
|
|
-// }
|
|
|
-//
|
|
|
+ $header =$request->header();
|
|
|
$param =$request->post();
|
|
|
-// if($header['is_strict_login']==True){
|
|
|
-// $check =$this->check($header,$param);
|
|
|
-// if($check['code']==1){
|
|
|
-// return json_show(104,$check['msg']);
|
|
|
-// }
|
|
|
-// }
|
|
|
+ if (isset($header['web-auth'])&&$header['web-auth']==1) {
|
|
|
+ $data=[
|
|
|
+ "origin"=>$header['origin']??"",
|
|
|
+ "noce"=>$header['noce']??'',
|
|
|
+ "timestamp"=>$header['timestamp']??'',
|
|
|
+ "sign"=>$header['sign']??'',
|
|
|
+ ];
|
|
|
+ $check= \Header::checkHeader($header);
|
|
|
+ }else{
|
|
|
+ $check =$this->check($header,$param);
|
|
|
+ if($check['code']==1){
|
|
|
+ return json_show(104,$check['msg']);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
return $next($request);
|
|
|
}
|