合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1942

@@ -9,7 +9,9 @@
 
 
 namespace App\Console\Commands\CropImage;
 namespace App\Console\Commands\CropImage;
 
 
+use App\Enums\Common\Code;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\File\Image;
 use App\Models\WebSetting\AggregationSetting;
 use App\Models\WebSetting\AggregationSetting;
 use App\Models\WebSetting\WebSettingImage;
 use App\Models\WebSetting\WebSettingImage;
 use App\Services\CosService;
 use App\Services\CosService;
@@ -131,7 +133,6 @@ class CropImage extends Command
                 $data[] = $banner_dom ? $banner_dom->src : '';
                 $data[] = $banner_dom ? $banner_dom->src : '';
                 $dom->clear();
                 $dom->clear();
                 unset($dom);
                 unset($dom);
-                $data[] = $banner_dom ? $banner_dom->src : '';
             }
             }
         }else{
         }else{
             $this->output('域名不存在: ' . $project_id);
             $this->output('域名不存在: ' . $project_id);
@@ -140,6 +141,35 @@ class CropImage extends Command
     }
     }
 
 
     /**
     /**
+     * @remark :写入数据库
+     * @name   :saveMysql
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/8 14:59
+     */
+    public function saveMysql($size,$image_type,$fileName,$hash,$is_cos = 0,$mime = '', $name=''){
+        $imageModel = new Image();
+        $data = [
+            'path' => $this->path.'/'.$fileName,
+            'created_at' => date('Y-m-d H:i:s',time()),
+            'size' => $size,
+            'hash' => $hash,
+            'type'=>$image_type,
+            'refer'=>$this->param['refer'] ?? 0,
+            'is_cos'=>($is_cos == 0) ? 1 : 0,
+            'mime'=>$mime,
+            'project_id'=>$this->cache['project_id'] ?? 0,
+            'name'=>$name,
+            'en_name'=>$fileName
+        ];
+        $rs = $imageModel->add($data);
+        if ($rs === false) {
+            return $this->response('添加失败', Code::USER_ERROR);
+        }
+        return true;
+    }
+
+    /**
      * @remark :记录日志
      * @remark :记录日志
      * @name   :output
      * @name   :output
      * @author :lyh
      * @author :lyh

@@ -351,7 +351,7 @@ class CosService
             ],
             ],
         ]);
         ]);
         $pathInfo = pathinfo($cosUrl);
         $pathInfo = pathinfo($cosUrl);
-        $newKey = $pathInfo['dirname'] . '/crop_' . $pathInfo['filename'] . $pathInfo['extension'];
+        $newKey = $pathInfo['dirname'] . '/crop_' . $pathInfo['filename'] .'.'. $pathInfo['extension'];
         $operations = [
         $operations = [
             'is_pic_info' => 0,
             'is_pic_info' => 0,
             'rules' => [
             'rules' => [