hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'karson/master'

pull/71/head
PPPSCN 2018-04-17 23:24:04 +08:00
parent 3e7799a796 f035876bfb
commit 1731cdd4bf
9 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -45,7 +45,7 @@ https://demo.fastadmin.net
提　示：演示站数据无法进行删除和修改，只能新增，完整体验请下载源码安装体验
## **界面截图**
![控制台](https://git.oschina.net/uploads/images/2017/0411/113717_e99ff3e7_10933.png "控制台")
![控制台](https://gitee.com/uploads/images/2017/0411/113717_e99ff3e7_10933.png "控制台")
## **问题反馈**
@ -61,7 +61,7 @@ weibo: [@karsonzhang](https://weibo.com/karsonzhang)
Github: https://github.com/karsonzhang/fastadmin
Git@OSC: https://git.oschina.net/karson/fastadmin
Git@OSC: https://gitee.com/karson/fastadmin
## **特别鸣谢**

10
application/admin/controller/Ajax.php
View File

@ -66,10 +66,16 @@ class Ajax extends Backend
$suffix = strtolower(pathinfo($fileInfo['name'], PATHINFO_EXTENSION));
$suffix = $suffix ? $suffix : 'file';
$mimetypeArr = explode(',', $upload['mimetype']);
$mimetypeArr = explode(',', strtolower($upload['mimetype']));
$typeArr = explode('/', $fileInfo['type']);
//验证文件后缀
if ($upload['mimetype'] !== '*' && !in_array($suffix, $mimetypeArr) && !in_array($fileInfo['type'], $mimetypeArr) && !in_array($typeArr[0] . '/*', $mimetypeArr)) {
if ($upload['mimetype'] !== '*' &&
(
!in_array($suffix, $mimetypeArr)
|| (stripos($typeArr[0] . '/', $upload['mimetype']) !== false && (!in_array($fileInfo['type'], $mimetypeArr) && !in_array($typeArr[0] . '/*', $mimetypeArr)))
)
) {
$this->error(__('Uploaded file format is limited'));
}
$replaceArr = [

11
application/api/controller/Common.php
View File

@ -75,11 +75,16 @@ class Common extends Api
$suffix = strtolower(pathinfo($fileInfo['name'], PATHINFO_EXTENSION));
$suffix = $suffix ? $suffix : 'file';
$mimetypeArr = explode(',', $upload['mimetype']);
$mimetypeArr = explode(',', strtolower($upload['mimetype']));
$typeArr = explode('/', $fileInfo['type']);
//验证文件后缀
if ($upload['mimetype'] !== '*' && !in_array($suffix, $mimetypeArr) && !in_array($fileInfo['type'], $mimetypeArr) && !in_array($typeArr[0] . '/*', $mimetypeArr))
{
if ($upload['mimetype'] !== '*' &&
(
!in_array($suffix, $mimetypeArr)
|| (stripos($typeArr[0] . '/', $upload['mimetype']) !== false && (!in_array($fileInfo['type'], $mimetypeArr) && !in_array($typeArr[0] . '/*', $mimetypeArr)))
)
) {
$this->error(__('Uploaded file format is limited'));
}
$replaceArr = [

2
application/common/library/Auth.php
View File

@ -416,7 +416,7 @@ class Auth
$data = $this->_user->toArray();
$allowFields = $this->getAllowFields();
$userinfo = array_intersect_key($data, array_flip($allowFields));
$userinfo['token'] = $this->getToken();
$userinfo = array_merge($userinfo, Token::get($this->_token));
return $userinfo;
}

4
application/common/library/token/driver/Mysql.php
View File

@ -47,7 +47,7 @@ class Mysql extends Driver
*/
public function set($token, $user_id, $expire = null)
{
$expiretime = !is_null($expire) ? time() + $expire : ($expire === 0 ? 0 : time() + $this->options['expire']);
$expiretime = !is_null($expire) && $expire !== 0 ? time() + $expire : 0;
$token = $this->getEncryptedToken($token);
$this->handler->insert(['token' => $token, 'user_id' => $user_id, 'createtime' => time(), 'expiretime' => $expiretime]);
return TRUE;
@ -66,7 +66,7 @@ class Mysql extends Driver
//返回未加密的token给客户端使用
$data['token'] = $token;
//返回剩余有效时间
$data['expired_in'] = $this->getExpiredIn($data['expiretime']);
$data['expires_in'] = $this->getExpiredIn($data['expiretime']);
return $data;
} else {
self::delete($token);

4
application/config.php
View File

@ -260,7 +260,7 @@ return [
//是否开启前台会员中心
'usercenter' => true,
//登录验证码
'login_captcha' => true,
'login_captcha' => false,
//登录失败超过10则1天后重试
'login_failure_retry' => true,
//是否同一账号同一时间只能在一个地方登录
@ -270,7 +270,7 @@ return [
//自动检测更新
'checkupdate' => false,
//版本号
'version' => '1.0.0.20180406_beta',
'version' => '1.0.0.20180417_beta',
//API接口地址
'api_url' => 'https://api.fastadmin.net',
],

2
application/extra/upload.php
View File

@ -21,7 +21,7 @@ return [
/**
* 可上传的文件类型
*/
'mimetype' => '*',
'mimetype' => 'jpg,png,bmp,jpeg,gif,zip,rar,xls,xlsx',
/**
* 是否支持批量上传
*/

2
public/assets/js/require-backend.min.js vendored
View File

@ -10446,7 +10446,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
return html;
},
url: function (value, row, index) {
return '<div class="input-group input-group-sm" style="width:250px;"><input type="text" class="form-control input-sm" value="' + value + '"><span class="input-group-btn input-group-sm"><a href="' + value + '" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-link"></i></a></span></div>';
return '<div class="input-group input-group-sm" style="width:250px;margin:0 auto;"><input type="text" class="form-control input-sm" value="' + value + '"><span class="input-group-btn input-group-sm"><a href="' + value + '" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-link"></i></a></span></div>';
},
search: function (value, row, index) {
return '<a href="javascript:;" class="searchit" data-field="' + this.field + '" data-value="' + value + '">' + value + '</a>';

2
public/assets/js/require-table.js
View File

@ -405,7 +405,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
return html;
},
url: function (value, row, index) {
return '<div class="input-group input-group-sm" style="width:250px;"><input type="text" class="form-control input-sm" value="' + value + '"><span class="input-group-btn input-group-sm"><a href="' + value + '" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-link"></i></a></span></div>';
return '<div class="input-group input-group-sm" style="width:250px;margin:0 auto;"><input type="text" class="form-control input-sm" value="' + value + '"><span class="input-group-btn input-group-sm"><a href="' + value + '" target="_blank" class="btn btn-default btn-sm"><i class="fa fa-link"></i></a></span></div>';
},
search: function (value, row, index) {
return '<a href="javascript:;" class="searchit" data-field="' + this.field + '" data-value="' + value + '">' + value + '</a>';