mirror of https://gitee.com/karson/fastadmin.git
多站点附件
parent
88a27290a6
commit
1a7ec7f1de
|
|
@ -41,7 +41,8 @@ class Attachment extends Backend
|
||||||
->order($sort, $order)
|
->order($sort, $order)
|
||||||
->limit($offset, $limit)
|
->limit($offset, $limit)
|
||||||
->select();
|
->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)
|
foreach ($list as $k => &$v)
|
||||||
{
|
{
|
||||||
$v['fullurl'] = ($v['storage'] == 'local' ? $cdnurl : $this->view->config['upload']['cdnurl']) . $v['url'];
|
$v['fullurl'] = ($v['storage'] == 'local' ? $cdnurl : $this->view->config['upload']['cdnurl']) . $v['url'];
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,13 @@
|
||||||
|
|
||||||
namespace app\admin\controller\posts;
|
namespace app\admin\controller\posts;
|
||||||
|
|
||||||
use app\admin\model\Channel;
|
|
||||||
use app\common\controller\Backend;
|
use app\common\controller\Backend;
|
||||||
|
|
||||||
use think\Hook;
|
use think\Hook;
|
||||||
use think\Session;
|
use think\Session;
|
||||||
use fast\Tree;
|
use fast\Tree;
|
||||||
use seven\Seven;
|
use seven\Seven;
|
||||||
use app\admin\model\PostsModelx as Modelx;
|
use app\admin\model\PostsModelx as Modelx;
|
||||||
use app\common\model\Counter;
|
use app\common\model\Counter;
|
||||||
use app\admin\model\Sites;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文档管理
|
* 文档管理
|
||||||
|
|
@ -54,7 +51,7 @@ class Archives extends Backend
|
||||||
{
|
{
|
||||||
$where=$first_siteid='';
|
$where=$first_siteid='';
|
||||||
if ($this->auth->isSuperAdmin()) {
|
if ($this->auth->isSuperAdmin()) {
|
||||||
$sitelist = model('Sites')->all();
|
$sitelist = \app\admin\model\Sites::all();
|
||||||
$this->view->assign('siteList', $sitelist);
|
$this->view->assign('siteList', $sitelist);
|
||||||
|
|
||||||
//记住下拉列表中第一个网站的ID,添加文章时,只读取对应的栏目等信息
|
//记住下拉列表中第一个网站的ID,添加文章时,只读取对应的栏目等信息
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ use app\common\controller\Backend;
|
||||||
use fast\Tree;
|
use fast\Tree;
|
||||||
use think\Hook;
|
use think\Hook;
|
||||||
use seven\Seven;
|
use seven\Seven;
|
||||||
use app\admin\model\Sites;
|
|
||||||
use think\Session;
|
use think\Session;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -34,7 +33,7 @@ class Channel extends Backend
|
||||||
{
|
{
|
||||||
$first_siteid=null;
|
$first_siteid=null;
|
||||||
if ($this->auth->isSuperAdmin()){
|
if ($this->auth->isSuperAdmin()){
|
||||||
$sitelist = Sites::all();
|
$sitelist = \app\admin\model\Sites::all();;
|
||||||
$this->view->assign('siteList', $sitelist);
|
$this->view->assign('siteList', $sitelist);
|
||||||
if ($sitelist && $this->request->action()=='add') {
|
if ($sitelist && $this->request->action()=='add') {
|
||||||
$first_siteid = $sitelist[0]['id'] ;
|
$first_siteid = $sitelist[0]['id'] ;
|
||||||
|
|
@ -122,7 +121,7 @@ class Channel extends Backend
|
||||||
return json($result);
|
return json($result);
|
||||||
}
|
}
|
||||||
if ($this->auth->isSuperAdmin()){
|
if ($this->auth->isSuperAdmin()){
|
||||||
$sitelist = Sites::all();
|
$sitelist = \app\admin\model\Sites::all();;
|
||||||
$this->view->assign('siteList', $sitelist);
|
$this->view->assign('siteList', $sitelist);
|
||||||
}
|
}
|
||||||
$this->assignconfig('show_sitename', $this->auth->isSuperAdmin());
|
$this->assignconfig('show_sitename', $this->auth->isSuperAdmin());
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ use app\common\controller\Backend;
|
||||||
|
|
||||||
use think\Hook;
|
use think\Hook;
|
||||||
use seven\Seven;
|
use seven\Seven;
|
||||||
use app\admin\model\Sites;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单页管理
|
* 单页管理
|
||||||
|
|
@ -71,7 +70,7 @@ class Page extends Backend
|
||||||
{
|
{
|
||||||
$first_siteid=null;
|
$first_siteid=null;
|
||||||
if ($this->auth->isSuperAdmin()){
|
if ($this->auth->isSuperAdmin()){
|
||||||
$sitelist = Sites::all();
|
$sitelist = \app\admin\model\Sites::all();;
|
||||||
$this->view->assign('siteList', $sitelist);
|
$this->view->assign('siteList', $sitelist);
|
||||||
$first_siteid=$sitelist?$sitelist[0]['id']:$first_siteid;
|
$first_siteid=$sitelist?$sitelist[0]['id']:$first_siteid;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
|
||||||
* @desc: Created by PhpStorm.
|
|
||||||
* @Author: Dr.Xing <ezfwork@foxmail.com>
|
|
||||||
* @Since: 2018/2/5 15:37
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace app\admin\model;
|
namespace app\admin\model;
|
||||||
|
|
||||||
|
|
||||||
use think\Model;
|
class Sites extends \app\common\model\Sites
|
||||||
|
|
||||||
class Sites extends Model
|
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -16,6 +16,12 @@ class Attachment extends Model
|
||||||
protected $type = [
|
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)
|
public function setUploadtimeAttr($value)
|
||||||
{
|
{
|
||||||
return strtotime($value);
|
return strtotime($value);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @desc: 上传附件时,自动保存站点ID
|
||||||
|
* @Author: Dr.Xing <ezfwork@foxmail.com>
|
||||||
|
* @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 {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue