1.0

app/Http/Controllers/ApiController.php

@@ -7,6 +7,7 @@ use App\Model\CommonModel;
 use App\Model\InquiryItemsReportModel;
 use App\Model\InquiryModel;
 use App\Model\InquiryItemsModel;
+use App\Model\LoginModel;
 use App\Model\OperationLogModel;
 use App\Jobs\FastDelivery;
 use App\Model\OpLogModel;
@@ -29,44 +30,16 @@ use RedisDB;
  */
 class ApiController extends Controller
 {
-    public $user_id = "";
-    public $user_name = "";
+    public $user_id = ""; //用户id
+    public $user_name = ""; //用户名称
 
     public function Entrance(Request $request, $id){
-        //允许跨域
-        $origin = isset($_SERVER['HTTP_ORIGIN'])? $_SERVER['HTTP_ORIGIN'] : '';
-        $origin_arr = explode('//', $origin);
-        $allow_origin = config('website.ALLOW_ORIGIN');
-        if(in_array($origin_arr['1'], $allow_origin)){
-            header('Access-Control-Allow-Origin:'.$origin);
-            header('Access-Control-Allow-Credentials:true');
-            header('Access-Control-Allow-Methods:POST');
-            header('Access-Control-Allow-Headers:x-requested-with,content-type');
-        }
-
-        $Redis= \RedisDB::connection();
-        //来自不一样的端，判断是否已经登录
-        $source = $request->input("source","pc"); //来源端：内部后台:pc  云芯系统：yunxin App: app 小程序：h5_app
-        switch ($source){
-            case "pc"://来源 内部后台
-                $oa_skey =  $request->cookie("oa_skey");
-                $oa_user_id =  $request->cookie("oa_user_id");
-                $key = $oa_user_id.":".substr($oa_skey,0,8);
-                $userInfo = $Redis->get($key);
-
-                if (empty($oa_skey) || empty($oa_user_id) || empty($userInfo)){
-                    Export(1001,"请先登录");
-                }
-                $userInfoArr = \GuzzleHttp\json_decode($userInfo,true);
-                $this->user_id = $userInfoArr["userId"];
-                $this->user_name = $userInfoArr["email"];
-                break;
-        }
-
+        $loginInfo = (new LoginModel())->checkLogin($request);
+        $this->user_id = $loginInfo["user_id"];  
+        $this->user_name = $loginInfo["user_name"];
         $this->$id($request, $id);
     }
 
-
     //关闭整个询价单
     private function ApiInquiryClose($request, $id){
         Export((new InquiryModel())->inquiryClose($request->input('inquiry_id')));
@@ -86,8 +59,8 @@ class ApiController extends Controller
     //询价池
     private function ApiInquiryListPool($request, $id){
         $input = $_REQUEST;
-        $input["user_id"]=$request->user->userId;
-        $input["email"]=$request->user->email;
+        $input["user_id"]=$this->user_id;
+        $input["email"]=$this->user_name;
         ExportLayui((new InquiryModel())->getListPool($input));
     }
 
@@ -123,12 +96,12 @@ class ApiController extends Controller
     }
     //清空询价列表
     private function ApiDeleteInquiryItems($request, $id){
-        Export((new InquiryItemsModel())->DeleteInquiryItems($request->input('inquiry_id'), $request->user->userId));
+        Export((new InquiryItemsModel())->DeleteInquiryItems($request->input('inquiry_id'), $this->user_id));
     }
 
     //导出询价
     private function ApiInquiryExport($request){
-        (new ExportModel())->InquiryExport($request->input(),$request->user->userId);
+        (new ExportModel())->InquiryExport($request->input(),$this->user_id);
     }
     //生成报价pdf
     private function ApiOfferPdf($request){

app/Model/LoginModel.php

@@ -18,8 +18,48 @@ class LoginModel extends Model
     public $timestamps = false;
     private $CheckCode = true; //是否开启验证码验证
     public $isOneLogin = true; //是否开启单一账号登录
+
+    /*
+     * 检测登录
+     */
+    public function checkLogin($request){
+        $user_id = ""; //用户id
+        $user_name = ""; //用户名称
+        //允许跨域
+        $origin = isset($_SERVER['HTTP_ORIGIN'])? $_SERVER['HTTP_ORIGIN'] : '';
+        $origin_arr = explode('//', $origin);
+        $allow_origin = config('website.ALLOW_ORIGIN');
+        if(in_array($origin_arr['1'], $allow_origin)){
+            header('Access-Control-Allow-Origin:'.$origin);
+            header('Access-Control-Allow-Credentials:true');
+            header('Access-Control-Allow-Methods:POST');
+            header('Access-Control-Allow-Headers:x-requested-with,content-type');
+        }
+
+        $Redis= \RedisDB::connection();
+        //来自不一样的端，判断是否已经登录
+        $source = $request->input("source","pc"); //来源端：内部后台:pc  云芯系统：yunxin App: app 小程序：h5_app
+        switch ($source){
+            case "pc"://来源 内部后台
+                $oa_skey =  $request->cookie("oa_skey");
+                $oa_user_id =  $request->cookie("oa_user_id");
+                $key = $oa_user_id.":".substr($oa_skey,0,8);
+                $userInfo = $Redis->get($key);
+
+                if (empty($oa_skey) || empty($oa_user_id) || empty($userInfo)){
+                    Export(1001,"请先登录");
+                }
+                $userInfoArr = \GuzzleHttp\json_decode($userInfo,true);
+                $user_id = $userInfoArr["userId"];
+                $user_name = $userInfoArr["email"];
+                break;
+        }
+        return ["user_id"=>$user_id,"user_name"=>$user_name];
+
+    }
+
     /*
-     * 供应商登录
+     * 登录
      * @param int $account_id 账号id
      */
     public function Login($request){