diff --git a/application/admin/controller/Buiattach.php b/application/admin/controller/Buiattach.php new file mode 100644 index 0000000..eeaeeb1 --- /dev/null +++ b/application/admin/controller/Buiattach.php @@ -0,0 +1,92 @@ +url()); + $this->model = model('Attachment'); + $this->view->assign("mimetypeList", \app\common\model\Attachment::getMimetypeList()); + $this->view->assign("categoryList", \app\common\model\Attachment::getCategoryList()); + $this->assignconfig("categoryList", \app\common\model\Attachment::getCategoryList()); + $module_url = isset($module_url[1]) ? $module_url[1] : $request->module(); + $this->view->assign("domain", sprintf("%s/%s", $request->domain(),$module_url)); + } + + /** + * 查看 + */ + public function index(){ + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + $multiple = $this->request->request('multiple',0); + + if ($this->request->isAjax()) { + $mimetypeQuery = []; + $filter = $this->request->request('filter'); + $filterArr = (array)json_decode($filter, true); + if (isset($filterArr['category']) && $filterArr['category'] == 'unclassed') { + $filterArr['category'] = ',unclassed'; + $this->request->get(['filter' => json_encode(array_diff_key($filterArr, ['category' => '']))]); + } + if (isset($filterArr['mimetype']) && preg_match("/[]\,|\*]/", $filterArr['mimetype'])) { + $mimetype = $filterArr['mimetype']; + $filterArr = array_diff_key($filterArr, ['mimetype' => '']); + $mimetypeQuery = function ($query) use ($mimetype) { + $mimetypeArr = explode(',', $mimetype); + foreach ($mimetypeArr as $index => $item) { + if (stripos($item, "/*") !== false) { + $query->whereOr('mimetype', 'like', str_replace("/*", "/", $item) . '%'); + } else { + $query->whereOr('mimetype', 'like', '%' . $item . '%'); + } + } + }; + } + $this->request->get(['filter' => json_encode($filterArr)]); + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + $list = $this->model->where('mimetype', 'like','image/%') + ->where($where) + ->whereRaw("`filename` NOT REGEXP '^[0-9A-Fa-f]{32}'") + ->order($sort, $order) + ->paginate($limit); + $cdnurl = preg_replace("/\/(\w+)\.php$/i", '', $this->request->root()); + foreach ($list as $k => &$v) { + $v['fullurl'] = ($v['storage'] == 'local' ? $cdnurl : $this->view->config['upload']['cdnurl']) . $v['url']; + } + unset($v); + $result = array("total" => $list->total(), "rows" => $list->items(),"multiple"=>$multiple); + return json($result); + } + $this->view->assign("multiple",$multiple); + return $this->view->fetch(); + } + + /** + * 分类 + */ + public function category(){ + $getCategoryList = \app\common\model\Attachment::getCategoryList(); + unset($getCategoryList['unclassed']); + $this->view->assign("categoryListJson", json_encode($getCategoryList,JSON_UNESCAPED_UNICODE )); + return $this->view->fetch(); + } +} diff --git a/application/admin/controller/manystore/Index.php b/application/admin/controller/manystore/Index.php index dd893a7..ee985dd 100644 --- a/application/admin/controller/manystore/Index.php +++ b/application/admin/controller/manystore/Index.php @@ -137,13 +137,67 @@ class Index extends Backend return $this->selectpage(); } - list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + list($where, $sort, $order, $offset, $limit, $page, $alias, $bind, $excludearray) = $this->buildparams(null, null, ["check_full"]); + + if (isset($excludearray['check_full']['value']) && $excludearray['check_full']['value']) { + $check_full = $excludearray['check_full']['value']; + + + switch ($check_full) { + case 'true': //查完善 + $expireWhere = [ + function ($query) { + $query->where(function ($query){ + $query->where("shop.address_city","<>", '') + ->where("shop.province","<>", '') + ->where("shop.city","<>", '') + ->where("shop.district","<>", '') + ->where("shop.longitude","<>", '') + ->where("shop.latitude","<>", '') + ->where("shop.name","<>", '') + ->where("shop.image","<>", '') + ->where("shop.images","<>", '') + ->where("shop.content","<>", '') + ->where("shop.tel","<>", '') + ->where("shop.logo","<>", ''); + }); + } + ]; + break; + case 'false': //查未完善 + $expireWhere = [ + function ($query) { + $query->where(function ($query){ + $query->where("shop.address_city", '') + ->whereOr("shop.province", '') + ->whereOr("shop.city", '') + ->whereOr("shop.district", '') + ->whereOr("shop.longitude", '') + ->whereOr("shop.latitude", '') + ->whereOr("shop.name", '') + ->whereOr("shop.image", '') + ->whereOr("shop.images", '') + ->whereOr("shop.content", '') + ->whereOr("shop.tel", '') + ->whereOr("shop.logo", ''); + }); + + } + ]; + break; + default: + } + + } else { + $expireWhere = [[]]; + } $total = $this->model ->with(['shop',"user"]) ->where($where) + ->where(...$expireWhere) ->where(array('is_main'=>1)) ->order($sort, $order) ->count(); @@ -151,6 +205,7 @@ class Index extends Backend $list = $this->model ->with(['shop',"user"]) ->where($where) + ->where(...$expireWhere) ->where(array('is_main'=>1)) // ->field(['password', 'salt', 'token'], true) ->order($sort, $order) diff --git a/application/admin/controller/school/MessageConfigItem.php b/application/admin/controller/school/MessageConfigItem.php new file mode 100644 index 0000000..24d08a4 --- /dev/null +++ b/application/admin/controller/school/MessageConfigItem.php @@ -0,0 +1,77 @@ +model = new \app\admin\model\school\MessageConfigItem; + parent::_initialize(); + + $this->view->assign("wechatWapList", $this->model->getWechatWapList()); + $this->view->assign("messageList", $this->model->getMessageList()); + $this->view->assign("selfmailList", $this->model->getSelfmailList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + + /** + * 查看 + */ + public function index() + { + //当前是否为关联查询 + $this->relationSearch = true; + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if ($this->request->isAjax()) { + //如果发送的来源是Selectpage，则转发到Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + + $list = $this->model + ->with(['config']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as $row) { + + $row->getRelation('config')->visible(['name','logo_image']); + } + + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + return $this->view->fetch(); + } + +} diff --git a/application/admin/controller/school/classes/Cate.php b/application/admin/controller/school/classes/Cate.php index 276882f..0ad97f4 100644 --- a/application/admin/controller/school/classes/Cate.php +++ b/application/admin/controller/school/classes/Cate.php @@ -25,6 +25,9 @@ class Cate extends Backend $this->model = new \app\admin\model\school\classes\Cate; $this->view->assign("statusList", $this->model->getStatusList()); $this->view->assign("hotList", $this->model->getHotList()); + + +// var_dump(request()->post("category"));die; } diff --git a/application/admin/lang/zh-cn/buiattach.php b/application/admin/lang/zh-cn/buiattach.php new file mode 100644 index 0000000..1dc6cae --- /dev/null +++ b/application/admin/lang/zh-cn/buiattach.php @@ -0,0 +1,41 @@ + 'ID', + 'Admin_id' => '管理员ID', + 'User_id' => '会员ID', + 'Url' => '物理路径', + 'Imagewidth' => '宽度', + 'Imageheight' => '高度', + 'Imagetype' => '图片类型', + 'Imageframes' => '图片帧数', + 'Preview' => '预览', + 'Filename' => '文件名', + 'Filesize' => '文件大小', + 'Mimetype' => 'Mime类型', + 'Image' => '图片', + 'Audio' => '音频', + 'Video' => '视频', + 'Text' => '文档', + 'Application' => '应用', + 'Zip' => '压缩包', + 'Extparam' => '透传数据', + 'Createtime' => '创建日期', + 'Uploadtime' => '上传时间', + 'Storage' => '存储引擎', + 'Category1' => '分类一', + 'Category2' => '分类二', + 'Custom' => '自定义', + 'Unclassed' => '未归类', + 'Category' => '类别', + 'Classify' => '归类', + 'Filter Type' => '类型筛选', + 'Upload to third' => '上传到第三方', + 'Upload to local' => '上传到本地', + 'Upload to third by chunk' => '上传到第三方(分片模式)', + 'Upload to local by chunk' => '上传到本地(分片模式)', + 'Please enter a new name' => '请输入新的类别名称', + 'Please select category' => '请选择一个类别', + 'Category not found' => '指定的类别未找到', + 'Upload from editor' => '从编辑器上传' +]; diff --git a/application/admin/lang/zh-cn/school/message_config.php b/application/admin/lang/zh-cn/school/message_config.php index 2a0460b..da2a3ee 100644 --- a/application/admin/lang/zh-cn/school/message_config.php +++ b/application/admin/lang/zh-cn/school/message_config.php @@ -2,7 +2,7 @@ return [ 'Name' => '事件名', - 'Event' => '事件标识', + 'Event' => '事件标识（英文+下划线）', 'Logo_image' => '事件消息logo', 'Status' => '事件类型', 'Status 1' => '系统推送', diff --git a/application/admin/lang/zh-cn/school/message_config_item.php b/application/admin/lang/zh-cn/school/message_config_item.php new file mode 100644 index 0000000..2607b8f --- /dev/null +++ b/application/admin/lang/zh-cn/school/message_config_item.php @@ -0,0 +1,28 @@ + '事件标识（英文+下划线）', + 'Event_two' => '消息标识（英文+下划线）', + 'Name' => '消息备注', + 'Wechat_wap' => '微信公众号消息', + 'Wechat_wap 1' => '开启', + 'Wechat_wap 2' => '关闭', + 'Message' => '短信消息', + 'Message 1' => '开启', + 'Message 2' => '关闭', + 'Selfmail' => '站内行消息', + 'Selfmail 1' => '开启', + 'Selfmail 2' => '关闭', + 'Message_id' => '短信模板id', + 'Wechat_wap_id' => '公众号模板消息id', + 'Selfmail_title' => '站内信标题', + 'Selfmail_template_text' => '站内信模板', + 'Configjson' => '可用的模板字段变量', + 'Thirdjson' => '额外第三方参数', + 'Weigh' => '权重', + 'Createtime' => '创建时间', + 'Updatetime' => '修改时间', + 'Deletetime' => '删除时间', + 'Config.name' => '事件名', + 'Config.logo_image' => '事件消息logo' +]; diff --git a/application/admin/model/school/MessageConfigItem.php b/application/admin/model/school/MessageConfigItem.php new file mode 100644 index 0000000..3169d4f --- /dev/null +++ b/application/admin/model/school/MessageConfigItem.php @@ -0,0 +1,91 @@ +getPk(); + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]); + } + }); + } + + + public function getWechatWapList() + { + return ['1' => __('Wechat_wap 1'), '2' => __('Wechat_wap 2')]; + } + + public function getMessageList() + { + return ['1' => __('Message 1'), '2' => __('Message 2')]; + } + + public function getSelfmailList() + { + return ['1' => __('Selfmail 1'), '2' => __('Selfmail 2')]; + } + + + public function getWechatWapTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['wechat_wap']) ? $data['wechat_wap'] : ''); + $list = $this->getWechatWapList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getMessageTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['message']) ? $data['message'] : ''); + $list = $this->getMessageList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + public function getSelfmailTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['selfmail']) ? $data['selfmail'] : ''); + $list = $this->getSelfmailList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + + + + public function config() + { + return $this->belongsTo('app\admin\model\school\message\Config', 'event', 'event', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/application/admin/validate/school/MessageConfigItem.php b/application/admin/validate/school/MessageConfigItem.php new file mode 100644 index 0000000..b1f2de2 --- /dev/null +++ b/application/admin/validate/school/MessageConfigItem.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/buiattach/category.html b/application/admin/view/buiattach/category.html new file mode 100644 index 0000000..ffa60bc --- /dev/null +++ b/application/admin/view/buiattach/category.html @@ -0,0 +1,30 @@ +
+
+
+
+
+ {:token()} +
+
+
+
分类名分类值
+
+ 追加 +
+ +
+
+
+
+ +
+ + +
+
+
+
+
+
+
+ diff --git a/application/admin/view/buiattach/index.html b/application/admin/view/buiattach/index.html new file mode 100644 index 0000000..7af2cf3 --- /dev/null +++ b/application/admin/view/buiattach/index.html @@ -0,0 +1,77 @@ + +
+
+
+
+
+
+ 全部 + {foreach name="categoryList" id="item"} + {$item} + {/foreach} +
+
+ +
+
+ + +
    + {foreach name="categoryList" id="item"} +
  • {$item}
    • + {/foreach} +
+ + + + + +
+ + +
+
+ + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/application/admin/view/manystore/index/add.html b/application/admin/view/manystore/index/add.html index 05322a0..e60261d 100644 --- a/application/admin/view/manystore/index/add.html +++ b/application/admin/view/manystore/index/add.html @@ -183,8 +183,8 @@
- - + +
@@ -197,8 +197,8 @@
- - + +
@@ -233,8 +233,8 @@
- - + +
diff --git a/application/admin/view/manystore/index/edit.html b/application/admin/view/manystore/index/edit.html index 591ea78..21d0724 100644 --- a/application/admin/view/manystore/index/edit.html +++ b/application/admin/view/manystore/index/edit.html @@ -199,8 +199,8 @@
- - + +
@@ -213,8 +213,8 @@
- - + +
@@ -250,8 +250,8 @@
- - + +
diff --git a/application/admin/view/school/message_config/add.html b/application/admin/view/school/message_config/add.html index cb6a21a..a58c63e 100644 --- a/application/admin/view/school/message_config/add.html +++ b/application/admin/view/school/message_config/add.html @@ -38,82 +38,82 @@ -
- -
- - + + + + + + + + + -
-
-
- -
- - + + + + + + + + + + + -
-
-
- -
- - + + + + + + + + + + + -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- {:__('Key')} - {:__('Value')} -
-
{:__('Append')}
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
+ +
diff --git a/application/admin/view/school/message_config/edit.html b/application/admin/view/school/message_config/edit.html index 4b257ed..847a12e 100644 --- a/application/admin/view/school/message_config/edit.html +++ b/application/admin/view/school/message_config/edit.html @@ -38,88 +38,88 @@
-
- -
- - + + + + + + + + + -
-
-
- -
- - + + + + + + + + + + + -
-
-
- -
- - + + + + + + + + + + + -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- {:__('Key')} - {:__('Value')} -
-
{:__('Append')}
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
- -
- -
-
+ + + + + + + +
diff --git a/application/admin/view/school/message_config_item/add.html b/application/admin/view/school/message_config_item/add.html new file mode 100644 index 0000000..bed952e --- /dev/null +++ b/application/admin/view/school/message_config_item/add.html @@ -0,0 +1,127 @@ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ + + +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ {:__('Key')} + {:__('Value')} +
+
{:__('Append')}
+ +
+ + +
+
+
+ +
+ +
+
+ {:__('Key')} + {:__('Value')} +
+
{:__('Append')}
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/school/message_config_item/edit.html b/application/admin/view/school/message_config_item/edit.html new file mode 100644 index 0000000..f023b56 --- /dev/null +++ b/application/admin/view/school/message_config_item/edit.html @@ -0,0 +1,127 @@ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ + + +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ {:__('Key')} + {:__('Value')} +
+
{:__('Append')}
+ +
+ + +
+
+
+ +
+ +
+
+ {:__('Key')} + {:__('Value')} +
+
{:__('Append')}
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/school/message_config_item/index.html b/application/admin/view/school/message_config_item/index.html new file mode 100644 index 0000000..a5b2148 --- /dev/null +++ b/application/admin/view/school/message_config_item/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+ + +
+
+
diff --git a/application/admin/view/school/message_config_item/recyclebin.html b/application/admin/view/school/message_config_item/recyclebin.html new file mode 100644 index 0000000..05aac35 --- /dev/null +++ b/application/admin/view/school/message_config_item/recyclebin.html @@ -0,0 +1,25 @@ +
+ {:build_heading()} + +
+
+
+
+ + +
+
+
+ +
+
+
diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index 3e42603..9b38bd2 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -80,15 +80,19 @@ class Common extends Api } /** - * 上传文件 + * 用户上传文件 * @ApiMethod (POST) * @ApiParams (name="file", type="File", required=true, description="文件流") + * @ApiParams (name="category", type="string", required=true, description="分类标识：category1=非机密类1,category2=非机密类2,cert=证件机密类,code=二维码类,user=用户普通上传") + * */ public function upload() { Config::set('default_return_type', 'json'); //必须设定cdnurl为空,否则cdnurl函数计算错误 Config::set('upload.cdnurl', ''); + $category = $this->request->post("category",'user'); +// var_dump($category);die; $chunkid = $this->request->post("chunkid"); if ($chunkid) { if (!Config::get('upload.chunking')) { @@ -98,6 +102,7 @@ class Common extends Api $chunkindex = $this->request->post("chunkindex/d"); $chunkcount = $this->request->post("chunkcount/d"); $filename = $this->request->post("filename"); + $method = $this->request->method(true); if ($action == 'merge') { $attachment = null; @@ -123,8 +128,10 @@ class Common extends Api //默认普通上传文件 $file = $this->request->file('file'); try { + $upload = new Upload($file); $upload->chunk($chunkid, $chunkindex, $chunkcount); + } catch (UploadException $e) { $this->error($e->getMessage()); } @@ -135,12 +142,15 @@ class Common extends Api //默认普通上传文件 $file = $this->request->file('file'); try { - $upload = new Upload($file); + + $upload = new Upload($file,$category); $attachment = $upload->upload(); + +// $attachment = $upload->upload(); } catch (UploadException $e) { - $this->error($e->getMessage()); + $this->error($e->getMessage().$e->getFile().$e->getLine()); } catch (\Exception $e) { - $this->error($e->getMessage()); + $this->error($e->getMessage().$e->getFile().$e->getLine()); } $this->success(__('Uploaded successful'), ['url' => $attachment->url, 'fullurl' => cdnurl($attachment->url, true)]); diff --git a/application/api/controller/school/worker/Base.php b/application/api/controller/school/worker/Base.php index 9a08f2e..5f20faa 100644 --- a/application/api/controller/school/worker/Base.php +++ b/application/api/controller/school/worker/Base.php @@ -11,6 +11,7 @@ class Base extends Api { protected $classes_lib_ids = []; + protected $shop_id = 0; /** * 初始化操作 @@ -29,16 +30,16 @@ class Base extends Api $user = $this->auth->getUser();//登录用户 if($user)$user_id = $user['id']; if(!$user_id)$this->error("请登录后再访问该接口！",['errcode'=>30002], 401); - $shop_id = 0; + try{ - $shop_id = ClassesLib::checkOptionAuth(0,$user_id,"user"); + $this->shop_id = ClassesLib::checkOptionAuth(0,$user_id,"user"); }catch (\Exception $e){ $this->error($e->getMessage(),['errcode'=>30003]); } $this->classes_lib_ids = (new ClassesLib)->getClassesAuthIds($user_id); //如果没有任何可管理的classes_lib_id 则返回错误 - if(!$this->classes_lib_ids && !$shop_id)$this->error("您没有员工权限访问该接口！",['errcode'=>30003]); + if(!$this->classes_lib_ids && !$this->shop_id)$this->error("您没有员工权限访问该接口！",['errcode'=>30003]); } diff --git a/application/api/controller/school/worker/Common.php b/application/api/controller/school/worker/Common.php new file mode 100644 index 0000000..5240600 --- /dev/null +++ b/application/api/controller/school/worker/Common.php @@ -0,0 +1,212 @@ +request->server("HTTP_SID")); + } + parent::_initialize(); + } + + /** + * 加载初始化 + * + * @ApiParams (name="version", type="string", required=true, description="版本号") + * @ApiParams (name="lng", type="string", required=true, description="经度") + * @ApiParams (name="lat", type="string", required=true, description="纬度") + */ + public function init() + { + if ($version = $this->request->request('version')) { + $lng = $this->request->request('lng'); + $lat = $this->request->request('lat'); + + //配置信息 + $upload = Config::get('upload'); + //如果非服务端中转模式需要修改为中转 + if ($upload['storage'] != 'local' && isset($upload['uploadmode']) && $upload['uploadmode'] != 'server') { + //临时修改上传模式为服务端中转 + set_addon_config($upload['storage'], ["uploadmode" => "server"], false); + + $upload = \app\common\model\Config::upload(); + // 上传信息配置后 + Hook::listen("upload_config_init", $upload); + + $upload = Config::set('upload', array_merge(Config::get('upload'), $upload)); + } + + $upload['cdnurl'] = $upload['cdnurl'] ? $upload['cdnurl'] : cdnurl('', true); + $upload['uploadurl'] = preg_match("/^((?:[a-z]+:)?\/\/)(.*)/i", $upload['uploadurl']) ? $upload['uploadurl'] : url($upload['storage'] == 'local' ? '/api/common/upload' : $upload['uploadurl'], '', false, true); + + $content = [ + 'citydata' => Area::getCityFromLngLat($lng, $lat), + 'versiondata' => Version::check($version), + 'uploaddata' => $upload, + 'coverdata' => Config::get("cover"), + ]; + $this->success('', $content); + } else { + $this->error(__('Invalid parameters')); + } + } + + /** + * 员工端上传文件 + * @ApiMethod (POST) + * @ApiParams (name="file", type="File", required=true, description="文件流") + * @ApiParams (name="category", type="string", required=true, description="分类标识：category1=非机密类1,category2=非机密类2,cert=证件机密类,code=二维码类,user=用户普通上传") + * + */ + public function upload() + { + Config::set('default_return_type', 'json'); + $file = $this->request->file('file'); + $category = $this->request->post("category",'user'); + if (empty($file)) { + $this->error(__('No file upload or server upload limit exceeded')); + } + + //判断是否已经存在附件 + $sha1 = $file->hash(); + $extparam = $this->request->post(); + + $upload = Config::get('upload'); + + preg_match('/(\d+)(\w+)/', $upload['maxsize'], $matches); + $type = strtolower($matches[2]); + $typeDict = ['b' => 0, 'k' => 1, 'kb' => 1, 'm' => 2, 'mb' => 2, 'gb' => 3, 'g' => 3]; + $size = (int)$upload['maxsize'] * pow(1024, isset($typeDict[$type]) ? $typeDict[$type] : 0); + $fileInfo = $file->getInfo(); + $suffix = strtolower(pathinfo($fileInfo['name'], PATHINFO_EXTENSION)); + $suffix = $suffix && preg_match("/^[a-zA-Z0-9]+$/", $suffix) ? $suffix : 'file'; + $fileInfo['suffix'] = $suffix; + + $mimetypeArr = explode(',', strtolower($upload['mimetype'])); + $typeArr = explode('/', $fileInfo['type']); + + //禁止上传PHP和HTML文件 + if (in_array($fileInfo['type'], ['text/x-php', 'text/html']) || in_array($suffix, ['php', 'html', 'htm', 'phar', 'phtml']) || preg_match("/^php(.*)/i", $fileInfo['suffix'])) { + $this->error(__('Uploaded file format is limited')); + } + + //Mimetype值不正确 + if (stripos($fileInfo['type'], '/') === false) { + $this->error(__('Uploaded file format is limited')); + } + + //验证文件后缀 + 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')); + } + //验证是否为图片文件 + $imagewidth = $imageheight = 0; + if (in_array($fileInfo['type'], ['image/gif', 'image/jpg', 'image/jpeg', 'image/bmp', 'image/png', 'image/webp']) || in_array($suffix, ['gif', 'jpg', 'jpeg', 'bmp', 'png', 'webp'])) { + $imgInfo = getimagesize($fileInfo['tmp_name']); + if (!$imgInfo || !isset($imgInfo[0]) || !isset($imgInfo[1])) { + $this->error(__('Uploaded file is not a valid image')); + } + $imagewidth = isset($imgInfo[0]) ? $imgInfo[0] : $imagewidth; + $imageheight = isset($imgInfo[1]) ? $imgInfo[1] : $imageheight; + } + $replaceArr = [ + '{year}' => date("Y"), + '{mon}' => date("m"), + '{day}' => date("d"), + '{hour}' => date("H"), + '{min}' => date("i"), + '{sec}' => date("s"), + '{random}' => Random::alnum(16), + '{random32}' => Random::alnum(32), + '{filename}' => $suffix ? substr($fileInfo['name'], 0, strripos($fileInfo['name'], '.')) : $fileInfo['name'], + '{suffix}' => $suffix, + '{.suffix}' => $suffix ? '.' . $suffix : '', + '{filemd5}' => md5_file($fileInfo['tmp_name']), + ]; + $savekey = $upload['savekey']; + $savekey = str_replace(array_keys($replaceArr), array_values($replaceArr), $savekey); + + $uploadDir = substr($savekey, 0, strripos($savekey, '/') + 1); + $fileName = substr($savekey, strripos($savekey, '/') + 1); + // + $splInfo = $file->validate(['size' => $size])->move(ROOT_PATH . '/public' . $uploadDir, $fileName); + + $category = array_key_exists($category, config('site.attachmentcategory') ?? []) ? $category : 'user'; + + if ($splInfo) { + $user_id = 0; + $user = $this->auth->getUser();//登录用户 + if($user)$user_id = $user['id']; + + + $params = array( + 'category' => $category, + 'shop_id' => (int)$this->shop_id, + 'user_id' => $user_id, + 'filesize' => $fileInfo['size'], + 'imagewidth' => $imagewidth, + 'imageheight' => $imageheight, + 'imagetype' => $suffix, + 'imageframes' => 0, + 'mimetype' => $fileInfo['type'], + 'url' => $uploadDir . $splInfo->getSaveName(), + 'uploadtime' => time(), + 'storage' => 'local', + 'sha1' => $sha1, + 'extparam' => json_encode($extparam), + ); + $attachment = model("ManystoreAttachment"); + $attachment->data(array_filter($params)); + $attachment->save(); + \think\Hook::listen("upload_after", $attachment); +// $this->success(__('Upload successful'), null, [ +// 'url' => $uploadDir . $splInfo->getSaveName() +// ]); + + $this->success(__('Uploaded successful'), ['url' => $attachment->url, 'fullurl' => cdnurl($attachment->url, true)]); + + + } else { + // 上传失败获取错误信息 + $this->error($file->getError()); + } + + } + + + +} diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php index add846d..506bfe1 100644 --- a/application/common/library/Upload.php +++ b/application/common/library/Upload.php @@ -9,6 +9,7 @@ use FilesystemIterator; use think\Config; use think\File; use think\Hook; +use think\Log; /** * 文件上传类 @@ -29,13 +30,16 @@ class Upload protected $file = null; protected $fileInfo = null; - public function __construct($file = null) + protected $category_name = ""; + + public function __construct($file = null,$category_name = '') { $this->config = Config::get('upload'); $this->chunkDir = RUNTIME_PATH . 'chunks'; if ($file) { $this->setFile($file); } + $this->category_name = $category_name; } /** @@ -396,13 +400,17 @@ class Upload } $this->file = $file; $category = request()->post('category'); - $category = array_key_exists($category, config('site.attachmentcategory') ?? []) ? $category : ''; + if($category)$this->category_name = $category; + +// throw new UploadException("测试错误！{$category}"); + $this->category_name = array_key_exists($this->category_name, config('site.attachmentcategory') ?? []) ? $this->category_name : ''; + $auth = Auth::instance(); $params = array( 'admin_id' => (int)session('admin.id'), 'user_id' => (int)$auth->id, 'filename' => mb_substr(htmlspecialchars(strip_tags($this->fileInfo['name'])), 0, 100), - 'category' => $category, + 'category' => $this->category_name, 'filesize' => $this->fileInfo['size'], 'imagewidth' => $this->fileInfo['imagewidth'], 'imageheight' => $this->fileInfo['imageheight'], diff --git a/application/manystore/controller/Ajax.php b/application/manystore/controller/Ajax.php index eedb25f..cd6486e 100644 --- a/application/manystore/controller/Ajax.php +++ b/application/manystore/controller/Ajax.php @@ -120,8 +120,12 @@ class Ajax extends ManystoreBase $fileName = substr($savekey, strripos($savekey, '/') + 1); // $splInfo = $file->validate(['size' => $size])->move(ROOT_PATH . '/public' . $uploadDir, $fileName); + $category = request()->post('category'); + $category = array_key_exists($category, config('site.attachmentcategory') ?? []) ? $category : ''; + if ($splInfo) { $params = array( + 'category' => $category, 'shop_id' => (int)SHOP_ID, 'user_id' => 0, 'filesize' => $fileInfo['size'], diff --git a/application/manystore/controller/general/Attachment.php b/application/manystore/controller/general/Attachment.php index bc49d86..2881441 100644 --- a/application/manystore/controller/general/Attachment.php +++ b/application/manystore/controller/general/Attachment.php @@ -3,6 +3,7 @@ namespace app\manystore\controller\general; use app\common\controller\ManystoreBase; +use app\common\model\ManystoreAttachment; /** * 附件管理 @@ -23,6 +24,8 @@ class Attachment extends ManystoreBase parent::_initialize(); $this->model = model('ManystoreAttachment'); $this->view->assign("mimetypeList", \app\common\model\ManystoreAttachment::getMimetypeList()); + $this->view->assign("categoryList", \app\common\model\Attachment::getCategoryList()); + $this->assignconfig("categoryList", \app\common\model\Attachment::getCategoryList()); } /** @@ -36,6 +39,11 @@ class Attachment extends ManystoreBase $mimetypeQuery = []; $filter = $this->request->request('filter'); $filterArr = (array)json_decode($filter, true); + if (isset($filterArr['category']) && $filterArr['category'] == 'unclassed') { + $filterArr['category'] = ',unclassed'; + $this->request->get(['filter' => json_encode(array_diff_key($filterArr, ['category' => '']))]); + } + if (isset($filterArr['mimetype']) && preg_match("/[]\,|\*]/", $filterArr['mimetype'])) { $this->request->get(['filter' => json_encode(array_diff_key($filterArr, ['mimetype' => '']))]); $mimetypeQuery = function ($query) use ($filterArr) { @@ -125,4 +133,37 @@ class Attachment extends ManystoreBase $this->error(__('Parameter %s can not be empty', 'ids')); } + + + /** + * 归类 + */ + public function classify() + { + if (!$this->auth->check('general/attachment/edit')) { + \think\Hook::listen('admin_nopermission', $this); + $this->error(__('You have no permission'), ''); + } + if (!$this->request->isPost()) { + $this->error(__("Invalid parameters")); + } + $category = $this->request->post('category', ''); + $ids = $this->request->post('ids'); + if (!$ids) { + $this->error(__('Parameter %s can not be empty', 'ids')); + } + $categoryList = \app\common\model\Attachment::getCategoryList(); + if ($category && !isset($categoryList[$category])) { + $this->error(__('Category not found')); + } + +// if(!defined('SHOP_ID')){ +// define('SHOP_ID', $this->auth->shop_id); +// } + + $category = $category == 'unclassed' ? '' : $category; + ManystoreAttachment::where('id', 'in', $ids)->update(['category' => $category]); + $this->success(); + } + } diff --git a/application/manystore/lang/zh-cn/general/attachment.php b/application/manystore/lang/zh-cn/general/attachment.php index 90fe66d..1dc6cae 100644 --- a/application/manystore/lang/zh-cn/general/attachment.php +++ b/application/manystore/lang/zh-cn/general/attachment.php @@ -23,9 +23,19 @@ return [ 'Createtime' => '创建日期', 'Uploadtime' => '上传时间', 'Storage' => '存储引擎', + 'Category1' => '分类一', + 'Category2' => '分类二', + 'Custom' => '自定义', + 'Unclassed' => '未归类', + 'Category' => '类别', + 'Classify' => '归类', + 'Filter Type' => '类型筛选', 'Upload to third' => '上传到第三方', 'Upload to local' => '上传到本地', 'Upload to third by chunk' => '上传到第三方(分片模式)', 'Upload to local by chunk' => '上传到本地(分片模式)', + 'Please enter a new name' => '请输入新的类别名称', + 'Please select category' => '请选择一个类别', + 'Category not found' => '指定的类别未找到', 'Upload from editor' => '从编辑器上传' ]; diff --git a/application/manystore/model/ManystoreLog.php b/application/manystore/model/ManystoreLog.php index 33ef31f..165b5e0 100644 --- a/application/manystore/model/ManystoreLog.php +++ b/application/manystore/model/ManystoreLog.php @@ -34,8 +34,15 @@ class ManystoreLog extends Model $shop_id = 0; $store_id = 0; $username = __('Unknown'); + if(!defined('SHOP_ID')){ + define('SHOP_ID', 0); + } + if(!defined('STORE_ID')){ + define('STORE_ID',0 ); + } + if($auth->isLogin()){ - $shop_id = SHOP_ID; + $shop_id = SHOP_ID ; $store_id = STORE_ID; $username = $auth->username; } diff --git a/application/manystore/view/general/attachment/index.html b/application/manystore/view/general/attachment/index.html index 53cb2b8..318ce43 100644 --- a/application/manystore/view/general/attachment/index.html +++ b/application/manystore/view/general/attachment/index.html @@ -2,11 +2,20 @@
{:build_heading(null,FALSE)} -
@@ -16,6 +25,7 @@
{:build_toolbar('refresh,add,edit,del')} + {:__('Classify')}
+ + + diff --git a/application/manystore/view/general/attachment/select.html b/application/manystore/view/general/attachment/select.html index d4c83f5..d51f6fb 100644 --- a/application/manystore/view/general/attachment/select.html +++ b/application/manystore/view/general/attachment/select.html @@ -1,22 +1,33 @@ -{if !$Think.get.mimetype} + -{/if} +
- {if !$Think.get.mimetype} +
{:build_heading(null,FALSE)} -
    +
    • {:__('All')}
      • - {foreach name="mimetypeList" item="vo"} + {foreach name="categoryList" item="vo"}
    • {$vo}
      • {/foreach} + {if stripos(request()->get('mimetype'),'image/')===false} +
    • + {:__('Filter Type')} + +
      • + {/if}
- {/if} +
diff --git a/application/manystore/view/general/profile/index.html b/application/manystore/view/general/profile/index.html index f4eba85..5eec66b 100644 --- a/application/manystore/view/general/profile/index.html +++ b/application/manystore/view/general/profile/index.html @@ -302,12 +302,12 @@ class="form-control" size="50" name="shop[yyzz_images]" type="text" value="{$shop_info.yyzz_images}">
- - @@ -439,12 +439,12 @@
- - -