Jelajahi Sumber

接口配置结构

LD 6 tahun lalu
induk
melakukan
f69098a62e

+ 1 - 1
app/Http/Controllers/ExcelController.php

@@ -47,7 +47,7 @@ class ExcelController extends Controller
         ini_set('max_execution_time',2500);
         ini_set('memory_limit','1526M');
 
-        $filePathName='d:/2020-01.json';
+        $filePathName='d:/02.json';
         $goodsesExcelArray=[['barcode','weight','id','key','time','url']];
         $handler=fopen($filePathName,'r');
         $json = fread($handler, filesize($filePathName));

+ 2 - 7
app/Http/Controllers/MeasureMonitorController.php

@@ -12,9 +12,6 @@ require_once '../app/library/baidu-api-speech/AipSpeech.php';
 class MeasureMonitorController extends Controller
 {
 
-    const APP_ID='18433903';
-    const API_KEY='3pfojF55BI9LFfXdaI8wRyV2';
-    const SECRET_KEY='ZRSZWUPNgRNrdm4gBQ5Gf0c1oANN4mnd';
     /**
      * Display a listing of the resource.
      *
@@ -22,14 +19,12 @@ class MeasureMonitorController extends Controller
      */
     public function index(Request $request)
     {
-        if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $measuringMachines=MeasuringMachine::select('id','name','code','status')->get();
         $laravelEchoPrefix = config('database.redis.options.prefix');
         return view('weight.measureMonitor.index',compact('laravelEchoPrefix','measuringMachines'));
     }
 
     public function data(Request $request){
-        if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $measuring_machine_id=$request->input('id');
         if ($measuring_machine_id){
             /*$package=Package::with('owner','paperBox','measuringMachine')->where('measuring_machine_id',$measuringMachines[0]->id)->orderBy('id','DESC')->first();*/
@@ -59,12 +54,12 @@ class MeasureMonitorController extends Controller
         if (file_exists("storage/".$logistic.'.mp3')){
             return "/storage/".$logistic.'.mp3';
         }
-        $client=new \AipSpeech(self::APP_ID,self::API_KEY,self::SECRET_KEY);
+        $client=new \AipSpeech(config('api.baidu.speech.APP_ID'),config('api.baidu.speech.API_KEY'),config('api.baidu.speech.SECRET_KEY'));
         $client->setConnectionTimeoutInMillis('180000');
         $client->setSocketTimeoutInMillis('180000');
 
         $result = $client->synthesis($logistic, 'zh', 1, array(
-            'vol' => 10,
+            'vol' => 15,
         ));
         // 识别正确返回语音二进制 错误则返回json 参照下面错误码
         if(!is_array($result)){

+ 2 - 7
app/Http/Controllers/TestController.php

@@ -39,13 +39,8 @@ class TestController extends Controller
         return call_user_func([$this, $method],$request);
     }
     function t1(Request $request){ //x
-        $package=new Package([
-            'logistic_number'=>'12333'.rand(0,99999),
-            'weight'=>'55',
-            'paper_box_id'=>null
-        ]);
-        $package->save();
-        event(new WeighedEvent($package));
+        $url=url(config('api.flux.receive.new'));
+        dd($url,config('api.flux.receive'),config('api.flux'));
     }
     function tj(Request $request){
         $bills=RejectedBill::where('is_loaded',2)->where('created_at','<',Carbon::now()->subHours(10)->toDateTimeString());

+ 1 - 1
app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -157,7 +157,7 @@ class PackageController extends Controller
                 'USERDEFINE3'=>'OK',
             ]];
         $json=json_encode($json);
-        $url=url(config('api.packageAccomplishTOWMS_flux'));
+        $url=url(config('api.flux.package.new'));
         $response = Zttp::post($url, json_decode($json));
         $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
         $response=$response->json();

+ 1 - 1
app/Http/Controllers/api/thirdPart/flux/ReceiveController.php

@@ -223,7 +223,7 @@ class ReceiveController extends Controller
         ";
 
             $sendingJson = json_decode($json,true);
-            $url=url(config('api.receiveAccomplishToWMS_flux'));
+            $url=url(config('api.flux.receive.new'));
             $response = Zttp::post($url, $sendingJson);
             $noIssues=true;
             $json = $response->json();

+ 17 - 4
config/api.php

@@ -13,10 +13,23 @@ return [
 
     /** Flux
     https://was.baoshi56.com/api/thirdPart/flux/receive/new  //新增收货
-     **/
-    'receiveAccomplishToWMS_flux' => 'http://106.14.155.246:19192/datahub/FluxBSJsonApi/RECECF?messageId=RECECF', //通知WMS完成的订单收货
-    /** Flux
     https://was.baoshi56.com/api/thirdPart/flux/package/new  //新增包裹
      **/
-    'packageAccomplishTOWMS_flux' =>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/TASK',
+    'flux'=>[
+        'receive'=>[
+            'new'=>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/RECECF?messageId=RECECF' //通知WMS, 已完成的订单收货
+        ],
+        'package'=>[
+            'new'=>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/TASK' //通知WMS, 已称完的包裹
+        ],
+    ],
+
+    'baidu'=>[
+        'speech'=>[
+            'APP_ID'=> '18688250',
+            'API_KEY'=> 'GLSF2EP1H9C6hRxQ3b4Kb84I',
+            'SECRET_KEY'=> 'jEAdTa8EapjZZnfxxmdSwFFjjt2UmoaX',
+        ],
+    ],
+
 ];

+ 1 - 1
config/database.php

@@ -123,7 +123,7 @@ return [
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'predis'),
-            //'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_',
+            'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_',
         ],
 
         'default' => [

+ 1 - 1
public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/app.js": "/js/app.js",
     "/css/app.css": "/css/app.css",
-    "/js/singles/rejectedIndex200212.js": "/js/singles/rejectedIndex200212.js",
+    "/js/singles/rejectedIndex200305.js": "/js/singles/rejectedIndex200305.js",
     "/favicon.ico": "/favicon.ico"
 }

TEMPAT SAMPAH
其它.mp3


TEMPAT SAMPAH
圆通快递.mp3


TEMPAT SAMPAH
韵达快递.mp3


TEMPAT SAMPAH
顺丰.mp3