From ae98df79618898655c1e41dedd3b193518617109 Mon Sep 17 00:00:00 2001 From: liyukun <1099438829@qq.com> Date: Sun, 2 Jan 2022 23:15:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Admin.php | 14 ++++++------- app/admin/controller/Login.php | 2 +- app/admin/view/admin/index.html | 2 +- app/admin/view/admin/profile.html | 14 +++++-------- app/admin/view/admin/pwd.html | 14 +++++-------- app/admin/view/admin_auth/index.html | 2 +- app/admin/view/admin_log/index.html | 2 +- app/admin/view/admin_notify/index.html | 2 +- app/admin/view/admin_role/index.html | 2 +- app/admin/view/article/add.html | 2 +- app/admin/view/article/comment.html | 2 +- app/admin/view/article/edit.html | 2 +- app/admin/view/article/index.html | 2 +- app/admin/view/category/add.html | 2 +- app/admin/view/category/edit.html | 2 +- app/admin/view/category/index.html | 2 +- app/admin/view/databases/export.html | 2 +- app/admin/view/databases/import.html | 2 +- app/admin/view/friendlink/index.html | 2 +- app/admin/view/icon/index.html | 14 +++++-------- app/admin/view/images/index.html | 2 +- app/admin/view/index/index.html | 20 ++++++++----------- app/admin/view/index/main.html | 14 +++++-------- app/admin/view/invitation/index.html | 2 +- app/admin/view/login/login.html | 18 +++++++---------- app/admin/view/message/index.html | 2 +- app/admin/view/poster/index.html | 2 +- app/admin/view/public/404.html | 14 +++++-------- app/admin/view/public/error.html | 14 +++++-------- app/admin/view/public/header.html | 8 ++++---- app/admin/view/public/notice.html | 10 +++++----- app/admin/view/system_config/base.html | 14 +++++-------- app/admin/view/system_config/clear_cache.html | 14 +++++-------- app/admin/view/system_config/list.html | 2 +- app/admin/view/system_config/pay.html | 14 +++++-------- app/admin/view/system_config_tab/index.html | 2 +- app/admin/view/theme/index.html | 2 +- app/admin/view/user/index.html | 2 +- app/common/model/Admin.php | 8 ++++---- app/common/model/User.php | 2 +- app/index/controller/Login.php | 2 +- public/install/index.php | 2 +- public/template/default/pc/login/login.html | 14 ++++++------- public/template/default/pc/public/footer.html | 2 +- 44 files changed, 115 insertions(+), 159 deletions(-) diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index fe78a38..ca51f10 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -63,7 +63,7 @@ class Admin extends AuthController $form[] = Elm::input('name', '登录账号')->col(10); $form[] = Elm::input('nickname', '昵称')->col(10); $form[] = Elm::frameImage('avatar', '头像', Url::buildUrl('admin/images/index', array('fodder' => 'avatar', 'limit' => 1)))->icon("ios-image")->width('96%')->height('440px')->col(10); - $form[] = Elm::password('pwd', '密码')->col(10); + $form[] = Elm::password('password', '密码')->col(10); $form[] = Elm::input('realname', '真实姓名')->col(10); $form[] = Elm::select('role_id', '角色')->options(function () { $list = rModel::getAuthLst(); @@ -95,7 +95,7 @@ class Admin extends AuthController $form[] = Elm::input('name', '登录账号', $ainfo['name'])->col(10); $form[] = Elm::input('nickname', '昵称', $ainfo['nickname'])->col(10); $form[] = Elm::frameImage('avatar', '头像', Url::buildUrl('admin/images/index', array('fodder' => 'avatar', 'limit' => 1)), $ainfo['avatar'])->icon("ios-image")->width('96%')->height('440px')->col(10); - $form[] = Elm::password('pwd', '密码', $ainfo['pwd'])->col(10); + $form[] = Elm::password('password', '密码', $ainfo['password'])->col(10); $form[] = Elm::input('realname', '真实姓名', $ainfo['realname'])->col(10); $form[] = Elm::select('role_id', '角色', $ainfo['role_id'])->options(function () { $list = rModel::getAuthLst(); @@ -124,7 +124,7 @@ class Admin extends AuthController ['name', ''], ['nickname', ''], ['avatar', ''], - ['pwd', ''], + ['password', ''], ['realname', ''], ['role_id', ''], ['tel', ''], @@ -132,7 +132,7 @@ class Admin extends AuthController ['status', ''] ]); if ($data['name'] == "") return app("json")->fail("登录账号不能为空"); - if ($data['pwd'] == "") return app("json")->fail("密码不能为空"); + if ($data['password'] == "") return app("json")->fail("密码不能为空"); if ($data['tel'] == "") return app("json")->fail("手机号不能为空"); if ($data['mail'] == "") return app("json")->fail("邮箱不能为空"); if (is_array($data['avatar'])) $data['avatar'] = $data['avatar'][0]; @@ -142,14 +142,14 @@ class Admin extends AuthController if ($info) { return app("json")->fail("用户已存在"); } - $data['pwd'] = md5(md5($data['pwd'])); + $data['password'] = md5(md5($data['password'])); $data['ip'] = $this->request->ip(); $data['create_user'] = $this->adminId; $data['create_time'] = time(); $res = aModel::insert($data); } else { $ainfo = aModel::get($id); - if ($ainfo['pwd'] != $data['pwd']) $data['pwd'] = md5(md5($data['pwd'])); + if ($ainfo['password'] != $data['password']) $data['password'] = md5(md5($data['password'])); $data['update_user'] = $this->adminId; $data['update_time'] = time(); $res = aModel::update($data, ['id' => $id]); @@ -181,7 +181,7 @@ class Admin extends AuthController ]); if ($data['oldpwd'] == '' || $data['newpwd'] == '') return app("json")->fail("参数有误,新旧密码为空!"); $adminInfo = aModel::get($this->adminId); - if ($adminInfo['pwd'] == md5(md5($data['oldpwd']))) return aModel::update(['pwd' => md5(md5($data['newpwd']))], ['id' => $this->adminId]) ? app("json")->success("操作成功") : app("json")->fail("操作失败"); + if ($adminInfo['password'] == md5(md5($data['oldpwd']))) return aModel::update(['password' => md5(md5($data['newpwd']))], ['id' => $this->adminId]) ? app("json")->success("操作成功") : app("json")->fail("操作失败"); return app("json")->fail("密码不正确!"); } diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php index b07c305..6a512af 100644 --- a/app/admin/controller/Login.php +++ b/app/admin/controller/Login.php @@ -34,7 +34,7 @@ class Login extends AuthController */ public function verify() { - list($account, $pwd, $verify) = Util::postMore(['account', 'pwd', 'verify'], null, true); + list($account, $pwd, $verify) = Util::postMore(['account', 'password', 'verify'], null, true); if (empty($account) || empty($pwd)) return app("json")->fail("账号、密码和验证码不能为空!"); // 验证码验证 if (!captcha_check($verify)) return app("json")->fail("验证码不正确!"); diff --git a/app/admin/view/admin/index.html b/app/admin/view/admin/index.html index d525c3a..ff8fe8f 100644 --- a/app/admin/view/admin/index.html +++ b/app/admin/view/admin/index.html @@ -1,7 +1,7 @@
-