Merge branch 'develop' into dc

@@ -120,16 +120,11 @@ class TemplateController extends BaseController
     public function get_html(){
     public function get_html(){
         $source =   $this->param['source']??'';
         $source =   $this->param['source']??'';
         $source_id  =   $this->param['source_id']??0;
         $source_id  =   $this->param['source_id']??0;
-
-
         $data = TemplateLogic::instance()->first($source,$source_id);
         $data = TemplateLogic::instance()->first($source,$source_id);
-
         $res = [
         $res = [
             'html'  =>    $data['html']??'',
             'html'  =>    $data['html']??'',
             'name'  =>  'example'
             'name'  =>  'example'
         ];
         ];
-
-
         return $this->response('',Code::SUCCESS,$res);
         return $this->response('',Code::SUCCESS,$res);
 
 
     }
     }
@@ -142,20 +137,20 @@ class TemplateController extends BaseController
     public function save_html(TemplateRequest $request){
     public function save_html(TemplateRequest $request){
 
 
         $data   =   $request->validated();
         $data   =   $request->validated();
-
         $data['data_source']    =   $data['source'];
         $data['data_source']    =   $data['source'];
         $data['data_source_id']    =   $data['source_id'];
         $data['data_source_id']    =   $data['source_id'];
+        unset($data['source']);
+        unset($data['source_id']);
+        TemplateLogic::instance()->save($data);
+        return $this->response('保存成功');
 
 
         // 不需要数据id
         // 不需要数据id
         if(in_array($data['data_source'],['index'])){
         if(in_array($data['data_source'],['index'])){
             $data['data_source_id'] = 0;
             $data['data_source_id'] = 0;
         }
         }
-
         unset($data['source']);
         unset($data['source']);
         unset($data['source_id']);
         unset($data['source_id']);
-
         $id = TemplateLogic::instance()->save($data);
         $id = TemplateLogic::instance()->save($data);
-
         if($id){
         if($id){
             $info = TemplateLogic::instance()->getInfo($id['id']);
             $info = TemplateLogic::instance()->getInfo($id['id']);
             $info['source'] = $info['data_source'];
             $info['source'] = $info['data_source'];

@@ -141,7 +141,7 @@ class FileController
         $fileModel = new File();
         $fileModel = new File();
         $file_hash = $fileModel->read(['hash'=>$hash]);
         $file_hash = $fileModel->read(['hash'=>$hash]);
         if($file_hash !== false){
         if($file_hash !== false){
-            return $hash;
+            return $this->response('资源',Code::SUCCESS,['file'=>$hash]);
         }
         }
         $url = $this->path;
         $url = $this->path;
         $fileName = uniqid().rand(10000,99999).'.'.$files->getClientOriginalExtension();
         $fileName = uniqid().rand(10000,99999).'.'.$files->getClientOriginalExtension();
@@ -197,7 +197,7 @@ class FileController
             $data[] = $hash;
             $data[] = $hash;
         }
         }
         $fileModel->insert($save_data);
         $fileModel->insert($save_data);
-        return $this->response('资源',Code::SUCCESS,['files'=>$data]);
+        return $this->response('资源',Code::SUCCESS,['file'=>$data]);
     }
     }
     /**
     /**
      * @name 统一返回参数
      * @name 统一返回参数

@@ -175,7 +175,7 @@ class ImageController
             $hash = hash_file('md5', $file->getPathname());
             $hash = hash_file('md5', $file->getPathname());
             $image_hash = $imageModel->read(['hash'=>$hash]);
             $image_hash = $imageModel->read(['hash'=>$hash]);
             if($image_hash !== false){
             if($image_hash !== false){
-                $data[] = $hash;
+                $data[] = ['image'=>$hash];
                 continue;
                 continue;
             }
             }
             $url = $this->path;
             $url = $this->path;
@@ -192,10 +192,10 @@ class ImageController
                 'hash' => $hash,
                 'hash' => $hash,
                 'type'=>$file->getClientOriginalExtension(),
                 'type'=>$file->getClientOriginalExtension(),
             ];
             ];
-            $data[] = $hash;
+            $data[] = ['image'=>$hash];
         }
         }
         $imageModel->insert($save_data);
         $imageModel->insert($save_data);
-        return $this->response('图片资源',Code::SUCCESS,['image'=>$data]);
+        return $this->response('图片资源',Code::SUCCESS,$data);
     }
     }
 
 
     //下载
     //下载
@@ -247,15 +247,6 @@ class ImageController
                     case 'image':
                     case 'image':
                         $data['image_link'] = url('/b/image/' . $v);
                         $data['image_link'] = url('/b/image/' . $v);
                         break;
                         break;
-                    case 'images':
-                        $v = explode(',',$v);
-                        foreach ($v as $k1=>$v1){
-                            $data['images_link'][$k1] = url('/b/image/' . $v1);
-                        }
-                        break;
-                    case 'file':
-                        $data['file_link'] = url('/b/file_hash/' . $v);
-                        break;
                 }
                 }
             }
             }
         }
         }