作者 刘锟

Merge remote-tracking branch 'origin/master' into akun

... ... @@ -142,15 +142,11 @@ class FileController
* @time :2024/4/8 11:10
*/
public function synchronizationFile($file_type,$fileName){
$fileTypeArr = ['zip', 'pdf', 'mp4', 'doc', 'docx', 'm4v', 'xlsx'];
if(in_array($file_type,$fileTypeArr)){
//同步到大文件
$file_path = getFileUrl($this->path.'/'.$fileName,$this->cache['storage_type'] ?? 0);
$cmd = 'curl -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$this->path.'" https://v6-file.globalso.com/upload.php';
shell_exec($cmd);
}
return true;
}
/**
* 接口上传单文件
... ...
... ... @@ -518,8 +518,6 @@ class ProductLogic extends BaseLogic
'created_uid'=>$this->user['id'],
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
'six_read'=>$info['six_read'],
'is_upgrade'=>$info['is_upgrade']
];
if(isset($info['icon']) && !empty($info['icon'])){
foreach ($info['icon'] as $k1 => $v1){
... ...
... ... @@ -13,8 +13,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
*/
class Category extends Base
{
use SoftDeletes;
//设置关联表名
protected $table = 'gl_product_category';
//连接数据库
... ...