管理页面

app/controller/LocationController.php

@@ -3,7 +3,7 @@
 namespace app\controller;
 
 use app\model\Location;
-use app\util\Util;
+use util\Util;
 use support\Request;
 
 class LocationController

app/controller/UploadController.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace app\controller;
+
+//use support\Request;
+//use support\Log;
+//use Webman\Http\Response;
+
+use app\service\OssService;
+use Shopwwi\WebmanFilesystem\Facade\Storage;
+use support\Log;
+use support\Request;
+use util\Util;
+
+class UploadController
+{
+
+    /**
+     * 不需要登录的方法
+     */
+    protected $noNeedLogin = ['uploadImage'];
+
+    // 上传单文件图片
+    public function uploadImage(Request $request)
+    {
+        try {
+            $file = $request->file('files');
+
+            if (!$file || !$file->isValid()) {
+                return Util::fail($file,'上传失败');
+            }
+
+            $result = Storage::adapter('oss')
+                ->path('lingke_crm/'.date('Ymd'))
+                ->size(1024*1024*5)
+                ->extYes(['image/jpeg','image/png'])
+                ->extNo(['image/gif'])
+                ->upload($file);
+
+            $ossservice = new OssService();
+
+            $data = [
+                'path' => $result->file_name,
+                'original_name' => $result->origin_name,
+                'image_url'  => $ossservice->generatePrivateUrl($result->file_name)
+            ];
+
+
+            return Util::success($data,'上传成功');
+        }catch (\Throwable $e){
+            Log::error('文件上传失败: ' . $e->getMessage());
+
+            return Util::fail([],'file:'.$e->getFile().'line:'.$e->getLine().'message:'.$e->getMessage());
+        }
+    }
+}

app/controller/VehicleController.php

@@ -3,11 +3,14 @@
 namespace app\controller;
 
 use app\model\Vehicle;
-use app\util\Util;
+use plugin\admin\app\model\Location;
+use util\Util;
 use support\Request;
 
 class VehicleController
 {
+
+    protected $status = ['未知','待发车','在途（发往fbo港口）','抵达发货港口','在途（发往目的地仓库）','抵达仓库','售出'];
     /**
      * Mask VIN number by showing only first 2 and last 6 characters
      */
@@ -29,6 +32,14 @@ class VehicleController
             if (isset($vehicle->vin)) {
                 $vehicle->vin = $this->maskVin($vehicle->vin);
             }
+
+            $vehicle->status = $this->status[$vehicle->status]??$this->status[0];
+//            $location = Location::find($vehicle->locations_id);
+//            $vehicle->location_name = $location ? $location->name : '';
+//            $final_location = Location::find($vehicle->final_locations_id);
+//            $vehicle->final_location_name = $final_location ? $final_location->name : '';
+            $fbo_location = Location::find($vehicle->fbo_locations_id);
+            $vehicle->fbo_destination = $fbo_location ? $fbo_location->name : '';
         });
         $result = ['list' => $vehicles,'count'=>count($vehicles)];
         return Util::success($result);

app/process/Monitor.php

@@ -30,23 +30,28 @@ class Monitor
     /**
      * @var array
      */
-    protected $paths = [];
+    protected array $paths = [];
 
     /**
      * @var array
      */
-    protected $extensions = [];
+    protected array $extensions = [];
 
     /**
      * @var array
      */
-    protected $loadedFiles = [];
+    protected array $loadedFiles = [];
+
+    /**
+     * @var int
+     */
+    protected int $ppid = 0;
 
     /**
      * Pause monitor
      * @return void
      */
-    public static function pause()
+    public static function pause(): void
     {
         file_put_contents(static::lockFile(), time());
     }
@@ -90,6 +95,7 @@ class Monitor
      */
     public function __construct($monitorDir, $monitorExtensions, array $options = [])
     {
+        $this->ppid = function_exists('posix_getppid') ? posix_getppid() : 0;
         static::resume();
         $this->paths = (array)$monitorDir;
         $this->extensions = $monitorExtensions;
@@ -161,8 +167,8 @@ class Monitor
                 }
                 echo $file . " updated and reload\n";
                 // send SIGUSR1 signal to master process for reload
