Merge branch 'master' of http://gitlab.frkj.cc/php/zhjwxt

niucloud/app/adminapi/controller/upload/Upload.php

@@ -35,32 +35,34 @@ class Upload extends BaseAdminController
     }
 
     /**
-     * 视频上传
+     * 文件上传(默认不上云)
      * @return Response
      */
-    public function video()
+    public function document($type)
     {
         $data = $this->request->params([
             ['file', 'file'],
-            ['cate_id', 0]
         ]);
         $upload_service = new UploadService();
-        return success($upload_service->video($data['file'], $data['cate_id']));
+        return success($upload_service->document($data['file'], $type));
     }
 
     /**
-     * 文件上传(默认不上云)
+     * 视频上传
      * @return Response
      */
-    public function document($type)
+    public function video()
     {
         $data = $this->request->params([
             ['file', 'file'],
+            ['cate_id', 0]
         ]);
         $upload_service = new UploadService();
-        return success($upload_service->document($data['file'], $type));
+        return success($upload_service->video($data['file'], $data['cate_id']));
     }
 
+
+
     /**
      * 上传配置
      * @return Response

niucloud/app/service/admin/contract/ContractService.php

@@ -98,11 +98,15 @@ class ContractService extends BaseAdminService
 
     public function ff_contract(array $data){
         $contractSign = new ContractSign();
+        $contract = new Contract();
+        $contract_info = $contract->where(['id' => $data['id']])->findOrEmpty()->toArray();
         $user = explode(",",$data['uid']);
         foreach ($user as $k=>$v){
             $contractSign->insert([
                 'contract_id' => $data['id'],
                 'personnel_id' => $v,
+                'sign_file' => $contract_info['contract_template'],
+                'type' => 1
             ]);
         }
 

niucloud/app/service/admin/upload/UploadService.php

@@ -41,18 +41,6 @@ class UploadService extends BaseAdminService
         return $core_upload_service->image($file, $dir, $cate_id);
     }
 
-    /**
-     * 附件库上传视频
-     * @param $file
-     * @param int $cate_id
-     * @return array
-     */
-    public function video($file, int $cate_id = 0){
-        $dir = $this->root_path.'/video/'.date('Ym').'/'.date('d');
-        $core_upload_service = new CoreUploadService(true);
-        return $core_upload_service->video($file, $dir, $cate_id);
-    }
-
     /**
      * 文件上传
      * @param $file
@@ -61,10 +49,30 @@ class UploadService extends BaseAdminService
      * @throws Exception
      */
     public function document($file, string $type){
+
 //        if(!in_array($type, FileDict::getSceneType()))
 //            throw new UploadFileException('UPLOAD_TYPE_ERROR');
+
+
+
         $dir = $this->root_path.'/document/'.$type.'/'.date('Ym').'/'.date('d');
+
+//        $dir = $this->root_path.'/document/'.$type.'/'.$name[0];
         $core_upload_service = new CoreUploadService();
-        return $core_upload_service->document($file, $type, $dir, StorageDict::LOCAL);
+        return $core_upload_service->document($file, $type, $dir, StorageDict::TENCENT);
     }
+
+    /**
+     * 附件库上传视频
+     * @param $file
+     * @param int $cate_id
+     * @return array
+     */
+    public function video($file, int $cate_id = 0){
+        $dir = $this->root_path.'/video/'.date('Ym').'/'.date('d');
+        $core_upload_service = new CoreUploadService(true);
+        return $core_upload_service->video($file, $dir, $cate_id);
+    }
+
+
 }

niucloud/app/service/core/upload/CoreUploadService.php

@@ -44,6 +44,26 @@ class CoreUploadService extends CoreFileService
         return $this->after($file_dir, FileDict::IMAGE, $cate_id);
     }
 
+    /**
+     * 上传文件
+     * @param string $file
+     * @param string $type
+     * @param string $file_dir
+     * @param string $storage_type
+     * @return array
+     * @throws Exception
+     */
+    public function document(string $file, string $type, string $file_dir, string $storage_type)
+    {
+        //实例化上传引擎
+        $this->upload_driver = $this->driver($storage_type);
+        //读取上传附件的信息用于后续得校验和数据写入
+
+
+        $this->upload_driver->read($file,false);
+        return $this->after($file_dir, $type);
+    }
+
     /**
      * 上传
      * @param string $file_dir
@@ -102,22 +122,6 @@ class CoreUploadService extends CoreFileService
         return $this->after($file_dir, FileDict::VIDEO, $cate_id);
     }
 
-    /**
-     * 上传文件
-     * @param string $file
-     * @param string $type
-     * @param string $file_dir
-     * @param string $storage_type
-     * @return array
-     * @throws Exception
-     */
-    public function document(string $file, string $type, string $file_dir, string $storage_type)
-    {
-        //实例化上传引擎
-        $this->upload_driver = $this->driver($storage_type);
-        //读取上传附件的信息用于后续得校验和数据写入
-        $this->upload_driver->read($file);
-        return $this->after($file_dir, $type);
-    }
+
 
 }