Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/WxController.php

@@ -68,4 +68,26 @@ class WxController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+    public function wxH5(Request $request){
+        file_put_contents('1.txt',json_encode($request->all()));
+//        die('adsds');
+//        $data = json_decode('{"signature":"fe04bfbb92a1c073e9f0829d3c4e48e1b40403aa","echostr":"5841396639871246203","timestamp":"1695188315","nonce":"1459788183"}',true);
+        $data = $request->all();
+        $signature = $data["signature"];
+        $timestamp = $data["timestamp"];
+        $nonce = $data["nonce"];
+
+        $token = 'qingyaokeji';
+        $tmpArr = array($token, $timestamp, $nonce);
+        sort($tmpArr, SORT_STRING);
+        $tmpStr = implode( $tmpArr );
+        $tmpStr = sha1( $tmpStr );
+//        var_dump($tmpStr);
+//        var_dump($signature);die;
+        if( $tmpStr == $signature ){
+            echo $data['echostr'];die;
+        }else{
+            die('fail');
+        }
+    }
 }

app/Service/OaService.php

@@ -698,7 +698,7 @@ class OaService extends Service
     {
         $order_no = $data['order_no'];
         $menu_id = $data['menu_id'];
-        $oa = OaOrder::where('order_no', $order_no)->where('menu_id', $menu_id)->first();
+        $oa = OaOrder::where('order_no', $order_no)->first();
         if (empty($oa)) return [false, '审核不存在'];
         $list = OaOrderSub::where('oa_order_id', $oa->id)->orderBy('sort', 'asc')->select('*')->get()->toArray();
         return [true, $list];

routes/wx.php

@@ -15,6 +15,7 @@ use Illuminate\Http\Request;
 Route::any('wxSetUser', 'Api\WxController@setUser');
 Route::any('wxSetMobile', 'Api\WxController@setMobile');
 Route::any('wxLogin', 'Api\WxController@login');
+Route::any('wxH5', 'Api\WxController@wxH5');
 
 Route::group(['middleware'=> ['checkWx']],function ($route){
     $route->any('oaCheck', 'Api\OaController@oaCheck');