From a034f563af94c0db4c34ea37e58ddd9e15253714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=99=E7=A0=81=E7=94=9F=E8=8A=B1?= <18523774412@qq.com> Date: Mon, 26 Jun 2023 04:18:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/routine/Config.php | 2 +- app/admin/controller/user/User.php | 4 ---- app/admin/library/crud/Helper.php | 6 +++--- app/api/controller/Install.php | 1 + app/common/library/Menu.php | 3 --- app/common/library/token/driver/Mysql.php | 16 ++++++++++++++++ app/common/model/User.php | 8 ++++---- extend/ba/ClickCaptcha.php | 5 +++++ 8 files changed, 30 insertions(+), 15 deletions(-) diff --git a/app/admin/controller/routine/Config.php b/app/admin/controller/routine/Config.php index c59c6985..fc6c0355 100644 --- a/app/admin/controller/routine/Config.php +++ b/app/admin/controller/routine/Config.php @@ -176,7 +176,7 @@ class Config extends Backend $mail->setSubject(__('This is a test email') . '-' . get_sys_config('site_name')); $mail->Body = __('Congratulations, receiving this email means that your email service has been configured correctly'); $mail->send(); - } catch (PHPMailerException $e) { + } catch (PHPMailerException) { $this->error($mail->ErrorInfo); } $this->success(__('Test mail sent successfully~')); diff --git a/app/admin/controller/user/User.php b/app/admin/controller/user/User.php index fd94cdc3..b58b13ab 100644 --- a/app/admin/controller/user/User.php +++ b/app/admin/controller/user/User.php @@ -3,13 +3,9 @@ namespace app\admin\controller\user; use Throwable; -use Exception; use ba\Random; -use think\facade\Db; use app\common\controller\Backend; use app\admin\model\User as UserModel; -use think\db\exception\PDOException; -use think\exception\ValidateException; class User extends Backend { diff --git a/app/admin/library/crud/Helper.php b/app/admin/library/crud/Helper.php index 9362097b..abc242d8 100644 --- a/app/admin/library/crud/Helper.php +++ b/app/admin/library/crud/Helper.php @@ -878,15 +878,15 @@ class Helper $key = self::formatObjectKey($key); if (is_array($item)) { $itemJson = ' ' . $key . ': {'; - foreach ($item as $ik => $iitem) { - $itemJson .= self::buildTableColumnKey($ik, $iitem); + foreach ($item as $ik => $iItem) { + $itemJson .= self::buildTableColumnKey($ik, $iItem); } $itemJson = rtrim($itemJson, ','); $itemJson .= ' }'; } else { if ($item === 'false') { $itemJson = ' ' . $key . ': false,'; - } elseif (in_array($key, ['label', 'width', 'buttons'], true) || strpos($item, "t('") === 0 || strpos($item, "t(\"") === 0) { + } elseif (in_array($key, ['label', 'width', 'buttons'], true) || str_starts_with($item, "t('") || str_starts_with($item, "t(\"")) { $itemJson = ' ' . $key . ': ' . $item . ','; } else { $itemJson = ' ' . $key . ': \'' . $item . '\','; diff --git a/app/api/controller/Install.php b/app/api/controller/Install.php index f77fbc65..26e97a04 100644 --- a/app/api/controller/Install.php +++ b/app/api/controller/Install.php @@ -78,6 +78,7 @@ class Install extends Api /** * 命令执行窗口 + * @throws Throwable */ public function terminal() { diff --git a/app/common/library/Menu.php b/app/common/library/Menu.php index 3eb5d6d0..f9d75aaf 100644 --- a/app/common/library/Menu.php +++ b/app/common/library/Menu.php @@ -5,9 +5,6 @@ namespace app\common\library; use Throwable; use app\admin\model\AdminRule; use app\admin\model\UserRule; -use think\db\exception\DbException; -use think\db\exception\DataNotFoundException; -use think\db\exception\ModelNotFoundException; /** * 后台菜单类 diff --git a/app/common/library/token/driver/Mysql.php b/app/common/library/token/driver/Mysql.php index 701b4413..a632d931 100644 --- a/app/common/library/token/driver/Mysql.php +++ b/app/common/library/token/driver/Mysql.php @@ -2,6 +2,7 @@ namespace app\common\library\token\driver; +use Throwable; use think\Response; use think\facade\Db; use think\facade\Cache; @@ -37,6 +38,9 @@ class Mysql extends Driver } } + /** + * @throws Throwable + */ public function set(string $token, string $type, int $user_id, int $expire = null): bool { if (is_null($expire)) { @@ -56,6 +60,9 @@ class Mysql extends Driver return true; } + /** + * @throws Throwable + */ public function get(string $token, bool $expirationException = true): array { $data = $this->handler->where('token', $this->getEncryptedToken($token))->find(); @@ -74,6 +81,9 @@ class Mysql extends Driver return $data; } + /** + * @throws Throwable + */ public function check(string $token, string $type, int $user_id, bool $expirationException = true): bool { $data = $this->get($token, $expirationException); @@ -81,12 +91,18 @@ class Mysql extends Driver return $data['type'] == $type && $data['user_id'] == $user_id; } + /** + * @throws Throwable + */ public function delete(string $token): bool { $this->handler->where('token', $this->getEncryptedToken($token))->delete(); return true; } + /** + * @throws Throwable + */ public function clear(string $type, int $user_id): bool { $this->handler->where('type', $type)->where('user_id', $user_id)->delete(); diff --git a/app/common/model/User.php b/app/common/model/User.php index e984abc1..75ce0280 100644 --- a/app/common/model/User.php +++ b/app/common/model/User.php @@ -21,19 +21,19 @@ class User extends Model { protected $autoWriteTimestamp = true; - public function getAvatarAttr($value) + public function getAvatarAttr($value): string { return full_url(htmlspecialchars_decode($value), true, Config::get('buildadmin.default_avatar')); } - public function resetPassword($uid, $newPassword) + public function resetPassword($uid, $newPassword): int|User { $salt = Random::build('alnum', 16); $passwd = encrypt_password($newPassword, $salt); return $this->where(['id' => $uid])->update(['password' => $passwd, 'salt' => $salt]); } - public function getMoneyAttr($value) + public function getMoneyAttr($value): string { return bcdiv($value, 100, 2); } @@ -42,7 +42,7 @@ class User extends Model * 用户的余额是不可以直接进行修改的，请通过 UserMoneyLog 模型插入记录来实现自动修改余额 * 此处定义上 money 的修改器仅为防止直接对余额的修改造成数据错乱 */ - public function setMoneyAttr($value) + public function setMoneyAttr($value): string { return bcmul($value, 100, 2); } diff --git a/extend/ba/ClickCaptcha.php b/extend/ba/ClickCaptcha.php index 79ce9991..f4daca5c 100644 --- a/extend/ba/ClickCaptcha.php +++ b/extend/ba/ClickCaptcha.php @@ -74,6 +74,11 @@ class ClickCaptcha 'zhSet' => '们以我到他会作时要动国产的是工就年阶义发成部民可出能方进在和有大这主中为来分生对于学级地用同行面说种过命度革而多子后自社加小机也经力线本电高量长党得实家定深法表着水理化争现所起政好十战无农使性前等反体合斗路图把结第里正新开论之物从当两些还天资事队批点育重其思与间内去因件日利相由压员气业代全组数果期导平各基或月毛然如应形想制心样干都向变关问比展那它最及外没看治提五解系林者米群头意只明四道马认次文通但条较克又公孔领军流接席位情运器并飞原油放立题质指建区验活众很教决特此常石强极已根共直团统式转别造切九你取西持总料连任志观调么山程百报更见必真保热委手改管处己将修支识病象先老光专什六型具示复安带每东增则完风回南劳轮科北打积车计给节做务被整联步类集号列温装即毫知轴研单色坚据速防史拉世设达尔场织历花受求传口断况采精金界品判参层止边清至万确究书术状须离再目海交权且儿青才证低越际八试规斯近注办布门铁需走议县兵固除般引齿胜细影济白格效置推空配刀叶率述今选养德话查差半敌始片施响收华觉备名红续均药标记难存测身紧液派准斤角降维板许破述技消底床田势端感往神便贺村构照容非搞亚磨族段算适讲按值美态黄易彪服早班麦削信排台声该击素张密害侯草何树肥继右属市严径螺检左页抗苏显苦英快称坏移约巴材省黑武培著河帝仅针怎植京助升王眼她抓含苗副杂普谈围食射源例致酸旧却充足短划剂宣环落首尺波承粉践府鱼随考刻靠够满夫失包住促枝局菌杆周护岩师举曲春元超负砂封换太模贫减阳扬江析亩木言球朝医校古呢稻宋听唯输滑站另卫字鼓刚写刘微略范供阿块某功套友限项余倒卷创律雨让骨远帮初皮播优占死毒圈伟季训控激找叫云互跟裂粮粒母练塞钢顶策双留误础吸阻故寸盾晚丝女散焊功株亲院冷彻弹错散商视艺灭版烈零室轻血倍缺厘泵察绝富城冲喷壤简否柱李望盘磁雄似困巩益洲脱投送奴侧润盖挥距触星松送获兴独官混纪依未突架宽冬章湿偏纹吃执阀矿寨责熟稳夺硬价努翻奇甲预职评读背协损棉侵灰虽矛厚罗泥辟告卵箱掌氧恩爱停曾溶营终纲孟钱待尽俄缩沙退陈讨奋械载胞幼哪剥迫旋征槽倒握担仍呀鲜吧卡粗介钻逐弱脚怕盐末阴丰雾冠丙街莱贝辐肠付吉渗瑞惊顿挤秒悬姆烂森糖圣凹陶词迟蚕亿矩康遵牧遭幅园腔订香肉弟屋敏恢忘编印蜂急拿扩伤飞露核缘游振操央伍域甚迅辉异序免纸夜乡久隶缸夹念兰映沟乙吗儒杀汽磷艰晶插埃燃欢铁补咱芽永瓦倾阵碳演威附牙芽永瓦斜灌欧献顺猪洋腐请透司危括脉宜笑若尾束壮暴企菜穗楚汉愈绿拖牛份染既秋遍锻玉夏疗尖殖井费州访吹荣铜沿替滚客召旱悟刺脑措贯藏敢令隙炉壳硫煤迎铸粘探临薄旬善福纵择礼愿伏残雷延烟句纯渐耕跑泽慢栽鲁赤繁境潮横掉锥希池败船假亮谓托伙哲怀割摆贡呈劲财仪沉炼麻罪祖息车穿货销齐鼠抽画饲龙库守筑房歌寒喜哥洗蚀废纳腹乎录镜妇恶脂庄擦险赞钟摇典柄辩竹谷卖乱虚桥奥伯赶垂途额壁网截野遗静谋弄挂课镇妄盛耐援扎虑键归符庆聚绕摩忙舞遇索顾胶羊湖钉仁音迹碎伸灯避泛亡答勇频皇柳哈揭甘诺概宪浓岛袭谁洪谢炮浇斑讯懂灵蛋闭孩释乳巨徒私银伊景坦累匀霉杜乐勒隔弯绩招绍胡呼痛峰零柴簧午跳居尚秦稍追梁折耗碱殊岗挖氏刃剧堆赫荷胸衡勤膜篇登驻案刊秧缓凸役剪川雪链渔啦脸户洛孢勃盟买杨宗焦赛旗滤硅炭股坐蒸凝竟陷枪黎救冒暗洞犯筒您宋弧爆谬涂味津臂障褐陆啊健尊豆拔莫抵桑坡缝警挑污冰柬嘴啥饭塑寄赵喊垫丹渡耳刨虎笔稀昆浪萨茶滴浅拥穴覆伦娘吨浸袖珠雌妈紫戏塔锤震岁貌洁剖牢锋疑霸闪埔猛诉刷狠忽灾闹乔唐漏闻沈熔氯荒茎男凡抢像浆旁玻亦忠唱蒙予纷捕锁尤乘乌智淡允叛畜俘摸锈扫毕璃宝芯爷鉴秘净蒋钙肩腾枯抛轨堂拌爸循诱祝励肯酒绳穷塘燥泡袋朗喂铝软渠颗惯贸粪综墙趋彼届墨碍启逆卸航衣孙龄岭骗休借', ]; + /** + * 构造方法 + * @param array $config 点击验证码配置 + * @throws Throwable + */ public function __construct(array $config = []) { $clickConfig = Config::get('buildadmin.click_captcha');