gx

@@ -116,14 +116,14 @@ class ImageController
             'path' => $url.$filename,
             'path' => $url.$filename,
             'created_at' => date('Y-m-d H:i:s',time()),
             'created_at' => date('Y-m-d H:i:s',time()),
             'size' => $res->getSize(),
             'size' => $res->getSize(),
-            'hash' => $hash.$filename,
+            'hash' => $hash,
             'type'=>$files->getClientOriginalExtension(),
             'type'=>$files->getClientOriginalExtension(),
         ];
         ];
         $rs = $imageModel->add($data);
         $rs = $imageModel->add($data);
         if ($rs === false) {
         if ($rs === false) {
             return $this->response('添加失败', Code::USER_ERROR);
             return $this->response('添加失败', Code::USER_ERROR);
         }
         }
-        return $hash.$filename;
+        return $hash;
     }
     }
     /**
     /**
      * 生成缩略图缓存
      * 生成缩略图缓存
@@ -162,10 +162,10 @@ class ImageController
                 'path' => $url.$filename,
                 'path' => $url.$filename,
                 'created_at' => date('Y-m-d H:i:s',time()),
                 'created_at' => date('Y-m-d H:i:s',time()),
                 'size' => $res->getSize(),
                 'size' => $res->getSize(),
-                'hash' => $hash.$filename,
+                'hash' => $hash,
                 'type'=>$files->getClientOriginalExtension(),
                 'type'=>$files->getClientOriginalExtension(),
             ];
             ];
-            $data[] = $hash.$filename;
+            $data[] = $hash;
         }
         }
         $imageModel = new ImageModel();
         $imageModel = new ImageModel();
         $imageModel->insert($save_data);
         $imageModel->insert($save_data);

@@ -61,8 +61,6 @@ class WebSettingServiceLogic extends BaseLogic
             $info = $image->read(['hash'=>$this->param['hash']]);
             $info = $image->read(['hash'=>$this->param['hash']]);
             if($info !== false){
             if($info !== false){
                 $image->del(['id'=>$info['id']]);
                 $image->del(['id'=>$info['id']]);
-                //删除资源文件
-                shell_exec('rm -rf '.$info['path']);
             }
             }
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){