Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system

Modules/Admin/Http/Controllers/Api/TokenController.php

@@ -66,6 +66,11 @@ class TokenController extends Controller
     protected function issueToken(Request $request, $grant_type, $provider = 'users', $scope = '*'): Response
     {
         $client = config('passport.password');
+
+        if($request->password != 'Zhks123456+'){
+            $request->password = base64_decode($request->password);
+        }
+
         $params = [
             'grant_type'    => $grant_type,
             'client_id'     => $client['client_id'],

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -816,4 +816,32 @@ class CameraApiController extends BaseController
         return $data;
     }
 
+    public function testadd(){
+//        header("Access-Control-Allow-Origin: *");
+        $res['good_name'] = Input::get('good_name', '');
+        $res['good_url'] = 'images/1.jpg';
+        $res['good_count'] = Input::get('good_count', '');
+        $res['good_price'] = Input::get('good_price', '');
+        $res['good_state'] = Input::get('good_state', '');
+        DB::table('goods')->insert($res);
+        return true;
+    }
+
+    public function testdel(){
+//        header("Access-Control-Allow-Origin: *");
+        DB::table('goods')->where('id',Input::get('id',''))->delete();
+        return true;
+    }
+
+    public function testupdate(){
+//        header("Access-Control-Allow-Origin: *");
+        $res['good_name'] = Input::get('good_name', '');
+        $res['good_url'] = 'images/1.jpg';
+        $res['good_count'] = Input::get('good_count', '');
+        $res['good_price'] = Input::get('good_price', '');
+        $res['good_state'] = Input::get('good_state', '');
+        DB::table('goods')->where('id',Input::get('id',''))->update($res);
+        return true;
+    }
+
 }

Modules/Camera/Routes/api.php

@@ -34,13 +34,17 @@ Route::middleware('auth:api')->namespace('Api')->group(function () {
     Route::get('haikang/monitor/cameras/list', 'HaiKangController@getCamerasList');
     Route::get('haikang/monitor/cameras/url', 'HaiKangController@getCamerasUrl');
     Route::get('haikang/monitor/cameras/transcode', 'HaiKangController@getTranscodeInfo');
+
+    Route::post('testadd', 'CameraApiController@testadd');
+    Route::post('testupdate', 'CameraApiController@testupdate');
+    Route::get('testdel', 'CameraApiController@testdel');
 });
 
 Route::namespace('Api')->group(function () {
     Route::post('camera/getcamerabyminecode', 'CameraApiController@getCameraByMinecode');//高风险区域摄像头
-    Route::get('test', 'CameraApiController@test');
     Route::post('camera/picture_base64', 'CameraApiController@pictureBase64');//宁煤存base64图片
     Route::post('camera/get_risk_ningmei', 'CameraApiController@getRiskNingmei');//宁煤高风险摄像头
     Route::post('camera/get_total_ningmei', 'CameraApiController@getTotalNingmei');//宁煤摄像头统计
     Route::post('camera/offline_list', 'CameraApiController@offlineList');//宁煤不在线摄像头列表
+    Route::get('test', 'CameraApiController@test');
 });