diff --git a/app/controller/admin/Ad.php b/app/controller/admin/Ad.php index 261a3f66..d7fa6da5 100644 --- a/app/controller/admin/Ad.php +++ b/app/controller/admin/Ad.php @@ -9,13 +9,12 @@ namespace app\controller\admin; use app\model\AdPlace; -use app\controller\Admin; /** * @title 广告管理 * @description 广告管理 */ -class Ad extends Admin { +class Ad extends Base { /** * @title 广告位管理 diff --git a/app/controller/admin/Addons.php b/app/controller/admin/Addons.php index 49cbc06a..77207caf 100644 --- a/app/controller/admin/Addons.php +++ b/app/controller/admin/Addons.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; use app\model\Addons as AddonsM; use app\model\Hooks; @@ -16,7 +15,7 @@ use app\model\Hooks; * @title 插件管理 * @description 插件管理 */ -class Addons extends Admin { +class Addons extends Base { /** * @title 插件列表 diff --git a/app/controller/admin/Attribute.php b/app/controller/admin/Attribute.php index 98de4b14..12ddfff1 100644 --- a/app/controller/admin/Attribute.php +++ b/app/controller/admin/Attribute.php @@ -8,13 +8,12 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; /** * @title 字段管理 * @description 字段管理 */ -class Attribute extends Admin { +class Attribute extends Base { //保存的Model句柄 protected $model; diff --git a/app/controller/Admin.php b/app/controller/admin/Base.php old mode 100755 new mode 100644 similarity index 94% rename from app/controller/Admin.php rename to app/controller/admin/Base.php index 65058f00..14b2f15c --- a/app/controller/Admin.php +++ b/app/controller/admin/Base.php @@ -6,15 +6,14 @@ // +---------------------------------------------------------------------- // | Author: molong // +---------------------------------------------------------------------- -namespace app\controller; +namespace app\controller\admin; use app\model\Menu; use think\facade\View; +use \app\model\Form; +use \app\Base as BaseC; -/** - * @title 后端公共模块 - */ -class Admin extends Base { +class Base extends BaseC { // 使用内置PHP模板引擎渲染模板输出 protected $tpl_config = [ @@ -90,7 +89,7 @@ class Admin extends Base { final protected function checkRule($rule, $type = AuthRule::rule_url, $mode = 'url') { static $Auth = null; if (!$Auth) { - $Auth = new \com\Auth(); + $Auth = new \sent\Auth(); } if (!$Auth->check($rule, session('user_auth.uid'), $type, $mode)) { return false; @@ -125,8 +124,8 @@ class Admin extends Base { * @author 朱亚杰 */ final protected function accessControl() { - $allow = \think\Config::get('allow_visit'); - $deny = \think\Config::get('deny_visit'); + $allow = \think\facade\Config::get('allow_visit'); + $deny = \think\facade\Config::get('deny_visit'); $check = strtolower($this->request->controller() . '/' . $this->request->action()); if (!empty($deny) && in_array_case($check, $deny)) { return false; //非超管禁止访问deny中的方法 @@ -191,7 +190,7 @@ class Admin extends Base { } protected function getContentMenu() { - $model = \think\Loader::model('Model'); + $model = \think\facade\Loader::model('Model'); $list = array(); $map = array( 'status' => array('gt', 0), @@ -202,10 +201,10 @@ class Admin extends Base { $models = AuthGroup::getAuthModels(session('user_auth.uid')); foreach ($list as $key => $value) { if (IS_ROOT || in_array($value['id'], $models)) { - if ('admin/content/index' == $this->request->path() && input('model_id') == $value['id']) { + if ('/admin/content/index' == $this->request->path() && input('model_id') == $value['id']) { $value['style'] = "active"; } - $value['url'] = "admin/content/index?model_id=" . $value['id']; + $value['url'] = "/admin/content/index?model_id=" . $value['id']; $value['title'] = $value['title'] . "管理"; $value['icon'] = $value['icon'] ? $value['icon'] : 'file'; $menu[] = $value; diff --git a/app/controller/admin/Category.php b/app/controller/admin/Category.php index 61187103..8db73e40 100644 --- a/app/controller/admin/Category.php +++ b/app/controller/admin/Category.php @@ -12,13 +12,12 @@ namespace app\controller\admin; use app\model\Category as CategoryM; use app\model\Attribute; use app\model\Model; -use app\controller\Admin; /** * @title 栏目管理 * @description 分类管理 */ -class Category extends Admin { +class Category extends Base { public function _initialize() { parent::_initialize(); diff --git a/app/controller/admin/Channel.php b/app/controller/admin/Channel.php index b2aabadb..b3683156 100644 --- a/app/controller/admin/Channel.php +++ b/app/controller/admin/Channel.php @@ -9,7 +9,6 @@ namespace app\controller\admin; -use app\controller\Admin; use app\model\Channel as ChannelM; use sent\tree\Tree; @@ -17,7 +16,7 @@ use sent\tree\Tree; * @title 频道管理 * @description 频道管理 */ -class Channel extends Admin { +class Channel extends Base { /** * @title 频道列表 diff --git a/app/controller/admin/Client.php b/app/controller/admin/Client.php index b93f329e..aa7ba594 100644 --- a/app/controller/admin/Client.php +++ b/app/controller/admin/Client.php @@ -10,12 +10,11 @@ namespace app\controller\admin; use app\model\Client as ClientM; -use app\controller\Admin; /** * @title 客户端管理 */ -class Client extends Admin { +class Client extends Base { /** * @title 客户端列表 diff --git a/app/controller/admin/Config.php b/app/controller/admin/Config.php index 33e3b7f5..a2cbcf5d 100644 --- a/app/controller/admin/Config.php +++ b/app/controller/admin/Config.php @@ -8,14 +8,13 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; use app\model\Config as ConfigM; use think\facade\Cache; /** * @title 配置管理 */ -class Config extends Admin { +class Config extends Base { public function _initialize() { parent::_initialize(); diff --git a/app/controller/admin/Content.php b/app/controller/admin/Content.php index ac42b266..df596a39 100644 --- a/app/controller/admin/Content.php +++ b/app/controller/admin/Content.php @@ -8,12 +8,11 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; /** * @title 内容管理 */ -class Content extends Admin { +class Content extends Base { public function _initialize() { parent::_initialize(); diff --git a/app/controller/admin/Database.php b/app/controller/admin/Database.php index b82c520c..6a3c368d 100644 --- a/app/controller/admin/Database.php +++ b/app/controller/admin/Database.php @@ -9,13 +9,12 @@ namespace app\controller\admin; -use app\controller\Admin; /** * @title 数据库管理 * @description 数据库管理 */ -class Database extends Admin { +class Database extends Base { /** * 数据库备份/还原列表 * @param String $type import-还原,export-备份 diff --git a/app/controller/admin/Form.php b/app/controller/admin/Form.php index 3ee4ad1f..ded68993 100644 --- a/app/controller/admin/Form.php +++ b/app/controller/admin/Form.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; use app\model\Form as FormM; use app\model\FormAttr; @@ -16,7 +15,7 @@ use app\model\FormAttr; * @title 自定义表单 * @description 自定义表单 */ -class Form extends Admin { +class Form extends Base { /** * @title 表单列表 diff --git a/app/controller/admin/Group.php b/app/controller/admin/Group.php index 58568260..61645062 100644 --- a/app/controller/admin/Group.php +++ b/app/controller/admin/Group.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; use app\model\AuthGroup; use app\model\AuthRule; @@ -16,7 +15,7 @@ use app\model\AuthRule; * @title 用户组管理 * @description 用户组管理 */ -class Group extends Admin { +class Group extends Base { /** * @title 用户组列表 diff --git a/app/controller/admin/Index.php b/app/controller/admin/Index.php index eaa268fc..8e98885f 100755 --- a/app/controller/admin/Index.php +++ b/app/controller/admin/Index.php @@ -8,14 +8,13 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; use app\model\Member; use think\facade\Session; /** * @title 后端公共模块 */ -class Index extends Admin { +class Index extends Base { /** * @title 后台首页 diff --git a/app/controller/admin/Link.php b/app/controller/admin/Link.php index fe77abbc..cac5272c 100644 --- a/app/controller/admin/Link.php +++ b/app/controller/admin/Link.php @@ -9,13 +9,12 @@ namespace app\controller\admin; use app\model\Link as LinkM; -use app\controller\Admin; /** * @title 友情链接 * @description 友情链接 */ -class Link extends Admin { +class Link extends Base { /** * @title 链接列表 diff --git a/app/controller/admin/Menu.php b/app/controller/admin/Menu.php index a8bbf5e0..fb5cc201 100644 --- a/app/controller/admin/Menu.php +++ b/app/controller/admin/Menu.php @@ -9,14 +9,13 @@ namespace app\controller\admin; use sent\tree\Tree; -use app\controller\Admin; use app\model\Menu as MenuM; use think\facade\Cache; /** * @title 菜单管理 */ -class Menu extends Admin { +class Menu extends Base { public function _initialize() { parent::_initialize(); diff --git a/app/controller/admin/Model.php b/app/controller/admin/Model.php index 98c67f51..e2316938 100644 --- a/app/controller/admin/Model.php +++ b/app/controller/admin/Model.php @@ -8,13 +8,12 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; use app\model\Model as ModelM; /** * @title 模型管理 */ -class Model extends Admin { +class Model extends Base { public function _initialize() { parent::_initialize(); diff --git a/app/controller/admin/Seo.php b/app/controller/admin/Seo.php index 8eacd158..2d62e8c3 100644 --- a/app/controller/admin/Seo.php +++ b/app/controller/admin/Seo.php @@ -8,14 +8,13 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; use app\model\SeoRule; use app\model\Rewrite; /** * @title SEO管理 */ -class Seo extends Admin { +class Seo extends Base { /** * @title SEO列表 diff --git a/app/controller/admin/Upload.php b/app/controller/admin/Upload.php index c44a0476..503dda54 100644 --- a/app/controller/admin/Upload.php +++ b/app/controller/admin/Upload.php @@ -8,9 +8,8 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; -use app\controller\Admin; -class Upload extends Admin { +class Upload extends Base { public function _empty() { $controller = controller('common/Upload'); diff --git a/app/controller/admin/User.php b/app/controller/admin/User.php index 273f9329..c1aa7f80 100644 --- a/app/controller/admin/User.php +++ b/app/controller/admin/User.php @@ -9,12 +9,11 @@ namespace app\controller\admin; -use app\controller\Admin; use app\model\Member; /** * @title 用户管理 */ -class User extends Admin { +class User extends Base { /** * @title 用户列表 diff --git a/app/controller/admin/Wechat.php b/app/controller/admin/Wechat.php index 1265d7d7..8ba961ac 100644 --- a/app/controller/admin/Wechat.php +++ b/app/controller/admin/Wechat.php @@ -9,14 +9,13 @@ namespace app\controller\admin; -use app\controller\Admin; use app\model\Wechat as WechatM; /** * @title 微信公众号 * @description 微信公众号管理 */ -class Wechat extends Admin { +class Wechat extends Base { /** * @title 公众号列表 diff --git a/app/controller/api/Api.php b/app/controller/api/Api.php index c0bdeed6..4523729c 100644 --- a/app/controller/api/Api.php +++ b/app/controller/api/Api.php @@ -8,12 +8,10 @@ // +---------------------------------------------------------------------- namespace app\controller\api; -use app\controller\Api as ApiBase; - /** * @title 接口功能 */ -class Api extends ApiBase { +class Api extends Base { public $filter_method = ['__construct']; diff --git a/app/controller/Api.php b/app/controller/api/Base.php similarity index 95% rename from app/controller/Api.php rename to app/controller/api/Base.php index c82605d8..2ec29afc 100644 --- a/app/controller/Api.php +++ b/app/controller/api/Base.php @@ -6,9 +6,9 @@ // +---------------------------------------------------------------------- // | Author: molong // +---------------------------------------------------------------------- -namespace app\controller; +namespace app\controller\api; -class Api extends Base { +class Base { public $middleware = [ '\app\http\middleware\Validate', diff --git a/app/controller/api/Config.php b/app/controller/api/Config.php index 50598e35..900587ea 100644 --- a/app/controller/api/Config.php +++ b/app/controller/api/Config.php @@ -8,13 +8,12 @@ // +---------------------------------------------------------------------- namespace app\controller\api; -use app\controller\Api; use app\model\Config as ConfigM; /** * @title 基础功能 */ -class Config extends Api { +class Config extends Base { /** * @title 配置数据 diff --git a/app/controller/api/Department.php b/app/controller/api/Department.php index eaed9a7e..364fc81c 100644 --- a/app/controller/api/Department.php +++ b/app/controller/api/Department.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- namespace app\controller\api; -use app\controller\Api; use app\model\Department as DepartmentM; use app\model\Role; use sent\tree\Tree; @@ -16,7 +15,7 @@ use sent\tree\Tree; /** * @title 部门管理 */ -class Department extends Api { +class Department extends Base { /** * @title 部门列表 diff --git a/app/controller/api/User.php b/app/controller/api/User.php index 869a1488..91be2c7e 100644 --- a/app/controller/api/User.php +++ b/app/controller/api/User.php @@ -8,7 +8,6 @@ // +---------------------------------------------------------------------- namespace app\controller\api; -use app\controller\Api; use app\model\Member; use app\model\MemberLog; use app\model\Role; @@ -18,7 +17,7 @@ use xin\helper\Str; /** * @title 用户管理 */ -class User extends Api { +class User extends Base { /** * @title 用户列表 diff --git a/app/controller/front/Base.php b/app/controller/front/Base.php new file mode 100644 index 00000000..8987f7aa --- /dev/null +++ b/app/controller/front/Base.php @@ -0,0 +1,15 @@ + +// +---------------------------------------------------------------------- +namespace app\controller; + +use \app\Base as BaseC; + +class Base extends BaseC { + +} \ No newline at end of file diff --git a/app/controller/Front.php b/app/controller/front/Index.php similarity index 96% rename from app/controller/Front.php rename to app/controller/front/Index.php index 6b07df75..2a46fd19 100644 --- a/app/controller/Front.php +++ b/app/controller/front/Index.php @@ -6,12 +6,13 @@ // +---------------------------------------------------------------------- // | Author: molong // +---------------------------------------------------------------------- -namespace app\controller; +namespace app\controller\front; use \app\model\Form; class Front extends Base { + public function index() { return $this->fetch(); } diff --git a/app/http/middleware/Validate.php b/app/http/middleware/Validate.php index 9088a93c..253d3154 100755 --- a/app/http/middleware/Validate.php +++ b/app/http/middleware/Validate.php @@ -21,11 +21,11 @@ class Validate { //获取当前参数 $params = $request->param(); //获取访问控制器 - $controller = strtr($request->controller(), '.', '\\'); + $controller = explode(".", $request->controller()); //获取操作名,用于验证场景scene - $scene = $request->action(); - $validate = "app\\http\\validate\\" . $controller; + $scene = $controller[0] . ucfirst($request->action()); + $validate = "app\\http\\validate\\" . strtolower($controller[1]); //仅当验证器存在时 进行校验 if (class_exists($validate) && $request->isPost()) { $v = new $validate; diff --git a/app/http/validate/admin/Category.php b/app/http/validate/Category.php similarity index 100% rename from app/http/validate/admin/Category.php rename to app/http/validate/Category.php diff --git a/app/http/validate/admin/Channel.php b/app/http/validate/Channel.php similarity index 100% rename from app/http/validate/admin/Channel.php rename to app/http/validate/Channel.php diff --git a/app/http/validate/admin/Config.php b/app/http/validate/Config.php similarity index 100% rename from app/http/validate/admin/Config.php rename to app/http/validate/Config.php diff --git a/app/http/validate/admin/Menu.php b/app/http/validate/Menu.php similarity index 100% rename from app/http/validate/admin/Menu.php rename to app/http/validate/Menu.php diff --git a/app/model/Model.php b/app/model/Model.php index 9f9c24f2..8fec4f8d 100644 --- a/app/model/Model.php +++ b/app/model/Model.php @@ -58,14 +58,17 @@ class Model extends \think\Model{ if (isset($data['attribute_sort']) && $data['attribute_sort']) { $attribute_sort = json_decode($data['attribute_sort'], true); + $attr = []; if (!empty($attribute_sort)) { foreach ($attribute_sort as $key => $value) { - db('Attribute')->where('id', 'IN', $value)->setField('group_id', $key); foreach ($value as $k => $v) { - db('Attribute')->where('id', $v)->setField('sort', $k); + $attr[] = ['id' => $v, 'group_id' => $key, 'sort' => $k]; } } } + if (!empty($attr)) { + (new Attribute())->saveAll($attr); + } } return true; }