Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -44,6 +44,7 @@ class WorkOrderDing extends Command
             try {
                 $log = TicketLog::where('ding', 0)->first();
                 if (!$log) {
+                    echo now() . " INFO | 没有通知任务\n";
                     sleep(3);
                     continue;
                 }
@@ -69,7 +70,7 @@ class WorkOrderDing extends Command
                     $log->ding = 2;
                 $log->save();
             }catch (\Exception $exception){
-                echo date('Y-m-d H:i:s')." ".$exception->getMessage()."\n";
+                echo now() . " ERROR | ".$exception->getMessage()."\n";
                 break;
             }
         }

@@ -56,9 +56,9 @@ class TicketChatController extends Controller
         $chat->content = $request->input('content');
         $files = $request->input('files');
         if (empty($files) || (is_array($files) && count(array_filter($files, function($v){ return !is_null($v); })) === 0)) {
-            $ticket->files = null;
+            $chat->files = null;
         } else {
-            $ticket->files = json_encode($files);
+            $chat->files = json_encode($files);
         }
         $chat->submit_side = 2;
         $chat->submit_username = $request->input('submit_username');

@@ -43,7 +43,7 @@ class TicketChatController extends BaseController
     public function store(TicketChatStoreRequest $request, $ticket_id)
     {
         $validated = $request->validated();
-        $ticket = Tickets::find($request->input('ticket_id'));
+        $ticket = Tickets::find($ticket_id);
         if (!$ticket) return response('工单未找到', 404);
         if ($ticket->project->is_del) return response('项目状态异常', 400);
 
@@ -53,9 +53,9 @@ class TicketChatController extends BaseController
 
         $files = $validated['files'];
         if (empty($files) || (is_array($files) && count(array_filter($files, function($v){ return !is_null($v); })) === 0)) {
-            $ticket->files = null;
+            $chat->files = null;
         } else {
-            $ticket->files = json_encode($files);
+            $chat->files = json_encode($files);
         }
 
         $chat->submit_username = $this->manage['name'];