-                if (DIRECTORY_SEPARATOR === '/') {
-                    posix_kill(posix_getppid(), SIGUSR1);
+                if (DIRECTORY_SEPARATOR === '/' &&  $this->ppid > 1) {
+                    posix_kill($this->ppid, SIGUSR1);
                 } else {
                     return true;
                 }
@@ -196,12 +202,21 @@ class Monitor
      * @param $memoryLimit
      * @return void
      */
-    public function checkMemory($memoryLimit)
+    public function checkMemory($memoryLimit): void
     {
         if (static::isPaused() || $memoryLimit <= 0) {
             return;
         }
-        $ppid = posix_getppid();
+        $ppid = $this->ppid;
+        if ($ppid <= 1) {
+            return;
+        }
+        $processPath = "/proc/$ppid";
+        if (!is_dir($processPath)) {
+            // Process not exist
+            $this->ppid = 0;
+            return;
+        }
         $childrenFile = "/proc/$ppid/task/$ppid/children";
         if (!is_file($childrenFile) || !($children = file_get_contents($childrenFile))) {
             return;
@@ -225,9 +240,10 @@ class Monitor
 
     /**
      * Get memory limit
-     * @return float
+     * @param $memoryLimit
+     * @return int
      */
-    protected function getMemoryLimit($memoryLimit)
+    protected function getMemoryLimit($memoryLimit): int
     {
         if ($memoryLimit === 0) {
             return 0;
@@ -242,21 +258,25 @@ class Monitor
             return 0;
         }
         $unit = strtolower($memoryLimit[strlen($memoryLimit) - 1]);
+        $memoryLimit = (int)$memoryLimit;
         if ($unit === 'g') {
-            $memoryLimit = 1024 * (int)$memoryLimit;
-        } else if ($unit === 'm') {
-            $memoryLimit = (int)$memoryLimit;
+            $memoryLimit = 1024 * $memoryLimit;
         } else if ($unit === 'k') {
-            $memoryLimit = ((int)$memoryLimit / 1024);
+            $memoryLimit = ($memoryLimit / 1024);
+        } else if ($unit === 'm') {
+            $memoryLimit = (int)($memoryLimit);
+        } else if ($unit === 't') {
+            $memoryLimit = (1024 * 1024 * $memoryLimit);
         } else {
-            $memoryLimit = ((int)$memoryLimit / (1024 * 1024));
+            $memoryLimit = ($memoryLimit / (1024 * 1024));
         }
-        if ($memoryLimit < 30) {
-            $memoryLimit = 30;
+        if ($memoryLimit < 50) {
+            $memoryLimit = 50;
         }
         if ($usePhpIni) {
-            $memoryLimit = (int)(0.8 * $memoryLimit);
+            $memoryLimit = (0.8 * $memoryLimit);
         }
-        return $memoryLimit;
+        return (int)$memoryLimit;
     }
+
 }

app/service/OssService.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace app\service;
+
+use OSS\OssClient;
+use OSS\Core\OssException;
+
+class OssService
+{
+    private $accessKeyId;
+    private $accessKeySecret;
+    private $bucket;
+    private $endpoint;
+    private $ossClient;
+
+    public function __construct()
+    {
+        $this->accessKeyId = 'LTAI5tAGiH7bkVkmrniXnfkA';
+        $this->accessKeySecret = 'nqklJBft6t3S0A4ZvxF4ci9ni91kmm';
+        $this->bucket = 'vehicle-album';
+        $this->endpoint = 'https://oss-cn-beijing.aliyuncs.com';
+        $this->ossClient = new OssClient($this->accessKeyId, $this->accessKeySecret, $this->endpoint);
+    }
+
+    /**
+     * 上传图片到 OSS
+     * @param string $filePath 本地文件路径
+     * @param string $objectKey OSS上存储的对象名称
+     * @return string 图片的 URL
+     */
+    public function uploadImage($filePath, $objectKey)
+    {
+        try {
+            // 上传文件到 OSS
+            $this->ossClient->uploadFile($this->bucket, $objectKey, $filePath);
+            // 构造图片的私有 URL
+            $url = $this->generatePrivateUrl($objectKey);
+            return $url;
+        } catch (OssException $e) {
+            // 错误处理
+            throw new \RuntimeException('OSS Error: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 生成图片的私有访问 URL
+     * @param string $objectKey
+     * @return string
+     */
+    public function generatePrivateUrl($objectKey, $expireTime = 3600)
+    {
+        // 生成 OSS 私有 URL（有效期为 3600 秒）
+        return $this->ossClient->signUrl($this->bucket, $objectKey, $expireTime);
+    }
+}