工作组仓库修改

app/Console/Kernel.php

@@ -4,6 +4,7 @@ namespace App\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Support\Facades\DB;
 
 class Kernel extends ConsoleKernel
 {
@@ -24,8 +25,9 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        $schedule->call(function (){
+            DB::table('logs')->delete();
+        })->daily();
     }
 
     /**

app/Http/Controllers/LaborReportController.php

@@ -58,7 +58,7 @@ class LaborReportController extends Controller
      */
     public function index(Request $request)
     {
-        if (!Gate::allows('人事管理-临时工报表 ')){return redirect(url('/')); }
+        if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }
         if ($request->input()){
             $laborReports=LaborReport::orderBy('id','DESC');
             $laborReports=$this->conditionQuery($request,$laborReports);
@@ -90,7 +90,7 @@ class LaborReportController extends Controller
     }
 
     public function export($id,Request $request){
-        if (!Gate::allows('人事管理-临时工报表 ')){return redirect(url('/')); }
+        if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }
         ini_set('max_execution_time',3500);
         ini_set('memory_limit','3526M');
         if ($id==-1){

app/Http/Controllers/UserWorkgroupController.php

@@ -65,10 +65,8 @@ class UserWorkgroupController extends Controller
         if(!Gate::allows('工作组-编辑')){ return redirect(url('/'));  }
         $this->validatorUserWorkgroup($request,$id)->validate();
         $data=$request->input();
-        $warehouse=$data['warehouse'];
-        $warehouseId=Warehouse::where('name',$warehouse)->value('id');
         $userWorkgroup=UserWorkgroup::find($id);
-        $userWorkgroup['warehouse_id']=$warehouseId;
+        $userWorkgroup['warehouse_id']= $data['warehouse_id'];
         if ($data['name']!=$userWorkgroup->name){
             $authority=Authority::where("name",$userWorkgroup->name)->first();
             if ($authority){
@@ -80,7 +78,10 @@ class UserWorkgroupController extends Controller
                 $this->storeAuthority($data['name'],$id);
             }
             $userWorkgroup->fill($data);
-            $userWorkgroup->save();
+            $userWorkgroup->update();
+            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        }else{
+            $userWorkgroup->update();
             $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         }
         return redirect('maintenance/userWorkgroup')->with('successTip','工作组“'.$request->input('name').'”修改成功');
@@ -99,14 +100,14 @@ class UserWorkgroupController extends Controller
         if ($id){$name=$id;}
         $validator=Validator::make($request->input(),[
             'name'=>['required','max:10',isset($name)?"unique:user_workgroups,name,$name":'unique:user_workgroups,name'],
-            'warehouse'=>['required'],
+            'warehouse_id'=>['required'],
         ],[
             'required'=>':attribute 为必填项',
             'max'=>':attribute 过长',
             'unique'=>':attribute 已存在',
         ],[
             'name'=>'工作组名称',
-            'warehouse'=>'仓库名称',
+            'warehouse_id'=>'仓库名称',
         ]);
         return $validator;
     }

bootstrap/cache/packages.php

@@ -92,4 +92,11 @@
       0 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
     ),
   ),
+  'yajra/laravel-oci8' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    ),
+  ),
 );

bootstrap/cache/services.php

@@ -34,11 +34,12 @@
     30 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     31 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
     32 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    33 => 'App\\Providers\\AppServiceProvider',
-    34 => 'App\\Providers\\AuthServiceProvider',
-    35 => 'App\\Providers\\BroadcastServiceProvider',
-    36 => 'App\\Providers\\EventServiceProvider',
-    37 => 'App\\Providers\\RouteServiceProvider',
+    33 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    34 => 'App\\Providers\\AppServiceProvider',
+    35 => 'App\\Providers\\AuthServiceProvider',
+    36 => 'App\\Providers\\BroadcastServiceProvider',
+    37 => 'App\\Providers\\EventServiceProvider',
+    38 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' =>
   array (
@@ -62,11 +63,12 @@
     17 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     18 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
     19 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    20 => 'App\\Providers\\AppServiceProvider',
-    21 => 'App\\Providers\\AuthServiceProvider',
-    22 => 'App\\Providers\\BroadcastServiceProvider',
-    23 => 'App\\Providers\\EventServiceProvider',
-    24 => 'App\\Providers\\RouteServiceProvider',
+    20 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    21 => 'App\\Providers\\AppServiceProvider',
+    22 => 'App\\Providers\\AuthServiceProvider',
+    23 => 'App\\Providers\\BroadcastServiceProvider',
+    24 => 'App\\Providers\\EventServiceProvider',
+    25 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' =>
   array (

config/logging.php

@@ -5,6 +5,8 @@ use Monolog\Handler\SyslogUdpHandler;
 
 return [
 
+
+    'expire_duration'=>'150', //天数，日志超过时长的就在服务中删除
     /*
     |--------------------------------------------------------------------------
     | Default Log Channel

runServes.sh

@@ -9,3 +9,5 @@ nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
 nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
 nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
 nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+
+nohup php artisan schedule:run > /dev/null 2>&1 &