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"}
-
+{/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')} |
+
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")}
- | 
-
-