更新目录结构

app/common.php

@@ -7,7 +7,7 @@
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
 // 应用公共文件
-use app\model\Member;
+use app\model\auth\Member;
 use think\facade\Request;
 use think\facade\Session;
 use think\facade\Config;

app/controller/Base.php

@@ -8,9 +8,9 @@
 // +----------------------------------------------------------------------
 namespace app\controller;
 
-use app\model\Config;
+use app\model\system\Config;
-use app\model\Hooks;
+use app\model\addons\Hooks;
-use app\model\SeoRule;
+use app\model\system\SeoRule;
 use think\App;
 use think\exception\ValidateException;
 use think\facade\Cache;
@@ -76,7 +76,7 @@ class Base {
 		}
 		$hooks = Cache::get('sentcms_hooks');
 		if (!$hooks) {
-			$hooks = Hooks::where('status', 1)->column('addons', 'name');
+			$hooks = Hooks::where('status', 1)->where('addons', '<>', '')->column('addons', 'name');
 			foreach ($hooks as $key => $values) {
 				if (is_string($values)) {
 					$values = explode(',', $values);
@@ -247,7 +247,7 @@ class Base {
 		$config = [];
 		$addons = $this->request->param('addon');
 		$addon = get_addons_instance($addons)->getConfig();
-		$config = \app\model\Addons::where('name', $addons)->value('config');
+		$config = \app\model\addons\Addons::where('name', $addons)->value('config');
 
 		return $config ? json_decode($config, true) : $addon;
 	}

app/controller/admin/Ad.php

@@ -8,8 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\AdPlace;
+use app\services\Adservice;
-use app\model\Ad as AdModel;
 
 /**
  * @title 广告管理
@@ -20,11 +19,9 @@ class Ad extends Base {
 	/**
 	 * @title 广告位管理
 	 */
-	public function index() {
+	public function index(Adservice $service) {
-		$map = [];
-		$order = "id desc";
 
-		$list = AdPlace::where($map)->order($order)->paginate($this->request->pageConfig);
+		$list = $service->getAdPlaceList($this->request);
 
 		$this->data = array(
 			'list' => $list,
@@ -47,7 +44,7 @@ class Ad extends Base {
 			}
 		} else {
 			$this->data = array(
-				'keyList' => AdPlace::$keyList,
+				'keyList' => \app\model\ads\AdPlace::$keyList,
 			);
 			return $this->fetch('admin/public/edit');
 		}
@@ -72,7 +69,7 @@ class Ad extends Base {
 			}
 			$this->data = array(
 				'info' => $info,
-				'keyList' => AdPlace::$keyList,
+				'keyList' => \app\model\ads\AdPlace::$keyList,
 			);
 			return $this->fetch('admin/public/edit');
 		}
@@ -129,7 +126,7 @@ class Ad extends Base {
 			$info['place_id'] = $id;
 			$this->data = array(
 				'info' => $info,
-				'keyList' => AdModel::$keyList,
+				'keyList' => \app\model\ads\Ad::$keyList,
 			);
 			return $this->fetch('admin/public/edit');
 		}
@@ -155,7 +152,7 @@ class Ad extends Base {
 			}
 			$this->data = array(
 				'info' => $info,
-				'keyList' => AdModel::$keyList,
+				'keyList' => \app\model\ads\Ad::$keyList,
 			);
 			return $this->fetch('admin/public/edit');
 		}

app/controller/admin/Addons.php

@@ -8,8 +8,8 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Addons as AddonsM;
+use app\model\addons\Addons as AddonsM;
-use app\model\Hooks;
+use app\model\addons\Hooks;
 use think\facade\Cache;
 use think\facade\Config;
 

app/controller/admin/Attribute.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Attribute as AttributeModel;
+use app\model\module\Attribute as AttributeModel;
 
 /**
  * @title 字段管理

app/controller/admin/Base.php

@@ -8,10 +8,10 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Addons;
+use app\model\addons\Addons;
-use app\model\AuthGroup;
+use app\model\auth\AuthGroup;
-use app\model\Menu;
+use app\model\auth\Menu;
-use app\model\Model;
+use app\model\module\Model;
 use think\facade\View;
 use think\facade\Config;
 
@@ -36,12 +36,12 @@ class Base extends \app\controller\Base {
 	];
 
 	protected function initialize() {
-		$url = str_replace(".", "/", strtolower($this->request->controller())) . '/' . $this->request->action();
+		$url = $this->request->rule()->getRule();
-		if (!is_login() and !in_array($url, array('admin/index/login', 'admin/index/logout', 'admin/index/verify'))) {
+		if (!is_login() and !in_array($url, array('admin/login', 'admin/logout', 'admin/index/verify'))) {
-			$this->redirect('/admin/index/login');
+			$this->redirect('/admin/login');
 		}
 
-		if (!in_array($url, array('admin/index/login', 'admin/index/logout', 'admin/index/verify'))) {
+		if (!in_array($url, array('admin/login', 'admin/logout', 'admin/index/verify'))) {
 
 			// 是否是超级管理员
 			define('IS_ROOT', is_administrator());

app/controller/admin/Category.php

@@ -9,10 +9,10 @@
 
 namespace app\controller\admin;
 
-use app\model\Category as CategoryM;
+use app\model\module\Category as CategoryM;
-use app\model\Attribute;
+use app\model\module\Attribute;
-use app\model\Model;
+use app\model\module\Model;
-use app\model\Channel;
+use app\model\system\Channel;
 
 /**
  * @title 栏目管理

app/controller/admin/Channel.php

@@ -9,7 +9,7 @@
 
 namespace app\controller\admin;
 
-use app\model\Channel as ChannelM;
+use app\model\system\Channel as ChannelM;
 use sent\tree\Tree;
 
 /**

app/controller/admin/Client.php

@@ -9,7 +9,7 @@
 
 namespace app\controller\admin;
 
-use app\model\Client as ClientM;
+use app\model\client\Client as ClientM;
 
 /**
  * @title 客户端管理

app/controller/admin/Config.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Config as ConfigM;
+use app\services\system\ConfigService;
 use think\facade\Cache;
 
 /**
@@ -16,34 +16,13 @@ use think\facade\Cache;
  */
 class Config extends Base {
 
-	public function _initialize() {
-		parent::_initialize();
-		$this->model = new ConfigM();
-	}
-
 	/**
 	 * @title 配置管理
 	 * @author 麦当苗儿 <zuojiazi@vip.qq.com>
 	 */
-	public function index(ConfigM $config) {
+	public function index(ConfigService $config) {
-		$param = $this->request->param();
+		$list = $config->getConfigList($this->request);
 
-
-		$group = input('group', 0, 'trim');
-		$name = input('name', '', 'trim');
-		/* 查询条件初始化 */
-		$map = array('status' => 1);
-		if ($group) {
-			$map['group'] = $group;
-		}
-
-		if ($name) {
-			$map['name'] = array('like', '%' . $name . '%');
-		}
-
-		$list = $config->where($map)->order('id desc')->paginate(25, false, array(
-			'query' => $this->request->param(),
-		));
 		// 记录当前列表页的cookie
 		Cookie('__forward__', $_SERVER['REQUEST_URI']);
 
@@ -51,7 +30,7 @@ class Config extends Base {
 			'group' => config('config_group_list'),
 			'config_type' => config('config_config_list'),
 			'page' => $list->render(),
-			'group_id' => $group,
+			'group_id' => $this->request->param('group', 0),
 			'list' => $list,
 		);
 
@@ -61,22 +40,19 @@ class Config extends Base {
 	/**
 	 * @title 信息配置
 	 */
-	public function group(ConfigM $config, $id = 1) {
+	public function group(ConfigService $config) {
 		if ($this->request->isPost()) {
-			$data = $this->request->post();
+			try {
-
+				$config->updateConfig($this->request);
-			foreach ($data['config'] as $key => $value) {
+				return $this->success("更新成功！");
-				ConfigM::update(['value' => $value], ['name' => $key]);
+			} catch (\think\Exception $e) {
+				return $this->error($e->getMessage());
 			}
-			//清除db_config_data缓存
-			Cache::pull('system_config_data');
-			return $this->success("更新成功！");
 		} else {
-			$list = $config->where(array('status' => 1, 'group' => $id))->field('id,name,title,extra,value,remark,type')->order('sort')->select();
+			$this->data = [
-			if ($list) {
+				'list' => $config->getConfigByGroup($this->request),
-				$this->data['list'] = $list;
+				'id' => $this->request->param('id', 1)
-			}
+			];
-			$this->data['id'] = $id;
 			return $this->fetch();
 		}
 	}
@@ -85,19 +61,14 @@ class Config extends Base {
 	 * @title 新增配置
 	 * @author 麦当苗儿 <zuojiazi@vip.qq.com>
 	 */
-	public function add(ConfigM $config) {
+	public function add(ConfigService $config) {
 		if ($this->request->isPost()) {
-			$data = $this->request->post();
+			try {
-			if ($data) {
+				$config->createConfig($this->request);
-				$result = ConfigM::create($data);
+
-				if (false !== $result) {
+				return $this->success('添加成功！', url('/admin/config/index'));
-					Cache::pull('system_config_data');
+			} catch (\think\Exception $e) {
-					return $this->success('新增成功', url('/admin/config/index'));
+				return $this->error($e->getMessage());
-				} else {
-					return $this->error('新增失败');
-				}
-			} else {
-				return $this->error('无添加数据！');
 			}
 		} else {
 			$this->data['info'] = [];
@@ -109,70 +80,38 @@ class Config extends Base {
 	 * @title 编辑配置
 	 * @author 麦当苗儿 <zuojiazi@vip.qq.com>
 	 */
-	public function edit($id = 0) {
+	public function edit(ConfigService $config) {
 		if ($this->request->isPost()) {
-			$data = $this->request->post();
+			try {
-			if ($data) {
+				$config->editConfig($this->request);
-				$result = ConfigM::update($data, array('id' => $data['id']));
+				return $this->success("修改成功！", url('/admin/config/index'));
-				if (false !== $result) {
+			} catch (\think\Exception $e) {
-					Cache::pull('system_config_data');
+				return $this->error($e->getMessage());
-					return $this->success('更新成功', Cookie('__forward__'));
-				} else {
-					return $this->error('更新失败！');
-				}
-			} else {
-				return $this->error('无更新数据！');
 			}
 		} else {
-			$info = array();
+			$this->data = ['info' => $config->getConfigDetail($this->request)];
-			/* 获取数据 */
-			$info = ConfigM::find($id);
-
-			if (false === $info) {
-				return $this->error('获取配置信息错误');
-			}
-			$this->data = ['info' => $info];
 			return $this->fetch();
 		}
 	}
-	/**
-	 * @title 批量保存配置
-	 * @author 麦当苗儿 <zuojiazi@vip.qq.com>
-	 */
-	public function save($config) {
-		if ($config && is_array($config)) {
-			foreach ($config as $name => $value) {
-				(new ConfigM())->save(['value' => $value], ['name' => $name]);
-			}
-		}
-		Cache::pull('system_config_data');
-		return $this->success('保存成功！');
-	}
 
 	/**
 	 * @title 删除配置
 	 * @author 麦当苗儿 <zuojiazi@vip.qq.com>
 	 */
-	public function del() {
+	public function del(ConfigService $config) {
-		$id = $this->request->param('id');
+		try {
-
+			$config->deleteConfig($this->request);
-		if (empty($id)) {
-			return $this->error('请选择要操作的数据!');
-		}
-
-		$result = ConfigM::find($id)->delete();
-		if (false !== $result) {
 			Cache::pull('system_config_data');
 			return $this->success('删除成功');
-		} else {
+		} catch (\think\Exception $e) {
-			return $this->error('删除失败！');
+			return $this->error($e->getMessage());
 		}
 	}
 
 	/**
 	 * @title 主题选择
 	 */
-	public function themes(ConfigM $config) {
+	public function themes(ConfigService $config) {
 		$list = $config->getThemesList($this->request);
 		$config = Cache::get('system_config_data');
 		

app/controller/admin/Content.php

@@ -10,8 +10,8 @@
 namespace app\controller\admin;
 
 use think\facade\Db;
-use app\model\Model;
+use app\model\module\Model;
-use app\model\Attribute;
+use app\model\module\Attribute;
 
 /**
  * @title 内容管理

app/controller/admin/Form.php

@@ -9,8 +9,8 @@
 namespace app\controller\admin;
 
 use think\facade\Db;
-use app\model\Form as FormM;
+use app\model\form\Form as FormM;
-use app\model\FormAttr;
+use app\model\form\FormAttr;
 
 /**
  * @title 自定义表单

app/controller/admin/Group.php

@@ -9,10 +9,10 @@
 namespace app\controller\admin;
 
 use think\facade\Db;
-use app\model\AuthGroup;
+use app\model\auth\AuthGroup;
-use app\model\AuthGroupAccess;
+use app\model\auth\AuthGroupAccess;
-use app\model\AuthRule;
+use app\model\auth\AuthRule;
-use app\model\Model;
+use app\model\module\Model;
 
 /**
  * @title 用户组管理

app/controller/admin/Index.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Member;
+use app\model\auth\Member;
 use think\facade\Session;
 
 /**

app/controller/admin/Link.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Link as LinkM;
+use app\model\link\Link as LinkM;
 
 /**
  * @title 友情链接

app/controller/admin/Menu.php

@@ -9,7 +9,7 @@
 namespace app\controller\admin;
 
 use sent\tree\Tree;
-use app\model\Menu as MenuM;
+use app\model\auth\Menu as MenuM;
 use think\facade\Cache;
 
 /**

app/controller/admin/Model.php

@@ -8,8 +8,8 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Attribute;
+use app\model\module\Attribute;
-use app\model\Model as ModelM;
+use app\model\module\Model as ModelM;
 use think\facade\Cache;
 
 /**

app/controller/admin/Seo.php

@@ -8,8 +8,8 @@
 // +----------------------------------------------------------------------
 namespace app\controller\admin;
 
-use app\model\Rewrite;
+use app\model\system\Rewrite;
-use app\model\SeoRule;
+use app\model\system\SeoRule;
 use think\facade\Cache;
 
 /**

app/controller/admin/User.php

@@ -10,9 +10,9 @@
 namespace app\controller\admin;
 
 use think\facade\Cache;
-use app\model\Member;
+use app\model\auth\Member;
-use app\model\AuthGroup;
+use app\model\auth\AuthGroup;
-use app\model\AuthGroupAccess;
+use app\model\auth\AuthGroupAccess;
 
 /**
  * @title 用户管理

app/controller/admin/Wechat.php

@@ -9,8 +9,8 @@
 
 namespace app\controller\admin;
 
-use app\model\Wechat as WechatM;
+use app\model\wechat\Wechat as WechatM;
-use app\model\WechatPay;
+use app\model\wechat\WechatPay;
 
 /**
  * @title 微信模块

app/controller/api/Attach.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api;
 
-use app\model\Attach as AttachModel;
+use app\model\system\Attach as AttachModel;
 
 /**
  * @title 附件管理

app/controller/api/Config.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api;
 
-use app\model\Config as ConfigM;
+use app\model\system\Config as ConfigM;
 
 /**
  * @title 基础功能

app/controller/api/Content.php

@@ -9,9 +9,9 @@
 namespace app\controller\api;
 
 use think\facade\Db;
-use app\model\Category;
+use app\model\module\Category;
-use app\model\Model;
+use app\model\module\Model;
-use app\model\Attribute;
+use app\model\module\Attribute;
 
 /**
  * @title 内容管理

app/controller/api/Department.php

@@ -8,8 +8,8 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api;
 
-use app\model\Department as DepartmentM;
+use app\model\auth\Department as DepartmentM;
-use app\model\Role;
+use app\model\auth\Role;
 use sent\tree\Tree;
 
 /**

app/controller/api/Form.php

@@ -9,8 +9,8 @@
 namespace app\controller\api;
 
 use think\facade\Db;
-use \app\model\Form as FormModel;
+use \app\model\form\Form as FormModel;
-use \app\model\FormAttr;
+use \app\model\form\FormAttr;
 
 class Form extends Base {
 

app/controller/api/Login.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api;
 
-use app\model\Member;
+use app\model\auth\Member;
 use think\facade\Event;
 use think\Request;
 

app/controller/api/User.php

@@ -8,10 +8,10 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api;
 
-use app\model\Member;
+use app\model\auth\Member;
-use app\model\MemberLog;
+use app\model\auth\MemberLog;
-use app\model\Role;
+use app\model\auth\Role;
-use app\model\RoleAccess;
+use app\model\auth\RoleAccess;
 use xin\helper\Str;
 
 /**

app/controller/front/Content.php

@@ -9,9 +9,9 @@
 namespace app\controller\front;
 
 use think\facade\Db;
-use \app\model\Category;
+use \app\model\module\Category;
-use \app\model\Model;
+use \app\model\module\Model;
-use \app\model\Content as ContentModel;
+use \app\model\module\Content as ContentModel;
 
 class Content extends Base {
 

app/controller/front/Form.php

@@ -9,8 +9,8 @@
 namespace app\controller\front;
 
 use think\facade\Db;
-use \app\model\Form as FormModel;
+use \app\model\form\Form as FormModel;
-use \app\model\FormAttr;
+use \app\model\form\FormAttr;
 
 class Form extends Base {
 

app/controller/user/Base.php

@@ -8,8 +8,8 @@
 // +----------------------------------------------------------------------
 namespace app\controller\user;
 
-use app\model\Form;
+use app\model\form\Form;
-use app\model\Model;
+use app\model\module\Model;
 use think\facade\Cache;
 use think\facade\Config;
 use think\facade\View;

app/controller/user/Content.php

@@ -9,8 +9,8 @@
 namespace app\controller\user;
 
 use think\facade\Db;
-use app\model\Model;
+use app\model\module\Model;
-use app\model\Attribute;
+use app\model\module\Attribute;
 
 /**
  * @title 内容模块

app/controller/user/Form.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\user;
 
-use app\model\Member;
+use app\model\auth\Member;
 
 /**
  * @title 表单管理

app/controller/user/Index.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\user;
 
-use app\model\Member;
+use app\model\auth\Member;
 use think\facade\Session;
 
 /**

app/controller/user/User.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\controller\user;
 
-use app\model\Member;
+use app\model\auth\Member;
 
 /**
  * @title 用户管理

app/http/middleware/Admin.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 namespace app\http\middleware;
 
-use app\model\MemberLog;
+use app\model\auth\MemberLog;
 use think\facade\Session;
 
 /**

app/http/middleware/Validate.php

@@ -21,15 +21,11 @@ class Validate {
 		//获取当前参数
 		$params = $request->param();
 		//获取访问控制器
-		if(\strripos($request->controller(), ".")){
+		$controller = strtr($request->controller(), '.', '\\');
-			$controller = explode(".", $request->controller());
-		}else{
-			$controller = ['', ucfirst($request->controller())];
-		}
 
 		//获取操作名,用于验证场景scene
-		$scene = strtolower($controller[0]) . $request->action();
+		$scene = $request->action();
-		$validate = "app\\http\\validate\\" . ucfirst($controller[1]);
+		$validate = "\\app\\http\\validate\\" . $controller;
 		//仅当验证器存在时 进行校验
 		if (class_exists($validate) && $request->isPost()) {
 			$v = new $validate;

app/http/validate/admin/Ad.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 
@@ -26,7 +26,7 @@ class Ad extends Validate{
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['title', 'name'],
+		'add'  =>  ['title', 'name'],
-		'adminedit'  =>  ['title', 'name'],
+		'edit'  =>  ['title', 'name'],
 	]; 
 }

app/http/validate/admin/Category.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 
@@ -25,7 +25,7 @@ class Category extends Validate{
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['title', 'model_id'],
+		'add'  =>  ['title', 'model_id'],
-		'adminedit'  =>  ['title', 'model_id'],
+		'edit'  =>  ['title', 'model_id'],
 	]; 
 }

app/http/validate/admin/Channel.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 
@@ -23,7 +23,7 @@ class Channel extends Validate{
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['title'],
+		'add'  =>  ['title'],
-		'adminedit'  =>  ['title'],
+		'edit'  =>  ['title'],
 	]; 
 }

app/http/validate/admin/Config.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 
@@ -15,22 +15,23 @@ use think\Validate;
  */
 class Config extends Validate{
 	protected $rule = [
-		'name'  =>  'require|unique:config',
+		'name'  =>  'require|unique:config|alphaDash',
 		'title'  =>  'require',
 	];
 
 	protected $message  =   [
 		'name.require' => '配置标识必须',
 		'name.unique' => '配置标识已存在',
+		'name.alphaDash' => '配置标识格式错误',
 		'title.require' => '配置标题必须',
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['title', 'name'],
+		'add'  =>  ['title', 'name'],
 	];
 
 	// edit 验证场景定义
-	public function sceneAdminedit() {
+	public function sceneEdit() {
 		return $this->only([['title', 'name']])
 			->remove('name', 'unique');
 	} 

app/http/validate/admin/Content.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 use think\facade\Request;
@@ -50,8 +50,8 @@ class Content extends Validate{
 		$this->message = $message;
 
 		$this->scene = [
-			'adminadd' => $field,
+			'add' => $field,
-			'adminedit' => $field,
+			'edit' => $field,
 			'useradd' => $field,
 			'useredit' => $field,
 		];

app/http/validate/admin/Link.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 
@@ -26,7 +26,7 @@ class Link extends Validate{
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['title', 'url'],
+		'add'  =>  ['title', 'url'],
-		'adminedit'  =>  ['title', 'url'],
+		'edit'  =>  ['title', 'url'],
 	]; 
 }

app/http/validate/admin/Menu.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 
@@ -23,7 +23,7 @@ class Menu extends Validate{
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['title'],
+		'add'  =>  ['title'],
-		'adminedit'  =>  ['title'],
+		'edit'  =>  ['title'],
 	]; 
 }

app/http/validate/admin/Model.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 
@@ -27,7 +27,7 @@ class Model extends Validate{
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['title', 'name'],
+		'add'  =>  ['title', 'name'],
-		'adminedit'  =>  ['title'],
+		'edit'  =>  ['title'],
 	]; 
 }

app/http/validate/admin/User.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\admin;
 
 use think\Validate;
 use app\model\Member;
@@ -39,9 +39,9 @@ class User extends Validate{
 	];
 
 	protected $scene = [
-		'adminadd'  =>  ['username', 'email', 'password', 'repassword'],
+		'add'  =>  ['username', 'email', 'password', 'repassword'],
-		'adminedit'  =>  ['username', 'email'],
+		'edit'  =>  ['username', 'email'],
-		'admineditpwd'    => ['uid', 'password', 'repassword', 'oldpassword']
+		'editpwd'    => ['uid', 'password', 'repassword', 'oldpassword']
 	];
 
 	protected function checkOldpaswd($value, $rule, $data){

app/http/validate/api/Login.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\http\validate;
+namespace app\http\validate\api;
 
 use think\Validate;
 use app\model\Member;
@@ -28,6 +28,6 @@ class Login extends Validate{
 	];
 
 	protected $scene = [
-		'apiindex'  =>  ['username', 'password'],
+		'index'  =>  ['username', 'password'],
 	];
 }

app/model/ActionLog.php

@@ -1,21 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
-// +----------------------------------------------------------------------
-
-namespace app\model;
-
-/**
- * 分类模型
- */
-class ActionLog {
-
-	protected function getModelIdAttr($value, $data) {
-		$value = get_document_field($data['model'], "name", "id");
-		return $value ? $value : 0;
-	}
-}

app/model/addons/Addons.php

@@ -1,13 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\addons;
-namespace app\model;
 
 use app\facade\Cache;
 

app/model/addons/Hooks.php

@@ -1,13 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\addons;
-namespace app\model;
 
 /**
  * 分类模型

app/model/ads/Ad.php

@@ -1,13 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\ads;
-namespace app\model;
 
 /**
  * 分类模型

app/model/ads/AdPlace.php

@@ -1,13 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\ads;
-namespace app\model;
 
 /**
  * 分类模型

app/model/auth/AuthGroup.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\auth;
-namespace app\model;
 
 use think\Model;
 

app/model/auth/AuthGroupAccess.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\auth;
-namespace app\model;
 
 use think\Model;
 

app/model/auth/AuthRule.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\auth;
-namespace app\model;
 
 use think\Model;
 

app/model/auth/Department.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\auth;
 
 use think\Model;
 

app/model/auth/Member.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\auth;
 
 use sent\jwt\facade\JWTAuth;
 use think\Model;

app/model/auth/MemberLog.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\auth;
-namespace app\model;
 
 use think\Model;
 use xin\helper\Server;

app/model/auth/Menu.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\auth;
-namespace app\model;
 
 /**
  * 菜单模型类

app/model/auth/Role.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\auth;
-namespace app\model;
 
 /**
  * 角色模型

app/model/auth/RoleAccess.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\auth;
-namespace app\model;
 
 /**
  * 角色模型

app/model/client/Client.php

@@ -1,13 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\client;
-namespace app\model;
 
 /**
  * Client模型

app/model/form/DiyForm.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\form;
-namespace app\model;
 
 /**
  * 自定义表单模型

app/model/form/Form.php

@@ -1,13 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\form;
-namespace app\model;
 
 use think\facade\Config;
 

app/model/form/FormAttr.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\form;
 
 use think\facade\Cache;
 use think\facade\Config;

app/model/link/Link.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\link;
 
 /**
  * 友情链接类

app/model/module/Attribute.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\module;
 
 use think\facade\Config;
 use think\facade\Db;

app/model/module/Category.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\module;
-namespace app\model;
 
 /**
  * 设置模型

app/model/module/Document.php

@@ -1,12 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\module;
 
 use think\facade\Db;
 

app/model/module/Model.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\module;
-namespace app\model;
 
 /**
  * 设置模型

app/model/system/Attach.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\system;
 
 /**
  * 附件模型

app/model/system/Channel.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\system;
-namespace app\model;
 
 /**
  * 设置模型

app/model/system/Config.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\system;
 
 use think\facade\Cache;
 use think\Model;
@@ -82,35 +82,4 @@ class Config extends Model {
 		}
 		return $data;
 	}
-
-	public function getThemesList($request){
-		return [
-			'pc'  => $this->getList('pc'),
-			'mobile' => $this->getList('mobile')
-		];
-	}
-
-	protected function getList($type){
-		$tempPath = app()->getRootPath() . 'public' . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR;
-
-		$file  = opendir($tempPath);
-		$list = [];
-		while (false !== ($filename = readdir($file))) {
-			if (!in_array($filename, array('.', '..'))) {
-				$files = $tempPath . $filename . '/info.php';
-				if (is_file($files)) {
-					$info = include($files);
-					if (isset($info['type']) && $info['type'] == $type) {
-						$info['id']  = $filename;
-						$preview = '/template/' . $filename . '/' . $info['preview'];
-						$info['preview'] = is_file($tempPath . $preview) ? $preview : '/static/common/images/default.png';
-						$list[] = $info;
-					}else{
-						continue;
-					}
-				}
-			}
-		}
-		return $list;
-	}
 }

app/model/system/Dictionary.php

@@ -6,7 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-namespace app\model;
+namespace app\model\system;
 
 use think\Model;
 use think\facade\Db;

app/model/system/Rewrite.php

@@ -1,13 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | OneThink [ WE CAN DO IT JUST THINK IT ]
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\system;
-namespace app\model;
 
 /**
  * 伪静态

app/model/system/SeoRule.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\system;
-namespace app\model;
 
 /**
  * 用户模型

app/model/wechat/Wechat.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\wechat;
-namespace app\model;
 
 /**
  * 微信模型

app/model/wechat/WechatPay.php

@@ -6,8 +6,7 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
+namespace app\model\wechat;
-namespace app\model;
 
 /**
  * 微信模型

app/provider/ModuleProviderService.php

@@ -0,0 +1,27 @@
+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+declare (strict_types = 1);
+namespace app\provider;
+
+use think\Service;
+use app\services\module\ModuleService;
+use think\Db;
+
+/**
+ * 模型服务类
+ */
+class ModuleProviderService extends Service{
+	public function register(){
+		// 服务注册
+	}
+
+	public function boot(){
+		// 服务启动
+	}
+}

app/service.php

@@ -1,9 +1,11 @@
 <?php
 
 use app\AppService;
+use app\provider\ModuleProviderService;
 
 // 系统服务定义文件
 // 服务在完成全局初始化之后执行
 return [
-    AppService::class,
+	AppService::class,
-];
+	ModuleProviderService::class
+];

app/services/AdService.php

@@ -0,0 +1,29 @@
+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+namespace app\services;
+
+use app\model\ads\Ad;
+use app\model\ads\AdPlace;
+
+class AdService{
+	
+	/**
+	 * @title 获取广告位列表
+	 *
+	 * @return void
+	 */
+	public function getAdPlaceList($request){
+		$map = [];
+		$order = "id desc";
+
+		$list = AdPlace::where($map)->order($order)->paginate($request->pageConfig);
+
+		return $list;
+	}
+}

app/services/module/ContentService.php

@@ -0,0 +1,16 @@
+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+namespace app\services\module;
+
+class ContentService{
+	
+    /**
+     * 
+     */
+}

app/services/module/ModuleService.php

@@ -0,0 +1,46 @@
+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+namespace app\services\module;
+
+use app\model\module\Model;
+use think\facade\Cache;
+use think\facade\Route;
+
+class ModuleService{
+	
+	/**
+	 * @title 获取模型数据
+	 */
+	public function getModuleList(){
+		$map = [];
+
+		$list = (new Module())->where($map)->select();
+
+		return $list;
+	}
+
+	public function registerRoute(){
+		$model = Cache::get('model_route_list');
+		if (!$model) {
+			$model = Model::where('status', '>', 0)->field(['id', 'name'])->select()->toArray();
+			Cache::set('model_route_list', $model);
+		}
+
+		if (!empty($model)) {
+			foreach ($model as $value) {
+				Route::rule('/admin/' . $value['name'] . '/:function', 'admin.Content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
+				Route::rule($value['name'] . '/index', 'front.Content/index')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
+				Route::rule($value['name'] . '/list/:id', 'front.Content/lists')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
+				Route::rule($value['name'] . '/detail-:id', 'front.Content/detail')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
+				Route::rule('/user/' . $value['name'] . '/:function', 'user.Content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
+				Route::rule('/api/' . $value['name'] . '/:function', 'api.Content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
+			}
+		}
+	}
+}

app/services/system/ConfigService.php

@@ -0,0 +1,162 @@
+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+namespace app\services\system;
+
+use app\model\system\Config;
+use think\facade\Cache;
+
+class ConfigService{
+
+	/**
+	 * @title 获取配置列表
+	 *
+	 * @param [type] $request
+	 * @return void
+	 */
+	public function getConfigList($request){
+		$group = $request->param('group', 0);
+		$name = $request->param('name', 0);
+		
+		/* 查询条件初始化 */
+		$map = [];
+		if ($group) {
+			$map['group'] = $group;
+		}
+
+		if ($name) {
+			$map['name'] = array('like', '%' . $name . '%');
+		}
+
+		$list = Config::where($map)->order('id desc')->paginate($request->pageConfig);
+		return $list;
+	}
+
+	/**
+	 * @title 根据分组获取配置
+	 *
+	 * @param [type] $request
+	 * @return void
+	 */
+	public function getConfigByGroup($request){
+		$id = $request->param('id', 1);
+		$map = [];
+		
+		$map[] = ['group', '=', $id];
+		$map[] = ['status', '=', 1];
+		$data = Config::where($map)->field('id,name,title,extra,value,remark,type')->order('sort')->select();
+
+		return $data ? $data : [];
+	}
+
+	/**
+	 * @title 更新配置
+	 *
+	 * @param [type] $request
+	 * @return void
+	 */
+	public function updateConfig($request){
+		$data = $request->post('config');
+
+		foreach ($data as $key => $value) {
+			Config::update(['value' => $value], ['name' => $key]);
+		}
+		//清除db_config_data缓存
+		Cache::delete('system_config_data');
+	}
+
+	/**
+	 * @title 创建配置项
+	 *
+	 * @param [type] $request
+	 * @return void
+	 */
+	public function createConfig($request){
+		$data = $request->post();
+		$result = Config::create($data);
+		if (false !== $result) {
+			Cache::pull('system_config_data');
+		} else {
+			throw new \think\Exception("新增失败！", 1);
+		}
+	}
+
+	/**
+	 * @title 获取单个配置信息
+	 *
+	 * @return void
+	 */
+	public function getConfigDetail($request){
+		$id = $request->param('id', 0);
+
+		$config = Config::where('id', '=', $id)->findOrEmpty();
+		return $config->isEmpty() ? [] : $config;
+	}
+
+	/**
+	 * @title 修改单个配置项
+	 *
+	 * @param [type] $request
+	 * @return void
+	 */
+	public function editConfig($request){
+		$data = $request->post();
+
+		$result = Config::update($data, array('id' => $data['id']));
+		if (false !== $result) {
+			Cache::pull('system_config_data');
+			return true;
+		} else {
+			throw new \think\Exception("更新失败！", 1);
+		}
+	}
+
+	/**
+	 * @title 删除配置
+	 *
+	 * @return void
+	 */
+	public function deleteConfig($request){
+		$id = $request->param('id', 0);
+		if(!$id){
+			throw new \think\Exception("非法操作！", 1);
+		}
+		return Config::find($id)->delete();
+	}
+
+	public function getThemesList($request){
+		return [
+			'pc'  => $this->getList('pc'),
+			'mobile' => $this->getList('mobile')
+		];
+	}
+
+	protected function getList($type){
+		$tempPath = app()->getRootPath() . 'public' . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR;
+
+		$file  = opendir($tempPath);
+		$list = [];
+		while (false !== ($filename = readdir($file))) {
+			if (!in_array($filename, array('.', '..'))) {
+				$files = $tempPath . $filename . '/info.php';
+				if (is_file($files)) {
+					$info = include($files);
+					if (isset($info['type']) && $info['type'] == $type) {
+						$info['id']  = $filename;
+						$preview = '/template/' . $filename . '/' . $info['preview'];
+						$info['preview'] = is_file($tempPath . $preview) ? $preview : '/static/common/images/default.png';
+						$list[] = $info;
+					}else{
+						continue;
+					}
+				}
+			}
+		}
+		return $list;
+	}
+}

app/services/system/RewriteService.php

@@ -0,0 +1,33 @@
+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+namespace app\services\system;
+
+use app\model\system\Rewrite;
+use think\facade\Cache;
+use think\facade\Route;
+
+class RewriteService{
+
+	public function registerRoute(){
+		$rewrite = Cache::get('rewrite_list');
+		if (!$rewrite) {
+			$rewrite = Rewrite::select()->toArray();
+			Cache::set('rewrite_list', $rewrite);
+		}
+
+		if (!empty($rewrite)) {
+			foreach ($rewrite as $key => $value) {
+				$url = parse_url($value['url']);
+				$param = [];
+				parse_str($url['query'], $param);
+				Route::rule($value['rule'], $url['path'])->append($param);
+			}
+		}
+	}
+}

composer.json

@@ -42,7 +42,10 @@
         }
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "easywechat-composer/easywechat-composer": true
+        }
     },
     "scripts": {
         "post-autoload-dump": [

extend/com/Sent.php

@@ -27,7 +27,7 @@ class Sent extends \think\template\TagLib {
 		$pid  = isset($tag['pid']) ? $tag['pid'] : '';
 		$tree   =   isset($tag['tree']) ? $tag['tree'] : false;
 		$parse  = '<?php ';
-		$parse .= '$__NAV__ = \\app\\model\\Channel::getChannelList('.$type.', "'.$pid.'", '.$tree.');';
+		$parse .= '$__NAV__ = \\app\\model\\system\\Channel::getChannelList('.$type.', "'.$pid.'", '.$tree.');';
 		$parse .= 'foreach ($__NAV__ as $key => $'.$tag['name'].') {';
 		$parse .= '?>';
 		$parse .= $content;
@@ -44,7 +44,7 @@ class Sent extends \think\template\TagLib {
 		$name = isset($tag['name']) ? $tag['name'] : 'item';
 
 		$parse  = $parse   = '<?php ';
-		$parse .= '$__LIST__ = \\app\\model\\Document::getDocumentList("'.$model.'", '.$cid.', '.$limit.', "'.$order.'", "'.$field.'");';
+		$parse .= '$__LIST__ = \\app\\model\\module\\Document::getDocumentList("'.$model.'", '.$cid.', '.$limit.', "'.$order.'", "'.$field.'");';
 		$parse .= 'foreach ($__LIST__ as $key => $'.$name.') {';
 		$parse .= '?>';
 		$parse .= $content;
@@ -66,7 +66,7 @@ class Sent extends \think\template\TagLib {
 		$map = implode(" and ", $where);
 
 		$parse  = $parse   = '<?php ';
-		$parse .= '$__LIST__ = \\app\\model\\Link::where(\''.$map.'\')->field(\''.$field.'\')->limit(\''.$limit.'\')->order(\''.$order.'\')->select();';
+		$parse .= '$__LIST__ = \\app\\model\link\\\Link::where(\''.$map.'\')->field(\''.$field.'\')->limit(\''.$limit.'\')->order(\''.$order.'\')->select();';
 		$parse .= 'foreach ($__LIST__ as $key => $'.$tag['name'].') {';
 		$parse .= '?>';
 		$parse .= $content;

route/app.php

@@ -9,43 +9,13 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 use think\facade\Route;
-use think\facade\Cache;
+use app\services\module\ModuleService;
-use app\model\Model;
+use app\services\system\RewriteService;
-use app\model\Rewrite;
 use app\http\middleware\Validate;
 use app\http\middleware\Admin;
 
-$model = Cache::get('model_list');
+app()->make(ModuleService::class)->registerRoute();    //注册模型路由
-if (!$model) {
+app()->make(RewriteService::class)->registerRoute();    //后台伪静态设置路由注册
-	$model = Model::where('status', '>', 0)->field(['id', 'name'])->select()->toArray();
-	Cache::set('model_list', $model);
-}
-
-if (!empty($model)) {
-	foreach ($model as $value) {
-		Route::rule('/admin/' . $value['name'] . '/:function', 'admin.Content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
-		Route::rule($value['name'] . '/index', 'front.Content/index')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
-		Route::rule($value['name'] . '/list/:id', 'front.Content/lists')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
-		Route::rule($value['name'] . '/detail-:id', 'front.Content/detail')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
-		Route::rule('/user/' . $value['name'] . '/:function', 'user.Content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
-		Route::rule('/api/' . $value['name'] . '/:function', 'api.Content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
-	}
-}
-
-$rewrite = Cache::get('rewrite_list');
-if (!$rewrite) {
-	$rewrite = Rewrite::select()->toArray();
-	Cache::set('rewrite_list', $rewrite);
-}
-
-if (!empty($rewrite)) {
-	foreach ($rewrite as $key => $value) {
-		$url = parse_url($value['url']);
-		$param = [];
-		parse_str($url['query'], $param);
-		Route::rule($value['rule'], $url['path'])->append($param);
-	}
-}
 
 Route::rule('/', 'front.Index/index');
 Route::rule('search', 'front.Content/search');

view/admin/config/index.html

@@ -20,7 +20,7 @@
                 <li {if !$group_id}class="active"{/if}><a href="{:url('/admin/config/index')}">全部</a></li>
                 {volist name="config['config_group_list']" id="item"}
                 <li {if $group_id == $item['key']}class="active"{/if}>
-                    <a href="{:url('/admin/config/index?group='.$item['key'])}">{$item['label']}</a>
+                    <a href="{:url('/admin/config/index', ['group' => $item['key']])}">{$item['label']}</a>
                 </li>
                 {/volist}
             </ul>