diff --git a/app/controller/common/OssController.php b/app/controller/common/OssController.php index 13d45f2..87c4169 100644 --- a/app/controller/common/OssController.php +++ b/app/controller/common/OssController.php @@ -14,7 +14,7 @@ class OssController $type = $file->extension(); //读取config目录下aliyun.php的aliyun_oss数据信息 $Filesystem = \think\facade\Config::get('aliyun.aliyun_oss'); - dd($_FILES); + try { $accessKeyId = $Filesystem['accessId']; $accessKeySecret = $Filesystem['accessSecret']; //阿里云后台获取秘钥 diff --git a/app/controller/substance/FileController.php b/app/controller/substance/FileController.php new file mode 100644 index 0000000..8bdf980 --- /dev/null +++ b/app/controller/substance/FileController.php @@ -0,0 +1,16 @@ +param('id')); + (new OssService)->download(); + } +} diff --git a/app/controller/substance/ResourceController.php b/app/controller/substance/ResourceController.php index b3eda5a..5294848 100644 --- a/app/controller/substance/ResourceController.php +++ b/app/controller/substance/ResourceController.php @@ -2,9 +2,11 @@ namespace app\controller\substance; +use app\listener\ResourceEvent; use app\model\Resource; use app\service\AuditResourceService; use app\service\ResourceService; +use app\service\ShareItemResourceService; use app\service\ShareService; use app\validate\ResourceValidate; use think\exception\ValidateException; @@ -91,12 +93,26 @@ class ResourceController */ public function read(Resource $resource, Request $request) { + //如果是分享来的 要给分享详情 添加阅读次数 + + if ($request->param('in_share')) { + (new ShareItemResourceService())->increaseHitTotal($request->param('share_item_id')); + } $resource_detail = $resource::with(['user', 'accredit_files', 'files']) ->find($request->param('id')); return jsonReturn(0, Lang::get('成功'), $resource_detail); } /** + * 资源 下载素材文件 + * @return void + */ + public function downloadFile() + { + + } + + /** * 资源 分享 */ public function share(Request $request) diff --git a/app/controller/substance/ResourceDirController.php b/app/controller/substance/ResourceDirController.php index 8945cb7..918faac 100644 --- a/app/controller/substance/ResourceDirController.php +++ b/app/controller/substance/ResourceDirController.php @@ -136,9 +136,6 @@ class ResourceDirController Db::startTrans(); try { // 复制资源 - // $resource = Resource::find(1); - // dd($resource); - // die; $res = (new ResourceDirService())->copyTo($request->param('ids'), $request->param('to_id')); Db::commit(); } catch (\Exception $e) { diff --git a/app/controller/substance/ShareController.php b/app/controller/substance/ShareController.php index 515c5f5..55cf917 100644 --- a/app/controller/substance/ShareController.php +++ b/app/controller/substance/ShareController.php @@ -24,15 +24,5 @@ class ShareController return jsonReturn(0, Lang::get('成功'), $share); } - public function read(Request $request) - { -// $share_item = ShareItem::find($request->param('id')); -// -// //资源 或 内容 操作类 -// $service = ShareItemService::createShareItemTargetService($share_item->target_type); -// $target_detail = $service->getTargetDetail($share_item); -// -// return jsonReturn(0, Lang::get('成功'), $target_detail); - } } diff --git a/app/service/OssService.php b/app/service/OssService.php new file mode 100644 index 0000000..3107d22 --- /dev/null +++ b/app/service/OssService.php @@ -0,0 +1,47 @@ +accessKeyId = $Filesystem['accessId']; + $this->accessKeySecret = $Filesystem['accessSecret']; //阿里云后台获取秘钥 + $this->endpoint = $Filesystem['endpoint']; + $this->bucket = $Filesystem['bucket']; + } + + /** + * 阿里云下载测试 + * @return void + * @throws OssException + * @throws \OSS\Http\RequestCore_Exception + */ + public function download() + { + + try { + $ossClient = new OssClient($this->accessKeyId, $this->accessKeySecret, $this->endpoint); + } catch (OssException $e) { + + } + $file_url = '2.jpg'; + + $content = $ossClient->getObject($this->bucket, $file_url); + dd($content); + } +} diff --git a/app/service/ShareItemService.php b/app/service/ShareItemService.php index d0fae9a..c58dbe8 100644 --- a/app/service/ShareItemService.php +++ b/app/service/ShareItemService.php @@ -3,6 +3,7 @@ namespace app\service; use app\model\Resource; +use app\model\ShareItem; class ShareItemService extends Service { @@ -39,5 +40,9 @@ class ShareItemService extends Service } } + public function increaseHitTotal($share_item_id) + { + ShareItem::where('id', $share_item_id)->setInc('hit_total', 1); + } } diff --git a/config/aliyun.php b/config/aliyun.php index d7753f6..622faac 100644 --- a/config/aliyun.php +++ b/config/aliyun.php @@ -1,11 +1,11 @@ [ - 'type' => 'aliyun', - 'accessId' => 'LTAI5tLf2yHfxGvXPMHRR7cn', - 'accessSecret' => 'vMQLKxqwX7KjxOh5peLSTFscyWl2Z9', - 'bucket' => 'zailiu-test', - 'endpoint' => 'oss-cn-beijing.aliyuncs.com', // 节点 - 'url' => '', //不要斜杠结尾，此处为URL地址域名。 - ], + 'aliyun_oss' => [ + 'type' => 'aliyun', + 'accessId' => 'LTAI5tLf2yHfxGvXPMHRR7cn', + 'accessSecret' => 'vMQLKxqwX7KjxOh5peLSTFscyWl2Z9', + 'bucket' => 'zailiu-test', + 'endpoint' => 'oss-cn-beijing.aliyuncs.com', // 节点 + 'url' => '', //不要斜杠结尾，此处为URL地址域名。 + ], ]; diff --git a/route/common.php b/route/common.php index 0bb1d2c..5a7e7bd 100644 --- a/route/common.php +++ b/route/common.php @@ -4,5 +4,5 @@ use think\facade\Route; //阿里云 Route::group('oss', function () { - Route::post('/upload', 'oss/upload'); + Route::post('/upload', 'upload'); })->prefix('common.oss/'); \ No newline at end of file diff --git a/route/substance.php b/route/substance.php index 3a9275a..112ea8f 100644 --- a/route/substance.php +++ b/route/substance.php @@ -15,6 +15,8 @@ Route::group('resource', function () { Route::get('/index', 'index'); Route::post('/save', 'save'); Route::get('/read', 'read'); + Route::post('/download_file', 'downloadFile'); + Route::post('/share', 'share'); Route::post('/rename', 'rename'); Route::post('/move_to', 'moveTo'); @@ -24,11 +26,10 @@ Route::group('resource', function () { })->prefix('substance.resource/')->middleware('login'); + //分享 Route::group('share', function () { Route::get('/index', 'index'); - Route::get('/read', 'read'); - })->prefix('substance.share/'); //文件夹