Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
de5baa06
Commit
de5baa06
authored
Oct 09, 2016
by
杨培
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重新设计了七牛上传文件信息获取方式
新增回调接口 新增上传池模型用于处理上传回调(获取,确认,删除)文件信息等
parent
9fdf4a14
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
309 additions
and
64 deletions
+309
-64
Qiniu.php
src/common/components/Qiniu.php
+32
-5
UploadPools.php
src/common/models/UploadPools.php
+149
-0
MyCourseController.php
src/frontend/controllers/MyCourseController.php
+2
-2
QiniuCallbackController.php
src/frontend/controllers/QiniuCallbackController.php
+66
-7
user-center.php
src/frontend/views/layouts/user-center.php
+60
-50
No files found.
src/common/components/Qiniu.php
View file @
de5baa06
...
@@ -71,17 +71,36 @@ class Qiniu extends Object
...
@@ -71,17 +71,36 @@ class Qiniu extends Object
{
{
return
$this
->
generateRandomDir
()
.
'/'
.
$this
->
generateRandomName
(
$len
)
.
$ext
;
return
$this
->
generateRandomDir
()
.
'/'
.
$this
->
generateRandomName
(
$len
)
.
$ext
;
}
}
/**
* 获取指定存储的配置
*
* @param string $storage
* @param string $item
* @return mixed
*/
public
function
getStorageConfig
(
$storage
,
$item
=
null
)
{
if
(
!
isset
(
$this
->
storages
[
$storage
]))
{
return
null
;
}
if
(
$item
===
null
)
{
return
$this
->
storages
[
$storage
];
}
else
{
return
isset
(
$this
->
storages
[
$storage
][
$item
])
?
$this
->
storages
[
$storage
][
$item
]
:
null
;
}
}
/**
/**
* 获取七牛上传 Token
* 获取七牛上传 Token
*
*
* @param string $storage 要存储的空间名称
* @param string $storage 要存储的空间名称
* @param string $filename 要存储的目标文件路径
* @param string $filename 要存储的目标文件路径
* @param string $returnBody 返回的数据格式
* @param int $deadSeconds 生成的Token有效期
* @param int $deadSeconds 生成的Token有效期
* @return string
* @return string
*/
*/
public
function
getUploadToken
(
$storage
,
$filename
,
$
returnBody
,
$
deadSeconds
=
3600
)
public
function
getUploadToken
(
$storage
,
$filename
,
$deadSeconds
=
3600
)
{
{
if
(
!
isset
(
$this
->
storages
[
$storage
]))
{
if
(
!
isset
(
$this
->
storages
[
$storage
]))
{
exit
(
'Unknow storage: '
.
$storage
.
"
\n
"
);
exit
(
'Unknow storage: '
.
$storage
.
"
\n
"
);
...
@@ -92,18 +111,26 @@ class Qiniu extends Object
...
@@ -92,18 +111,26 @@ class Qiniu extends Object
$callbackUrl
=
Url
::
to
([
'qiniu-callback/rem-upload'
],
true
);
$callbackUrl
=
Url
::
to
([
'qiniu-callback/rem-upload'
],
true
);
$policy
=
[
$policy
=
[
'returnBody'
=>
$returnBody
,
'returnBody'
=>
'{"key":$(key)}'
,
'saveKey'
=>
$filename
,
'saveKey'
=>
$filename
,
'fsizeLimit'
=>
$config
[
'fsizeLimit'
],
'fsizeLimit'
=>
$config
[
'fsizeLimit'
],
'mimeLimit'
=>
$config
[
'mimeLimit'
],
'mimeLimit'
=>
$config
[
'mimeLimit'
],
'callbackUrl'
=>
'http://t.pp.cc/tmp/qiniu_callback.php'
,
'callbackUrl'
=>
'http://t.pp.cc/tmp/qiniu_callback.php'
,
'callbackBody'
=>
'key=$(key)&fsize=$(fsize)&time=$(year)-$(mon)-$(day) $(hour)%3A$(min)%3A$(sec)'
'callbackBody'
=>
'key=$(key)&storage='
.
$storage
.
'&bucket='
.
$config
[
'bucket'
]
.
'&uuid=$(uuid)&time=$(year)-$(mon)-$(day)+$(hour)%3A$(min)%3A$(sec)&fsize=$(fsize)'
.
'&w=$(imageInfo.width)&h=$(imageInfo.height)'
];
];
$auth
=
$this
->
getAuthInstance
();
$auth
=
$this
->
getAuthInstance
();
return
$auth
->
uploadToken
(
$config
[
'bucket'
],
null
,
$deadSeconds
,
$policy
);
return
$auth
->
uploadToken
(
$config
[
'bucket'
],
null
,
$deadSeconds
,
$policy
);
}
}
/**
* 验证并解析 Upload Token 中的数据
*
* @param string $token
* @return mixed|null
*/
public
function
decodeUploadToken
(
$token
)
public
function
decodeUploadToken
(
$token
)
{
{
$arr
=
explode
(
':'
,
$token
);
$arr
=
explode
(
':'
,
$token
);
...
...
src/common/models/UploadPools.php
0 → 100644
View file @
de5baa06
<?php
/**
* Created by PhpStorm.
* User: pader
* Date: 16/10/9
* Time: 10:10
*/
namespace
common\models
;
use
yii\db\ActiveRecord
;
/**
* 文件上传池模型
*
* 当使用本地七牛接口上传文件后,七牛的通知会自动在本地上传池中生成文件信息,并等待被认领确认使用
* 若超过24小时的非使用中状态文件,会被自动删除以防止产生过多的垃圾文件
*
* @property string $uuid
* @property string $skey 存储键名,使用 Storage:Key 的方式连接,如 public:preview/30/27/3e/ZuofZkkK5721.jpg
* @property int $filesize
* @property int $status 文件状态:0未认领,1使用中,2已废弃(待删除)
* @property int $upload_timeg
* @package common\models
*/
class
UploadPools
extends
ActiveRecord
{
const
STATUS_UNUSE
=
0
;
//未认领状态
const
STATUS_USED
=
1
;
//使用中状态
const
STATUS_DELETED
=
2
;
//待删除状态
/**
* @inheritdoc
*/
public
static
function
tableName
()
{
return
'upload_pools'
;
}
public
function
rules
()
{
return
[
[[
'uuid'
,
'skey'
,
'filesize'
,
'upload_time'
],
'required'
],
[
'skey'
,
'validateSkey'
]
];
}
public
function
validateSkey
(
$attr
,
$params
)
{
if
(
!
preg_match
(
'/^\w+:[\w\.\/]+$/'
,
$this
->
$attr
))
{
$this
->
addError
(
$attr
,
"
$attr
format is not a validate skey."
);
}
}
/**
* 获取上传池中的文件
*
* @param string $uuid
* @return array
*/
public
static
function
getFileInfo
(
$uuid
)
{
$file
=
self
::
findOne
([
'uuid'
=>
$uuid
]);
if
(
$file
)
{
$file
=
$file
->
toArray
();
list
(
$file
[
'storage'
],
$file
[
'key'
])
=
explode
(
':'
,
$file
[
'skey'
]);
$file
[
'url'
]
=
\Yii
::
$app
->
qiniu
->
getStorageConfig
(
$file
[
'storage'
],
'url'
)
.
$file
[
'key'
];
}
return
$file
;
}
/**
* 认领文件
*
* 只有未认领的文件才可被认领
* 认领后该文件会被标记为已使用并且不可再被认领
*
* @param string $uuid 文件 uuid
* @return array|false 认领成功返回文件信息,认领失败返回 false
*/
public
static
function
claimFile
(
$uuid
)
{
$file
=
self
::
findOne
([
'uuid'
=>
$uuid
]);
return
self
::
claimFileConfirm
(
$file
);
}
/**
* 使用 skey 认领文件
*
* 详情见 UploadPools::claimFile()
*
* @see UploadPools::claimFile()
* @param string $skey 文件 skey
* @return array|false 认领成功返回文件信息,认领失败返回 false
*/
public
static
function
claimFileBySkey
(
$skey
)
{
$file
=
self
::
find
()
->
where
([
'skey'
=>
$skey
])
->
one
();
return
self
::
claimFileConfirm
(
$file
);
}
/**
* 删除存储的文件
*
* 删除仅是对文件做弃用标记,该文件会在过一段时间后被计划任务彻底删除
*
* @param string $skey
* @return bool
*/
public
static
function
deleteFile
(
$skey
)
{
$file
=
self
::
find
()
->
where
([
'skey'
=>
$skey
])
->
one
();
if
(
!
$file
)
{
$file
=
new
self
();
$file
->
uuid
=
self
::
findBySql
(
'SELECT UUID() AS uuid'
)
->
one
()
->
uuid
;
$file
->
skey
=
$skey
;
$file
->
filesize
=
0
;
}
$file
->
status
=
self
::
STATUS_DELETED
;
$file
->
upload_time
=
time
();
return
$file
->
save
();
}
public
static
function
getSkey
(
$storage
,
$key
)
{
return
$storage
.
':'
.
$key
;
}
/**
* @param ActiveRecord $file
* @return array|false 认领成功返回文件信息,认领失败返回 false
*/
protected
static
function
claimFileConfirm
(
$file
)
{
if
(
$file
&&
$file
->
status
==
self
::
STATUS_UNUSE
)
{
$file
->
status
=
self
::
STATUS_USED
;
$file
->
save
();
return
$file
->
toArray
();
}
return
false
;
}
}
\ No newline at end of file
src/frontend/controllers/MyCourseController.php
View file @
de5baa06
...
@@ -25,12 +25,12 @@ class MyCourseController extends \yii\web\Controller
...
@@ -25,12 +25,12 @@ class MyCourseController extends \yii\web\Controller
//图片上传Token
//图片上传Token
//$imgName = 'preview/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20);
//$imgName = 'preview/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20);
$imgPath
=
'preview/'
.
$qiniu
->
generateRandomFilePath
(
'$(min)$(sec)$(ext)'
,
8
);
$imgPath
=
'preview/'
.
$qiniu
->
generateRandomFilePath
(
'$(min)$(sec)$(ext)'
,
8
);
$thumbToken
=
$qiniu
->
getUploadToken
(
'public'
,
$imgPath
,
$returnBody
,
3600
,
true
);
$thumbToken
=
$qiniu
->
getUploadToken
(
'public'
,
$imgPath
,
3600
,
true
);
//视频上传Token
//视频上传Token
//$videoName = 'source/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20);
//$videoName = 'source/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20);
$videoName
=
'source/'
.
$qiniu
->
generateRandomFilePath
(
'$(ext)'
);
$videoName
=
'source/'
.
$qiniu
->
generateRandomFilePath
(
'$(ext)'
);
$videoToken
=
$qiniu
->
getUploadToken
(
'video'
,
$videoName
,
$returnBody
,
86400
);
$videoToken
=
$qiniu
->
getUploadToken
(
'video'
,
$videoName
,
86400
);
$model
=
new
CoursePublishForm
();
$model
=
new
CoursePublishForm
();
return
$this
->
render
(
'publish'
,
compact
(
'model'
,
'thumbToken'
,
'videoToken'
));
return
$this
->
render
(
'publish'
,
compact
(
'model'
,
'thumbToken'
,
'videoToken'
));
...
...
src/frontend/controllers/QiniuCallbackController.php
View file @
de5baa06
...
@@ -7,9 +7,14 @@
...
@@ -7,9 +7,14 @@
*/
*/
namespace
frontend\controllers
;
namespace
frontend\controllers
;
use
yii\helpers\Url
;
use
Yii
;
use
yii\web\Response
;
use
common\models\UploadPools
;
class
QiniuCallbackController
extends
\yii\web\Controller
{
class
QiniuCallbackController
extends
\yii\web\Controller
{
public
$enableCsrfValidation
=
false
;
/**
/**
* 上传回调 - 记录上传的文件
* 上传回调 - 记录上传的文件
...
@@ -19,18 +24,72 @@ class QiniuCallbackController extends \yii\web\Controller {
...
@@ -19,18 +24,72 @@ class QiniuCallbackController extends \yii\web\Controller {
public
function
actionRemUpload
()
public
function
actionRemUpload
()
{
{
/* @var \Qiniu\Auth $auth */
/* @var \Qiniu\Auth $auth */
$auth
=
\Yii
::
$app
->
qiniu
->
getAuthInstance
();
$auth
=
Yii
::
$app
->
qiniu
->
getAuthInstance
();
$response
=
Yii
::
$app
->
response
;
$response
->
format
=
Response
::
FORMAT_JSON
;
//验证回调请求
//验证回调请求
$requestBody
=
file_get_contents
(
'php://input'
);
$requestBody
=
file_get_contents
(
'php://input'
);
$authorization
=
isset
(
$_SERVER
[
'HTTP_AUTHORIZATION'
])
?
$_SERVER
[
'HTTP_AUTHORIZATION'
]
:
''
;
$authorization
=
isset
(
$_SERVER
[
'HTTP_AUTHORIZATION'
])
?
$_SERVER
[
'HTTP_AUTHORIZATION'
]
:
''
;
$currentUrl
=
\Yii
::
$app
->
request
->
hostInfo
.
\Yii
::
$app
->
request
->
getUrl
();
$currentUrl
=
Yii
::
$app
->
request
->
hostInfo
.
Yii
::
$app
->
request
->
getUrl
();
$currentUrl
=
'http://t.pp.cc/tmp/qiniu_callback.php'
;
if
(
!
$auth
->
verifyCallback
(
$_SERVER
[
'CONTENT_TYPE'
],
$authorization
,
$currentUrl
,
$requestBody
))
{
return
[
'error'
=>
'回调验证失败!'
];
}
$post
=
Yii
::
$app
->
request
->
post
();
//检查是否存在相同的uuid
$data
=
UploadPools
::
findOne
(
$post
[
'uuid'
]);
if
(
$data
)
{
return
$this
->
responseCallback
(
$data
);
}
//保存新文件信息
$model
=
new
UploadPools
();
$model
->
skey
=
$post
[
'storage'
]
.
':'
.
$post
[
'key'
];
$model
->
filesize
=
$post
[
'fsize'
];
$model
->
uuid
=
$post
[
'uuid'
];
$model
->
upload_time
=
strtotime
(
$post
[
'time'
]);
//图片的宽高信息
$post
[
'w'
]
&&
$model
->
w
=
$post
[
'w'
];
$post
[
'h'
]
&&
$model
->
h
=
$post
[
'h'
];
if
(
$
auth
->
verifyCallback
(
$_SERVER
[
'CONTENT_TYPE'
],
$authorization
,
$currentUrl
,
$requestBody
))
{
if
(
$
model
->
save
(
))
{
echo
'ok'
;
return
$this
->
responseCallback
(
$model
)
;
}
else
{
}
else
{
echo
'no'
;
return
[
'error'
=>
join
(
"
\n
"
,
$model
->
errors
)]
;
}
}
}
}
/**
* 响应回调成功的信息
*
* 公开资源会返回文件 key,原始链接和图片宽高等信息,私有资源只返回 uuid 和文件尺寸
* 私有资源使用得到的 uuid 通过 UploadPools::getFileInfo() 或者 UploadPools::claimFile() 认领文件获取文件详细信息
* 需要其它更详细的信息调用七牛云 API 获取
*
* @param $model
* @return array
*/
private
function
responseCallback
(
$model
)
{
$return
=
[
'uuid'
=>
$model
->
uuid
,
'filesize'
=>
$model
->
filesize
];
list
(
$storage
,
$key
)
=
explode
(
':'
,
$model
->
skey
);
//public
if
(
$storage
!=
'video'
)
{
$return
[
'key'
]
=
$key
;
$return
[
'src'
]
=
Yii
::
$app
->
qiniu
->
getStorageConfig
(
$storage
,
'url'
)
.
$key
;
$return
[
'w'
]
=
$model
->
w
;
$return
[
'h'
]
=
$model
->
h
;
}
return
$return
;
}
}
}
\ No newline at end of file
src/frontend/views/layouts/user-center.php
View file @
de5baa06
...
@@ -8,6 +8,17 @@ use frontend\assets\AppAsset;
...
@@ -8,6 +8,17 @@ use frontend\assets\AppAsset;
AppAsset
::
register
(
$this
);
AppAsset
::
register
(
$this
);
AppAsset
::
addCss
(
$this
,
'@web/assets/css/style.css'
);
AppAsset
::
addCss
(
$this
,
'@web/assets/css/style.css'
);
//$assetsUrl = Yii::$app->assetManager->baseUrl.'/assets';
//
//$js = <<<JS
//var global = (function () {
// this.static_url = "$assetsUrl";
//})();
//JS;
//
//$this->registerJs($js, View::POS_HEAD);
$js
=
<<<JS
$js
=
<<<JS
$(function() {
$(function() {
var Accordion = function(el, multiple) {
var Accordion = function(el, multiple) {
...
@@ -39,69 +50,68 @@ $this->registerJs($js, View::POS_END);
...
@@ -39,69 +50,68 @@ $this->registerJs($js, View::POS_END);
?>
?>
<?php
$this
->
beginPage
()
?>
<?php
$this
->
beginPage
()
?>
<!DOCTYPE html>
<!DOCTYPE html>
<html
lang=
"
<?=
Yii
::
$app
->
language
?>
"
>
<html
lang=
"
<?=
\Yii
::
$app
->
language
?>
"
>
<head>
<head>
<meta
charset=
"
<?=
Yii
::
$app
->
charset
?>
"
>
<meta
charset=
"
<?=
Yii
::
$app
->
charset
?>
"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge,chrome=1"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge,chrome=1"
>
<title>
<?=
$this
->
title
?
Html
::
encode
(
$this
->
title
)
.
'-'
:
''
?>
最课堂
</title>
<title>
<?=
$this
->
title
?
Html
::
encode
(
$this
->
title
)
.
'-'
:
''
?>
最课堂
</title>
<?=
Html
::
csrfMetaTags
()
?>
<?=
Html
::
csrfMetaTags
()
?>
<?php
$this
->
head
()
?>
<?php
$this
->
head
()
?>
</head>
</head>
<body>
<body>
<?php
$this
->
beginBody
();
?>
<?php
$this
->
beginBody
();
?>
<div
class=
"tp-sidebar"
>
<div
class=
"tp-sidebar"
>
<div
class=
"logo"
><a
href=
"/"
><img
src=
"
<?=
Yii
::
$app
->
assetManager
->
baseUrl
?>
/img/logo.png"
></a></div>
<div
class=
"logo"
><a
href=
"/"
><img
src=
"
<?=
Yii
::
$app
->
assetManager
->
baseUrl
?>
/img/logo.png"
></a></div>
<div
class=
"side-menu"
>
<div
class=
"side-menu"
>
<!-- Contenedor -->
<!-- Contenedor -->
<ul
id=
"accordion"
class=
"accordion"
>
<ul
id=
"accordion"
class=
"accordion"
>
<li>
<li>
<div
class=
"link"
><i
class=
"icon-palette"
></i>
我的课堂
<i
class=
"icon-navigate_next"
></i></div>
<div
class=
"link"
><i
class=
"icon-palette"
></i>
我的课堂
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li
class=
"active"
><a
href=
"#"
>
课堂概况
</a></li>
<li
class=
"active"
><a
href=
"#"
>
课堂概况
</a></li>
<li><a
href=
"#"
>
讲师管理
</a></li>
<li><a
href=
"#"
>
讲师管理
</a></li>
</ul>
</ul>
</li>
</li>
<li>
<li>
<div
class=
"link"
><i
class=
"icon-ondemand_video"
></i>
我的课程
<i
class=
"icon-navigate_next"
></i></div>
<div
class=
"link"
><i
class=
"icon-ondemand_video"
></i>
我的课程
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li><a
href=
"#"
>
发布课程
</a></li>
<li><a
href=
"#"
>
发布课程
</a></li>
<li><a
href=
"#"
>
课程列表
</a></li>
<li><a
href=
"#"
>
课程列表
</a></li>
</ul>
</ul>
</li>
</li>
<li>
<li>
<div
class=
"link"
><i
class=
"icon-fingerprint"
></i>
我的会员
<i
class=
"icon-navigate_next"
></i></div>
<div
class=
"link"
><i
class=
"icon-fingerprint"
></i>
我的会员
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li><a
href=
"#"
>
会员列表
</a></li>
<li><a
href=
"#"
>
会员列表
</a></li>
</ul>
</ul>
</li>
</li>
<li>
<li><div
class=
"link"
><i
class=
"icon-bell"
></i>
知识有价
<i
class=
"icon-navigate_next"
></i></div>
<div
class=
"link"
><i
class=
"icon-bell"
></i>
知识有价
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li><a
href=
"#"
>
购买记录
</a></li>
<li><a
href=
"#"
>
购买记录
</a></li>
</ul>
</ul>
</li>
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
<div
class=
"auto-main"
>
<div
class=
"auto-main"
>
<div
class=
"tp-head navbar-fixed-top clearfix"
>
<div
class=
"tp-head navbar-fixed-top clearfix"
>
<div
class=
"menu-btn fl"
><a
href=
"#"
><i
class=
"icon-menu"
></i></a></div>
<div
class=
"menu-btn fl"
><a
href=
"#"
><i
class=
"icon-menu"
></i></a></div>
<div
class=
"avatar fr"
><a
href=
"#"
><img
src=
"
<?=
Yii
::
$app
->
assetManager
->
baseUrl
?>
/img/avatar.jpg"
></a></div>
<div
class=
"avatar fr"
><a
href=
"#"
><img
src=
"
<?=
Yii
::
$app
->
assetManager
->
baseUrl
?>
/img/avatar.jpg"
></a></div>
</div>
</div>
<div
class=
"tp-main"
>
<div
class=
"tp-main"
>
<div
class=
"container"
>
<div
class=
"container"
>
<?=
$content
?>
<?=
$content
?>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"foot navbar-fixed-bottom"
>
<div
class=
"foot navbar-fixed-bottom"
>
<p><a
href=
"#"
>
隐私权政策
</a>
-
<a
href=
"#"
>
服务条款
</a>
-
<a
href=
"#"
>
地图条款
</a></p>
<p><a
href=
"#"
>
隐私权政策
</a>
-
<a
href=
"#"
>
服务条款
</a>
-
<a
href=
"#"
>
地图条款
</a></p>
<p>
©2016 Zuiketang.com
</p>
<p>
©2016 Zuiketang.com
</p>
</div>
</div>
<?php
$this
->
endBody
();
?>
<?php
$this
->
endBody
();
?>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment