周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 685d5c2a7dd1be4cb1bde699b757f2bb516b5d60 2 个父辈 b0ac7671 3368873e

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 4 行删除
@@ -111,7 +111,7 @@ class FileController @@ -111,7 +111,7 @@ class FileController
111 //查看文件是否存在 111 //查看文件是否存在
112 $fileModel = new File(); 112 $fileModel = new File();
113 //查看图片是否已上传 113 //查看图片是否已上传
114 - $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_ios'=>(($this->upload_location == 0) ? 1 : 0)]; 114 + $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_cos'=>(($this->upload_location == 0) ? 1 : 0)];
115 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){ 115 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
116 $param['project_id'] = $this->cache['project_id']; 116 $param['project_id'] = $this->cache['project_id'];
117 } 117 }
@@ -223,7 +223,7 @@ class FileController @@ -223,7 +223,7 @@ class FileController
223 $fileModel = new File(); 223 $fileModel = new File();
224 $name = $file->getClientOriginalName(); 224 $name = $file->getClientOriginalName();
225 $hash = hash_file('md5', $file->getPathname()); 225 $hash = hash_file('md5', $file->getPathname());
226 - $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_ios'=>(($this->upload_location == 0) ? 1 : 0)]; 226 + $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_cos'=>(($this->upload_location == 0) ? 1 : 0)];
227 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){ 227 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
228 $param['project_id'] = $this->cache['project_id']; 228 $param['project_id'] = $this->cache['project_id'];
229 } 229 }
@@ -185,7 +185,7 @@ class ImageController extends Controller @@ -185,7 +185,7 @@ class ImageController extends Controller
185 //查看文件是否存在 185 //查看文件是否存在
186 $imageModel = new ImageModel(); 186 $imageModel = new ImageModel();
187 //查看图片是否已上传 187 //查看图片是否已上传
188 - $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_ios'=>(($this->upload_location == 0) ? 1 : 0)]; 188 + $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_cos'=>(($this->upload_location == 0) ? 1 : 0)];
189 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){ 189 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
190 $param['project_id'] = $this->cache['project_id']; 190 $param['project_id'] = $this->cache['project_id'];
191 } 191 }
@@ -268,7 +268,7 @@ class ImageController extends Controller @@ -268,7 +268,7 @@ class ImageController extends Controller
268 $hash = hash_file('md5', $file->getPathname()); 268 $hash = hash_file('md5', $file->getPathname());
269 $name = $file->getClientOriginalName(); 269 $name = $file->getClientOriginalName();
270 //查看图片是否已上传 270 //查看图片是否已上传
271 - $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_ios'=>(($this->upload_location == 0) ? 1 : 0)]; 271 + $param = ['hash'=>$hash,'refer'=>$this->param['refer'] ?? 0,'is_cos'=>(($this->upload_location == 0) ? 1 : 0)];
272 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){ 272 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
273 $param['project_id'] = $this->cache['project_id']; 273 $param['project_id'] = $this->cache['project_id'];
274 } 274 }