Prechádzať zdrojové kódy

WX接口命名空间

LD 6 rokov pred
rodič
commit
33c7d59964

+ 3 - 2
app/Http/Controllers/api/thirdPart/weixin/WxController.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\api\thirdPart\weixin;
+namespace App\Http\Controllers\Api\thirdPart\weixin;
 /**
  * TODO::接口路径(微信线上)的需要修改,因为route文件和路径都改成了新的标准
  */
 use App\Unit;
 use App\User;
+use App\UserToken;
 use App\Waybill;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -19,7 +20,7 @@ class WxController extends Controller
         $carrierArr=[];
         $carriersName=[];
         $api_token=$request->input('api_token');
-        $user=User::with('carriers')->where('api_token',$api_token)->first();
+        $user = UserToken::getUser($api_token);
         if ($user){
             foreach ($user->carriers as $carrier){
                 array_push($carrierArr, $carrier->id);

+ 2 - 2
app/Http/Controllers/api/thirdPart/weixin/WxLoginController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\api\thirdPart\weixin;
+namespace App\Http\Controllers\Api\thirdPart\weixin;
 
 use App\User;
 use Illuminate\Http\Request;
@@ -18,7 +18,7 @@ class WxLoginController extends Controller
             $isRight=Hash::check($pwd,$user['password']);
             if ($isRight){
                 $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),$user->id);
-                return ['api_token'=>$user->api_token];
+                return ['api_token'=>$user->token()];
             }
             else return ['api_token'=>''];
         }

+ 0 - 1
app/Providers/RouteServiceProvider.php

@@ -85,7 +85,6 @@ class RouteServiceProvider extends ServiceProvider
             ->namespace('App\Http\Controllers\Api\thirdPart\weight')
             ->group(base_path('routes/api/thirdPart/weight.php'));
         Route::prefix('api/thirdPart/weixin')
-            ->middleware(['api','auth:api'])
             ->namespace('App\Http\Controllers\Api\thirdPart\weixin')
             ->group(base_path('routes/api/thirdPart/weixin.php'));
     }

+ 2 - 1
routes/api/thirdPart/weixin.php

@@ -9,9 +9,10 @@ use Illuminate\Http\Request;
 */
 
 Route::group(['middleware'=>'auth:api'],function(){
-    Route::get('waybill', "WxController@index");//微信小程序数据返回
+    Route::any('waybill', "WxController@index");//微信小程序数据返回
     Route::post('waybill/show', "WxController@show");//微信小程序数据返回
     Route::post('waybill/update', "WxController@update");//微信小程序数据修改
 });
 Route::post('login', "WxLoginController@login");//微信小程序登录验证
+Route::any('xx/waybill2/xx', "WxController@index2");//微信小程序数据返回
 

+ 1 - 0
tests/waybill_flux.http

@@ -2,3 +2,4 @@ POST https://was.baoshi56.com/api/thirdPart/flux/waybill/new
 Content-Type: application/json
 
 {"request":[{"OrderNo":"SO20050600005","CustomerID":"WANLING","CarrierID":"BSZXDF","ConsigneeName":"MOB186****0626","C_Tel1":"","C_Address1":"四川省 眉山市 洪雅县 洪川镇洪雅县政府","C_Province":"四川省","C_City":"眉山市","C_District":"洪雅县","ReservedField01":"","ReservedField02":"","ReservedField03":"","ReservedField04":"","ReservedField05":"","order_list":[{"SKU_Descr_c":"测试商品","SKU":"TEST025","Alternate_sku1":"TEST025","Qtyordered_each":"1","Cubic":"0","GrossWeight":"0","NetWeight":"0","ReservedField01":"","ReservedField02":"","ReservedField03":"","ReservedField04":"","ReservedField05":""}]}]}
+

+ 1 - 0
tests/wx.http

@@ -0,0 +1 @@
+GET https://was.baoshi56.com/api/thirdPart/weixin/waybill?api_token=b2b3c637909997033801f5f733cf1fe33