From 58bdcbbab5284702b6ce23d3a558defa95a3758b Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 27 Sep 2017 16:22:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=90=8E=E7=BC=80=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Config.php | 21 ++- application/admin/controller/Index.php | 44 ++--- application/admin/controller/Log.php | 4 + application/admin/controller/Login.php | 4 +- application/admin/controller/Plugs.php | 9 +- application/admin/controller/User.php | 8 +- application/admin/view/auth.index.html | 2 + application/admin/view/config.file.html | 203 +++++++++++++++--------- application/admin/view/config.sms.html | 41 +++++ application/admin/view/index.main.html | 181 ++++++++++----------- application/admin/view/log.index.html | 24 ++- application/admin/view/login.index.html | 12 +- application/admin/view/node.index.html | 24 +-- application/admin/view/user.auth.html | 16 +- application/admin/view/user.form.html | 27 ++-- application/admin/view/user.index.html | 60 +++++-- application/admin/view/user.pass.html | 15 +- 17 files changed, 429 insertions(+), 266 deletions(-) create mode 100644 application/admin/view/config.sms.html diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php index 155ffc1b3..9ecf60938 100644 --- a/application/admin/controller/Config.php +++ b/application/admin/controller/Config.php @@ -14,7 +14,9 @@ namespace app\admin\controller; +use app\store\OrderService; use controller\BasicAdmin; +use service\ExtendService; use service\LogService; /** @@ -50,8 +52,8 @@ class Config extends BasicAdmin foreach ($this->request->post() as $key => $vo) { sysconf($key, $vo); } - LogService::write('系统管理', '修改系统配置参数成功'); - $this->success('数据修改成功！', ''); + LogService::write('系统管理', '系统参数配置成功'); + $this->success('系统参数配置成功！', ''); } /** @@ -60,9 +62,22 @@ class Config extends BasicAdmin public function file() { $this->title = '文件存储配置'; - $alert = ['type' => 'success', 'title' => '操作提示', 'content' => '文件引擎参数影响全局文件上传功能，请勿随意修改！']; + $alert = [ + 'type' => 'success', 'title' => '操作提示', + 'content' => '文件引擎参数影响全局文件上传功能，请勿随意修改！' + ]; $this->assign('alert', $alert); return $this->index(); } + /** + * 短信参数配置 + */ + public function sms() + { + $this->title = '短信服务配置'; + $this->assign('result', ExtendService::querySmsBalance()); + return $this->index(); + } + } diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 65484ba9f..f19b4e603 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -39,43 +39,36 @@ class Index extends BasicAdmin { NodeService::applyAuthNode(); $list = (array)Db::name('SystemMenu')->where(['status' => '1'])->order('sort asc,id asc')->select(); - $menus = $this->_filterMenu(ToolsService::arr2tree($list), NodeService::get()); + $menus = $this->_filterMenuData(ToolsService::arr2tree($list), NodeService::get(), !!session('user')); return view('', ['title' => '系统管理', 'menus' => $menus]); } /** * 后台主菜单权限过滤 - * @param array $menus - * @param array $nodes + * @param array $menus 当前菜单列表 + * @param array $nodes 系统权限节点数据 + * @param bool $isLogin 是否已经登录 * @return array */ - private function _filterMenu($menus, $nodes) + private function _filterMenuData($menus, $nodes, $isLogin) { foreach ($menus as $key => &$menu) { - // 存在子菜单时，直接使用递归处理 - if (!empty($menu['sub'])): - $menu['sub'] = $this->_filterMenu($menu['sub'], $nodes); - endif; - if (!empty($menu['sub'])): + !empty($menu['sub']) && $menu['sub'] = $this->_filterMenuData($menu['sub'], $nodes, $isLogin); + if (!empty($menu['sub'])) { $menu['url'] = '#'; - // 菜单链接以http开头时，不做处理 - elseif (preg_match('/^https?\:/i', $menu['url'])) : + } elseif (preg_match('/^https?\:/i', $menu['url'])) { continue; - // 菜单链接不为空时，判断登录状态及权限验证 - elseif ($menu['url'] !== '#') : + } elseif ($menu['url'] !== '#') { $node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3)); $menu['url'] = url($menu['url']); - // 节点需要验证验证，未登录时移除此菜单 - if (isset($nodes[$node]) && $nodes[$node]['is_login'] && !session('user')) : + if (isset($nodes[$node]) && $nodes[$node]['is_login'] && empty($isLogin)) { unset($menus[$key]); - // 节点需要权限验证，无权限时移除此菜单 - elseif (isset($nodes[$node]) && $nodes[$node]['is_auth'] && session('user') && !auth($node)) : + } elseif (isset($nodes[$node]) && $nodes[$node]['is_auth'] && $isLogin && !auth($node)) { unset($menus[$key]); - endif; - // 非以上情况时，移除此菜单 - else : + } + } else { unset($menus[$key]); - endif; + } } return $menus; } @@ -86,11 +79,6 @@ class Index extends BasicAdmin */ public function main() { - if (session('user.password') === '21232f297a57a5a743894a0e4a801fc3') { - $url = url('admin/index/pass') . '?id=' . session('user.id'); - $alert = ['type' => 'danger', 'title' => '安全提示', 'content' => "超级管理员默认密码未修改，建议马上修改！",]; - $this->assign('alert', $alert); - } $_version = Db::query('select version() as ver'); return view('', ['mysql_ver' => array_pop($_version)['ver'], 'title' => '后台首页']); } @@ -101,7 +89,7 @@ class Index extends BasicAdmin public function pass() { if (intval($this->request->request('id')) !== intval(session('user.id'))) { - $this->error('访问异常！'); + $this->error('只能修改当前用户的密码！'); } if ($this->request->isGet()) { $this->assign('verify', true); @@ -129,7 +117,7 @@ class Index extends BasicAdmin if (intval($this->request->request('id')) === intval(session('user.id'))) { return $this->_form('SystemUser', 'user/form'); } - $this->error('访问异常！'); + $this->error('只能修改当前用户的资料！'); } } diff --git a/application/admin/controller/Log.php b/application/admin/controller/Log.php index f9e77cd6b..e0a209834 100644 --- a/application/admin/controller/Log.php +++ b/application/admin/controller/Log.php @@ -52,6 +52,10 @@ class Log extends BasicAdmin $db->where($key, 'like', "%{$get[$key]}%"); } } + if (isset($get['date']) && $get['date'] !== '') { + list($start, $end) = explode('-', str_replace(' ', '', $get['date'])); + $db->whereBetween('create_at', ["{$start} 00:00:00", "{$end} 23:59:59"]); + } return parent::_list($db); } diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php index d01674a25..edf78044d 100644 --- a/application/admin/controller/Login.php +++ b/application/admin/controller/Login.php @@ -72,7 +72,9 @@ class Login extends BasicAdmin */ public function out() { - LogService::write('系统管理', '用户退出系统成功'); + if (session('user')) { + LogService::write('系统管理', '用户退出系统成功'); + } session('user', null); session_destroy(); $this->success('退出登录成功！', '@admin/login'); diff --git a/application/admin/controller/Plugs.php b/application/admin/controller/Plugs.php index acfd213d5..daee94587 100644 --- a/application/admin/controller/Plugs.php +++ b/application/admin/controller/Plugs.php @@ -51,12 +51,15 @@ class Plugs extends BasicAdmin public function upload() { $file = $this->request->file('file'); - $ext = pathinfo($file->getInfo('name'), 4); + $ext = strtolower(pathinfo($file->getInfo('name'), 4)); $md5 = str_split($this->request->post('md5'), 16); $filename = join('/', $md5) . ".{$ext}"; + if (!in_array($ext, explode(',', strtolower(sysconf('storage_local_exts'))))) { + return json(['code' => 'ERROR', 'msg' => '文件上传类型受限']); + } // 文件上传Token验证 if ($this->request->post('token') !== md5($filename . session_id())) { - return json(['code' => 'ERROR', '文件上传验证失败']); + return json(['code' => 'ERROR', 'msg' => '文件上传验证失败']); } // 文件上传处理 if (($info = $file->move('static' . DS . 'upload' . DS . $md5[0], $md5[1], true))) { @@ -64,7 +67,7 @@ class Plugs extends BasicAdmin return json(['data' => ['site_url' => $site_url], 'code' => 'SUCCESS', 'msg' => '文件上传成功']); } } - return json(['code' => 'ERROR', '文件上传失败']); + return json(['code' => 'ERROR', 'msg' => '文件上传失败']); } /** diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 09045dcd0..48c621acd 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -42,11 +42,15 @@ class User extends BasicAdmin $this->title = '系统用户管理'; $get = $this->request->get(); $db = Db::name($this->table)->where(['is_deleted' => '0']); - foreach (['username', 'phone'] as $key) { + foreach (['username', 'phone', 'mail'] as $key) { if (isset($get[$key]) && $get[$key] !== '') { $db->where($key, 'like', "%{$get[$key]}%"); } } + if (isset($get['date']) && $get['date'] !== '') { + list($start, $end) = explode('-', str_replace(' ', '', $get['date'])); + $db->whereBetween('login_at', ["{$start} 00:00:00", "{$end} 23:59:59"]); + } return parent::_list($db); } @@ -111,7 +115,7 @@ class User extends BasicAdmin } } else { $data['authorize'] = explode(',', isset($data['authorize']) ? $data['authorize'] : ''); - $this->assign('authorizes', Db::name('SystemAuth')->select()); + $this->assign('authorizes', Db::name('SystemAuth')->where(['status' => '1'])->select()); } } diff --git a/application/admin/view/auth.index.html b/application/admin/view/auth.index.html index d23682d55..36c62a8ba 100644 --- a/application/admin/view/auth.index.html +++ b/application/admin/view/auth.index.html @@ -30,6 +30,7 @@ 权限名称 权限描述 状态 + 添加时间 操作 @@ -51,6 +52,7 @@ 使用中 {/if} + {$vo.create_at|format_datetime} {if auth("$classuri/edit")} diff --git a/application/admin/view/config.file.html b/application/admin/view/config.file.html index 52d89ad3a..cc7a3c198 100644 --- a/application/admin/view/config.file.html +++ b/application/admin/view/config.file.html @@ -1,70 +1,89 @@ {extend name="extra@admin/content"} {block name="content"} -
+
- - - - + - + 本地服务器 + + + +
+ 文件将存储在本地服务器，请确保服务器的 ./static/upload 目录有写入权限 +
若还没有七牛云帐号，请点击 - 免费申请10G存储空间, + 免费申请10G存储空间, 申请成功后添加公开bucket空间
- 若还没有AliOSS存储账号, 请点击 创建AliOSS存储空间, + 若还没有AliOSS存储账号, 请点击 创建AliOSS存储空间, 目前仅支持公开空间URL访问, 另外还需要配置AliOSS跨域策略
+
- - + - + 华东 + + + +

七牛云存储空间所在区域，需要严格对应储存所在区域才能上传文件

@@ -72,26 +91,41 @@
- -

七牛云资源访问协议（HTTP 或 HTTPS），HTTPS 需要配置证书才能使用

+ + + + + + + +

七牛云资源访问协议（http 或 https），https 需要配置证书才能使用

+
+ +
+ +

设置系统允许上传文件的后缀，多个以英文逗号隔开。如：png,jpg,rar,doc

+
+
- +

填写七牛云存储空间名称，如：static

@@ -99,8 +133,9 @@
- +

填写七牛云存储访问域名，如：static.ctolog.cc

@@ -108,8 +143,9 @@
- +

可以在 [ 七牛云 > 个人中心 ] 设置并获取到访问密钥

@@ -118,9 +154,9 @@
- +

可以在 [ 七牛云 > 个人中心 ] 设置并获取到安全密钥

@@ -128,24 +164,31 @@
- -

AliOSS资源访问协议（HTTP 或 HTTPS），HTTPS 需要配置证书才能使用

+ + + + + + + +

AliOSS资源访问协议（http 或 https），https 需要配置证书才能使用

- +

填写OSS存储空间名称，如：static

@@ -153,8 +196,9 @@
- +

填写OSS存储外部访问域名，如：static.ctolog.cc

@@ -162,8 +206,9 @@
- +

可以在 [ 阿里云 > 个人中心 ] 设置并获取到访问密钥

@@ -172,8 +217,9 @@
- +

可以在 [ 阿里云 > 个人中心 ] 设置并获取到安全密钥

@@ -191,10 +237,19 @@ {block name="script"} {/block} \ No newline at end of file diff --git a/application/admin/view/config.sms.html b/application/admin/view/config.sms.html new file mode 100644 index 000000000..bae058a55 --- /dev/null +++ b/application/admin/view/config.sms.html @@ -0,0 +1,41 @@ +{extend name="extra@admin/content"} + +{block name="content"} + + +
+ +
+ +

肋通SMS接口状态，若短信剩余条数不足时，请提前充值。

+
+
+ +
+ +
+ +

助通SMS接口平台账号，平台管理 登录平台。

+
+
+ +
+ +
+ +

助通SMS接口平台密码，需要在助通平台修改。

+
+
+ +
+ +
+
+ +
+
+ +
+{/block} diff --git a/application/admin/view/index.main.html b/application/admin/view/index.main.html index e702533f8..1df88aa55 100644 --- a/application/admin/view/index.main.html +++ b/application/admin/view/index.main.html @@ -5,116 +5,109 @@
- + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
系统信息
系统信息
Think.Admin 版本{:sysconf('app_version')}
ThinkPHP 版本{$Think.const.THINK_VERSION}
服务器操作系统{:php_uname('s')}
WEB运行环境{:php_sapi_name()}
MySQL数据库版本{$mysql_ver}
运行PHP版本{:phpversion()}
上传大小限制{:ini_get('upload_max_filesize')}
POST大小限制{:ini_get('post_max_size')}
Think.Admin 版本{:sysconf('app_version')}
ThinkPHP 版本{$Think.const.THINK_VERSION}
服务器操作系统{:php_uname('s')}
WEB运行环境{:php_sapi_name()}
MySQL数据库版本{$mysql_ver}
运行PHP版本{:phpversion()}
上传大小限制{:ini_get('upload_max_filesize')}
POST大小限制{:ini_get('post_max_size')}
- + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
产品团队
产品团队
产品名称Think.Admin 管理框架
产品研发团队广州楚才信息科技有限公司
产品DEMO体验 - - https://think.ctolog.com - -
官方QQ群 - - PHP微信开发群 (SDK) - -
BUG反馈 - - https://github.com/zoujingli/Think.Admin/issues - -
项目地址 - - https://github.com/zoujingli/Think.Admin - -
公司官网 - - http://www.cuci.cc - -
公司地址 - 广东省 广州市 海珠区 世港国际公寓E1栋 -
产品名称Think.Admin 管理框架
产品研发团队广州楚才信息科技有限公司
产品DEMO体验 + https://think.ctolog.com +
官方QQ群 + + + +
BUG反馈 + + https://github.com/zoujingli/Think.Admin/issues + +
项目地址 + + https://github.com/zoujingli/Think.Admin + +
公司官网http://www.cuci.cc
公司地址广东省 广州市 海珠区 世港国际公寓E1栋
diff --git a/application/admin/view/log.index.html b/application/admin/view/log.index.html index a18e3ab66..6124668b0 100644 --- a/application/admin/view/log.index.html +++ b/application/admin/view/log.index.html @@ -1,10 +1,9 @@ {extend name='extra@admin/content'} {block name="button"} -
+
{if auth("$classuri/del")} - {/if} @@ -16,14 +15,14 @@
- +
- +
+
+ +
+ +
+
+
-
+ @@ -78,7 +85,7 @@ - + {/foreach} @@ -86,6 +93,7 @@ {if isset($page)}

{$page}

{/if} {/block} \ No newline at end of file diff --git a/application/admin/view/login.index.html b/application/admin/view/login.index.html index 82ad6baa1..45ddf09a8 100644 --- a/application/admin/view/login.index.html +++ b/application/admin/view/login.index.html @@ -8,9 +8,11 @@ @@ -16,13 +18,17 @@
{foreach $authorizes as $authorize} {if in_array($authorize['id'],$vo['authorize'])} - + {else} - + {/if} {/foreach} {if empty($authorizes)} - 尚未配置权限 + 未配置权限 {/if}
diff --git a/application/admin/view/user.form.html b/application/admin/view/user.form.html index 62cb15ff6..0ad72f6a0 100644 --- a/application/admin/view/user.form.html +++ b/application/admin/view/user.form.html @@ -4,9 +4,11 @@
{if $vo and isset($vo.username)} - + {else} - + {/if}
@@ -14,14 +16,16 @@
- +
- +
@@ -31,13 +35,17 @@
{foreach $authorizes as $authorize} {if in_array($authorize['id'],$vo['authorize'])} - + {else} - + {/if} {/foreach} {if empty($authorizes)} - 尚未配置权限 + 未配置权限 {/if}
@@ -46,11 +54,11 @@
- +
-
@@ -59,5 +67,4 @@
- diff --git a/application/admin/view/user.index.html b/application/admin/view/user.index.html index a4bf67d8c..bae437e07 100644 --- a/application/admin/view/user.index.html +++ b/application/admin/view/user.index.html @@ -16,19 +16,34 @@
- +
- +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
@@ -46,13 +61,13 @@ - - - - - - - + + + + + + + @@ -61,19 +76,29 @@ - - - - - - + + + + + -
{$vo.action} {$vo.content} {$vo.isp|default=$vo.ip}{$vo.create_at}{$vo.create_at|format_datetime}
用户账号手机号电子邮箱登录次数最后登录状态操作用户账号手机号电子邮箱登录次数最后登录状态操作
{$vo.username}{$vo.phone|default="还没有设置手机号"}{$vo.mail|default="还没有设置邮箱"}{$vo.login_num|default="从未登录"}{$vo.login_at|default="从未登录"} + + {$vo.username} + + {$vo.phone|default="还没有设置手机号"} + + {$vo.mail|default="还没有设置邮箱"} + + {$vo.login_num|default="从未登录"} + + {$vo.login_at|format_datetime|default="从未登录"} + {if $vo.status eq 0} 已禁用 {elseif $vo.status eq 1} 使用中 {/if} + {if auth("$classuri/edit")} | 编辑 @@ -107,5 +132,8 @@
{if isset($page)}

{$page}

{/if} {/if} + {/block} \ No newline at end of file diff --git a/application/admin/view/user.pass.html b/application/admin/view/user.pass.html index cf2f3ac5d..0184e87bb 100644 --- a/application/admin/view/user.pass.html +++ b/application/admin/view/user.pass.html @@ -4,9 +4,11 @@
{if $vo and $vo.username} - + {else} - + {/if}
@@ -15,7 +17,8 @@
- +
{/if} @@ -23,14 +26,16 @@
- +
- +