diff --git a/README.md b/README.md index 7b3ebf80f..2af29deab 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,12 @@ PHP开发技术交流（QQ群 513350915） Repositorie -- ThinkAdmin 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。 -* GitHub 托管地址：https://github.com/zoujingli/ThinkAdmin * Gitee 托管地址：https://gitee.com/zoujingli/Think.Admin +* GitHub 托管地址：https://github.com/zoujingli/ThinkAdmin 对于新版本的微信模块使用的是授权模式，需要用到 ThinkService 项目。 -* GitHub 托管地址：https://github.com/zoujingli/ThinkService * Gitee 托管地址：https://gitee.com/zoujingli/ThinkService +* GitHub 托管地址：https://github.com/zoujingli/ThinkService 其安装与 ThinkAdmin 相似，这里就不多说了。具体可以参见微信开放平台官网 https://open.weixin.qq.com ，ThinkService 后台具体可以配置对应参数。 diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php index 096d652ea..6e61de34d 100644 --- a/application/admin/controller/Login.php +++ b/application/admin/controller/Login.php @@ -18,6 +18,8 @@ use controller\BasicAdmin; use service\LogService; use service\NodeService; use think\Db; +use think\facade\Validate; + /** * 系统登录控制器 @@ -54,19 +56,30 @@ class Login extends BasicAdmin return $this->fetch('', ['title' => '用户登录']); } // 输入数据效验 - $username = $this->request->post('username', '', 'trim'); - $password = $this->request->post('password', '', 'trim'); - strlen($username) < 4 && $this->error('登录账号长度不能少于4位有效字符!'); - strlen($password) < 4 && $this->error('登录密码长度不能少于4位有效字符!'); + $validate = Validate::make([ + 'username' => 'require|min:4', + 'password' => 'require|min:4', + ], [ + 'username.require' => '登录账号不能为空！', + 'username.min' => '登录账号长度不能少于4位有效字符！', + 'password.require' => '登录密码不能为空！', + 'password.min' => '登录密码长度不能少于4位有效字符！', + ]); + $data = [ + 'username' => $this->request->post('username', ''), + 'password' => $this->request->post('password', ''), + ]; + $validate->check($data) || $this->error($validate->getError()); // 用户信息验证 - $user = Db::name('SystemUser')->where('is_deleted', '0')->where('username', $username)->find(); + $user = Db::name('SystemUser')->where(['username' => $data['username'], 'is_deleted' => '0'])->find(); empty($user) && $this->error('登录账号不存在，请重新输入!'); - ($user['password'] !== md5($password)) && $this->error('登录密码与账号不匹配，请重新输入!'); - empty($user['is_deleted']) || $this->error('账号已经被删除，请联系管理！'); - empty($user['status']) && $this->error('账号已经被禁用，请联系管理!'); + empty($user['status']) && $this->error('账号已经被禁用，请联系管理员!'); + $user['password'] !== md5($data['password']) && $this->error('登录密码错误，请重新输入!'); // 更新登录信息 - $data = ['login_at' => Db::raw('now()'), 'login_num' => Db::raw('login_num+1')]; - Db::name('SystemUser')->where(['id' => $user['id']])->update($data); + Db::name('SystemUser')->where(['id' => $user['id']])->update([ + 'login_at' => Db::raw('now()'), + 'login_num' => Db::raw('login_num+1'), + ]); session('user', $user); !empty($user['authorize']) && NodeService::applyAuthNode(); LogService::write('系统管理', '用户登录系统成功'); diff --git a/application/admin/controller/Plugs.php b/application/admin/controller/Plugs.php index 8e400be48..9a894d9b8 100644 --- a/application/admin/controller/Plugs.php +++ b/application/admin/controller/Plugs.php @@ -59,8 +59,9 @@ class Plugs extends BasicAdmin if (!$file->checkExt(strtolower(sysconf('storage_local_exts')))) { return json(['code' => 'ERROR', 'msg' => '文件上传类型受限']); } - $ext = strtolower(pathinfo($file->getInfo('name'), 4)); $names = str_split($this->request->post('md5'), 16); + $ext = strtolower(pathinfo($file->getInfo('name'), 4)); + $ext = $ext ? $ext : 'tmp'; $filename = "{$names[0]}/{$names[1]}.{$ext}"; // 文件上传Token验证 if ($this->request->post('token') !== md5($filename . session_id())) { @@ -84,21 +85,22 @@ class Plugs extends BasicAdmin public function upstate() { $post = $this->request->post(); - $filename = join('/', str_split($post['md5'], 16)) . '.' . strtolower(pathinfo($post['filename'], 4)); + $ext = strtolower(pathinfo($post['filename'], 4)); + $filename = join('/', str_split($post['md5'], 16)) . '.' . ($ext ? $ext : 'tmp'); // 检查文件是否已上传 if (($site_url = FileService::getFileUrl($filename))) { - $this->result(['site_url' => $site_url], 'IS_FOUND'); + return json(['data' => ['site_url' => $site_url], 'code' => "IS_FOUND"]); } // 需要上传文件，生成上传配置参数 - $config = ['uptype' => $post['uptype'], 'file_url' => $filename]; + $data = ['uptype' => $post['uptype'], 'file_url' => $filename]; switch (strtolower($post['uptype'])) { case 'local': - $config['server'] = FileService::getUploadLocalUrl(); - $config['token'] = md5($filename . session_id()); + $data['token'] = md5($filename . session_id()); + $data['server'] = FileService::getUploadLocalUrl(); break; case 'qiniu': - $config['server'] = FileService::getUploadQiniuUrl(true); - $config['token'] = $this->_getQiniuToken($filename); + $data['token'] = $this->_getQiniuToken($filename); + $data['server'] = FileService::getUploadQiniuUrl(true); break; case 'oss': $time = time() + 3600; @@ -106,13 +108,14 @@ class Plugs extends BasicAdmin 'expiration' => date('Y-m-d', $time) . 'T' . date('H:i:s', $time) . '.000Z', 'conditions' => [['content-length-range', 0, 1048576000]], ]; - $config['server'] = FileService::getUploadOssUrl(); - $config['policy'] = base64_encode(json_encode($policyText)); - $config['site_url'] = FileService::getBaseUriOss() . $filename; - $config['signature'] = base64_encode(hash_hmac('sha1', $config['policy'], sysconf('storage_oss_secret'), true)); - $config['OSSAccessKeyId'] = sysconf('storage_oss_keyid'); + $data['server'] = FileService::getUploadOssUrl(); + $data['policy'] = base64_encode(json_encode($policyText)); + $data['site_url'] = FileService::getBaseUriOss() . $filename; + $data['signature'] = base64_encode(hash_hmac('sha1', $data['policy'], sysconf('storage_oss_secret'), true)); + $data['OSSAccessKeyId'] = sysconf('storage_oss_keyid'); + break; } - $this->result($config, 'NOT_FOUND'); + return json(['data' => $data, 'code' => "NOT_FOUND"]); } /** diff --git a/application/tags.php b/application/admin/middleware/Auth.php similarity index 51% rename from application/tags.php rename to application/admin/middleware/Auth.php index 30c1a48cb..8dd0a3d1f 100644 --- a/application/tags.php +++ b/application/admin/middleware/Auth.php @@ -12,29 +12,60 @@ // | github开源项目：https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -namespace think; +namespace app\admin\middleware; use service\NodeService; -use think\exception\HttpResponseException; +use think\Db; +use think\Request; -return [ - // 控制器开始前，进行权限检查 - 'action_begin' => function () { - $request = app('request'); +/** + * 系统权限访问管理 + * Class Auth + * @package app\admin\middleware + */ +class Auth +{ + /** + * @param Request $request + * @param \Closure $next + * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function handle($request, \Closure $next) + { list($module, $controller, $action) = [$request->module(), $request->controller(), $request->action()]; - $node = NodeService::parseNodeStr("{$module}/{$controller}/{$action}"); - $info = Db::name('SystemNode')->cache(true, 30)->where(['node' => $node])->find(); - $access = ['is_menu' => intval(!empty($info['is_menu'])), 'is_auth' => intval(!empty($info['is_auth'])), 'is_login' => empty($info['is_auth']) ? intval(!empty($info['is_login'])) : 1]; + $access = $this->buildAuth($node = NodeService::parseNodeStr("{$module}/{$controller}/{$action}")); // 登录状态检查 if (!empty($access['is_login']) && !session('user')) { $msg = ['code' => 0, 'msg' => '抱歉，您还没有登录获取访问权限！', 'url' => url('@admin/login')]; - throw new HttpResponseException($request->isAjax() ? json($msg) : redirect($msg['url'])); + return $request->isAjax() ? json($msg) : redirect($msg['url']); } // 访问权限检查 if (!empty($access['is_auth']) && !auth($node)) { - throw new HttpResponseException(json(['code' => 0, 'msg' => '抱歉，您没有访问该模块的权限！'])); + return json(['code' => 0, 'msg' => '抱歉，您没有访问该模块的权限！']); } // 模板常量声明 app('view')->init(config('template.'))->assign(['classuri' => NodeService::parseNodeStr("{$module}/{$controller}")]); - }, -]; + return $next($request); + } + + /** + * 根据节点获取对应权限配置 + * @param string $node 权限节点 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + private function buildAuth($node) + { + $info = Db::name('SystemNode')->cache(true, 30)->where(['node' => $node])->find(); + return [ + 'is_menu' => intval(!empty($info['is_menu'])), + 'is_auth' => intval(!empty($info['is_auth'])), + 'is_login' => empty($info['is_auth']) ? intval(!empty($info['is_login'])) : 1, + ]; + } +} diff --git a/application/admin/view/auth/form.html b/application/admin/view/auth/form.html index 874a0732e..cc134f0fe 100644 --- a/application/admin/view/auth/form.html +++ b/application/admin/view/auth/form.html @@ -1,4 +1,4 @@ -
+
diff --git a/application/admin/view/auth/index.html b/application/admin/view/auth/index.html index 0cc90f61a..1b787cd0b 100644 --- a/application/admin/view/auth/index.html +++ b/application/admin/view/auth/index.html @@ -11,7 +11,7 @@ {/block} {block name="content"} - +

没 有 记 录 哦！

diff --git a/application/admin/view/config/file.html b/application/admin/view/config/file.html index 584a33f19..5e6fb44d5 100644 --- a/application/admin/view/config/file.html +++ b/application/admin/view/config/file.html @@ -1,7 +1,7 @@ {extend name="admin@public/content"} {block name="content"} - +