diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index d5c197a5cc163ca038be0d24feb88ab13e60c313..2047dd511bf8dec28bf70f069486601f2b38735a 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -59,6 +59,7 @@ CREATE TABLE `fa_admin_log` ( DROP TABLE IF EXISTS `fa_attachment`; CREATE TABLE `fa_attachment` ( `id` int(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', + `name` varchar(30) NOT NULL DEFAULT '' COMMENT '名称名称', `admin_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '管理员ID', `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '会员ID', `url` varchar(255) NOT NULL DEFAULT '' COMMENT '物理路径', diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php index 92c157a785a47b32b2b27a510bc4768c70e357cf..0b493049ac029da506fb3faeb40e0fd8fb7e4404 100644 --- a/application/admin/controller/Ajax.php +++ b/application/admin/controller/Ajax.php @@ -135,6 +135,7 @@ class Ajax extends Backend 'storage' => 'local', 'sha1' => $sha1, 'extparam' => json_encode($extparam), + 'name' => $fileInfo['name'], ); $attachment = model("attachment"); $attachment->data(array_filter($params)); diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index b2a35d70e6efb24a720a55bd5a5b3ccc68a077e2..438e9014a26898fd4edba29607b5c7da8a763bb2 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -17,6 +17,10 @@ class Attachment extends Backend * @var \app\common\model\Attachment */ protected $model = null; + /** + * 快速搜索时执行查找的字段 + */ + protected $searchFields = 'id,name'; public function _initialize() { diff --git a/application/admin/lang/zh-cn/general/attachment.php b/application/admin/lang/zh-cn/general/attachment.php index 96ea7af7223dd9e297d4fa77d2690007ad68103f..50f5ebf4e764bab3ecc0537bcb1a598e5a7301e2 100644 --- a/application/admin/lang/zh-cn/general/attachment.php +++ b/application/admin/lang/zh-cn/general/attachment.php @@ -2,6 +2,7 @@ return [ 'Id' => 'ID', + 'name' => '名称', 'Admin_id' => '管理员ID', 'User_id' => '会员ID', 'Url' => '物理路径', diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index c5a7d101736a3f5ede1ae51077d22ad0b8d06323..b225b04e1278e7da2b4d2d16c5ea03fdd6b119fa 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -126,8 +126,9 @@ class Common extends Api 'uploadtime' => time(), 'storage' => 'local', 'sha1' => $sha1, + 'name' => $fileInfo['name'], ); - $attachment = model("attachment"); + $attachment = $attachment = new \app\common\model\Attachment(); $attachment->data(array_filter($params)); $attachment->save(); \think\Hook::listen("upload_after", $attachment); diff --git a/application/common/model/User.php b/application/common/model/User.php index dcb2442841bbba56f1e0286f224e630ffb085d1a..8dedc19a2671303c103efbda950457a264277faa 100644 --- a/application/common/model/User.php +++ b/application/common/model/User.php @@ -43,6 +43,8 @@ class User extends Model //如果不需要启用首字母头像,请使用 //$value = '/assets/img/avatar.png'; $value = letter_avatar($data['nickname']); + }else{ + $value = cdnurl($value, true); } return $value; } diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js index 345fc1d277b5f01dcc7760c44cb3af340c4f1fc9..983e3d9d75690dc8d496c21adcc6aa409d8e783c 100644 --- a/public/assets/js/backend/general/attachment.js +++ b/public/assets/js/backend/general/attachment.js @@ -24,6 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin [ {field: 'state', checkbox: true}, {field: 'id', title: __('Id')}, + {field: 'name', title: __('name')}, {field: 'admin_id', title: __('Admin_id'), visible: false, addClass: "selectpage", extend: "data-source='auth/admin/index' data-field='nickname'"}, {field: 'user_id', title: __('User_id'), visible: false, addClass: "selectpage", extend: "data-source='user/user/index' data-field='nickname'"}, {field: 'url', title: __('Preview'), formatter: Controller.api.formatter.thumb, operate: false},