diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index 02b0ce46..a9b79bbc 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -41,7 +41,8 @@ class Attachment extends Backend ->order($sort, $order) ->limit($offset, $limit) ->select(); - $cdnurl = preg_replace("/\/(\w+)\.php$/i", '', $this->request->root()); + //$cdnurl = preg_replace("/\/(\w+)\.php$/i", '', $this->request->root()); + $cdnurl=$this->view->config['upload']['cdnurl']; foreach ($list as $k => &$v) { $v['fullurl'] = ($v['storage'] == 'local' ? $cdnurl : $this->view->config['upload']['cdnurl']) . $v['url']; diff --git a/application/admin/controller/posts/Archives.php b/application/admin/controller/posts/Archives.php index 44d2f2a6..973ca837 100644 --- a/application/admin/controller/posts/Archives.php +++ b/application/admin/controller/posts/Archives.php @@ -2,16 +2,13 @@ namespace app\admin\controller\posts; -use app\admin\model\Channel; use app\common\controller\Backend; - use think\Hook; use think\Session; use fast\Tree; use seven\Seven; use app\admin\model\PostsModelx as Modelx; use app\common\model\Counter; -use app\admin\model\Sites; /** * 文档管理 @@ -54,7 +51,7 @@ class Archives extends Backend { $where=$first_siteid=''; if ($this->auth->isSuperAdmin()) { - $sitelist = model('Sites')->all(); + $sitelist = \app\admin\model\Sites::all(); $this->view->assign('siteList', $sitelist); //记住下拉列表中第一个网站的ID,添加文章时,只读取对应的栏目等信息 diff --git a/application/admin/controller/posts/Channel.php b/application/admin/controller/posts/Channel.php index 669212c1..998979c9 100644 --- a/application/admin/controller/posts/Channel.php +++ b/application/admin/controller/posts/Channel.php @@ -6,7 +6,6 @@ use app\common\controller\Backend; use fast\Tree; use think\Hook; use seven\Seven; -use app\admin\model\Sites; use think\Session; /** @@ -34,7 +33,7 @@ class Channel extends Backend { $first_siteid=null; if ($this->auth->isSuperAdmin()){ - $sitelist = Sites::all(); + $sitelist = \app\admin\model\Sites::all();; $this->view->assign('siteList', $sitelist); if ($sitelist && $this->request->action()=='add') { $first_siteid = $sitelist[0]['id'] ; @@ -122,7 +121,7 @@ class Channel extends Backend return json($result); } if ($this->auth->isSuperAdmin()){ - $sitelist = Sites::all(); + $sitelist = \app\admin\model\Sites::all();; $this->view->assign('siteList', $sitelist); } $this->assignconfig('show_sitename', $this->auth->isSuperAdmin()); diff --git a/application/admin/controller/posts/Page.php b/application/admin/controller/posts/Page.php index ed8cb9c9..7eea04c8 100644 --- a/application/admin/controller/posts/Page.php +++ b/application/admin/controller/posts/Page.php @@ -6,7 +6,6 @@ use app\common\controller\Backend; use think\Hook; use seven\Seven; -use app\admin\model\Sites; /** * 单页管理 @@ -71,7 +70,7 @@ class Page extends Backend { $first_siteid=null; if ($this->auth->isSuperAdmin()){ - $sitelist = Sites::all(); + $sitelist = \app\admin\model\Sites::all();; $this->view->assign('siteList', $sitelist); $first_siteid=$sitelist?$sitelist[0]['id']:$first_siteid; } diff --git a/application/admin/model/Sites.php b/application/admin/model/Sites.php index 876153cc..043fdb25 100644 --- a/application/admin/model/Sites.php +++ b/application/admin/model/Sites.php @@ -1,16 +1,9 @@ - * @Since: 2018/2/5 15:37 - */ namespace app\admin\model; -use think\Model; - -class Sites extends Model +class Sites extends \app\common\model\Sites { } \ No newline at end of file diff --git a/application/common/model/Attachment.php b/application/common/model/Attachment.php index 79878c6d..43c487d7 100644 --- a/application/common/model/Attachment.php +++ b/application/common/model/Attachment.php @@ -16,6 +16,12 @@ class Attachment extends Model protected $type = [ ]; + protected function base(&$query){ + if(\think\Session::has("user_site_id")) { + $query->where(['site_id' =>\think\Session::get("user_site_id")]); + } + } + public function setUploadtimeAttr($value) { return strtotime($value); diff --git a/extend/seven/behavior/TakeAttach.php b/extend/seven/behavior/TakeAttach.php new file mode 100644 index 00000000..c6b88826 --- /dev/null +++ b/extend/seven/behavior/TakeAttach.php @@ -0,0 +1,33 @@ + + * @Since: 2018/2/9 19:58 + */ + +namespace seven\behavior; + + +class TakeAttach +{ + public function run(&$params) + { + //upload + if ($params instanceof \think\Model) { + if(\think\Session::has('user_site_id')) { + $params->site_id = \think\Session::get('user_site_id'); + $params->save(); + return; + } + } + //del + elseif ($params instanceof \think\Controller) { + //$attId = request()->param('ids'); + } + //unknow + else { + + } + } + +} \ No newline at end of file