From c8c1573c272ca6b9381892f6b069cb69133c0bf0 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 26 Feb 2024 22:22:59 +0800 Subject: [PATCH 01/25] =?UTF-8?q?docs:=20=E6=8C=89=E7=85=A7=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9API=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=8B=E6=8E=A7=E5=88=B6=E5=99=A8=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=9A=84=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Common.php | 10 +++--- application/api/controller/Ems.php | 10 +++--- application/api/controller/Sms.php | 10 +++--- application/api/controller/User.php | 44 ++++++++++++------------- application/api/controller/Validate.php | 32 +++++++++--------- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index 6ffd1a5a7..e90476f30 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -38,9 +38,9 @@ class Common extends Api /** * 加载初始化 * - * @param string $version 版本号 - * @param string $lng 经度 - * @param string $lat 纬度 + * @ApiParams (name="version", type="string", required=true, description="版本号") + * @ApiParams (name="lng", type="string", required=true, description="经度") + * @ApiParams (name="lat", type="string", required=true, description="纬度") */ public function init() { @@ -80,7 +80,7 @@ class Common extends Api /** * 上传文件 * @ApiMethod (POST) - * @param File $file 文件流 + * @ApiParams (name="file", type="File", required=true, description="文件流") */ public function upload() { @@ -148,7 +148,7 @@ class Common extends Api /** * 验证码 - * @param $id + * @ApiParams (name="id", type="string", required=true, description="要生成验证码的标识") * @return \think\Response */ public function captcha($id = "") diff --git a/application/api/controller/Ems.php b/application/api/controller/Ems.php index 68f336cf4..01123ebb5 100644 --- a/application/api/controller/Ems.php +++ b/application/api/controller/Ems.php @@ -24,8 +24,8 @@ class Ems extends Api * 发送验证码 * * @ApiMethod (POST) - * @param string $email 邮箱 - * @param string $event 事件名称 + * @ApiParams (name="email", type="string", required=true, description="邮箱") + * @ApiParams (name="event", type="string", required=true, description="事件名称") */ public function send() { @@ -68,9 +68,9 @@ class Ems extends Api * 检测验证码 * * @ApiMethod (POST) - * @param string $email 邮箱 - * @param string $event 事件名称 - * @param string $captcha 验证码 + * @ApiParams (name="email", type="string", required=true, description="邮箱") + * @ApiParams (name="event", type="string", required=true, description="事件名称") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") */ public function check() { diff --git a/application/api/controller/Sms.php b/application/api/controller/Sms.php index 373b1299c..a5010cb48 100644 --- a/application/api/controller/Sms.php +++ b/application/api/controller/Sms.php @@ -19,8 +19,8 @@ class Sms extends Api * 发送验证码 * * @ApiMethod (POST) - * @param string $mobile 手机号 - * @param string $event 事件名称 + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="event", type="string", required=true, description="事件名称") */ public function send() { @@ -67,9 +67,9 @@ class Sms extends Api * 检测验证码 * * @ApiMethod (POST) - * @param string $mobile 手机号 - * @param string $event 事件名称 - * @param string $captcha 验证码 + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="event", type="string", required=true, description="事件名称") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") */ public function check() { diff --git a/application/api/controller/User.php b/application/api/controller/User.php index d77a67ade..d26901679 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -39,8 +39,8 @@ class User extends Api * 会员登录 * * @ApiMethod (POST) - * @param string $account 账号 - * @param string $password 密码 + * @ApiParams (name="account", type="string", required=true, description="账号") + * @ApiParams (name="password", type="string", required=true, description="密码") */ public function login() { @@ -62,8 +62,8 @@ class User extends Api * 手机验证码登录 * * @ApiMethod (POST) - * @param string $mobile 手机号 - * @param string $captcha 验证码 + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") */ public function mobilelogin() { @@ -101,11 +101,11 @@ class User extends Api * 注册会员 * * @ApiMethod (POST) - * @param string $username 用户名 - * @param string $password 密码 - * @param string $email 邮箱 - * @param string $mobile 手机号 - * @param string $code 验证码 + * @ApiParams (name="username", type="string", required=true, description="用户名") + * @ApiParams (name="password", type="string", required=true, description="密码") + * @ApiParams (name="email", type="string", required=true, description="邮箱") + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="code", type="string", required=true, description="验证码") */ public function register() { @@ -153,10 +153,10 @@ class User extends Api * 修改会员个人信息 * * @ApiMethod (POST) - * @param string $avatar 头像地址 - * @param string $username 用户名 - * @param string $nickname 昵称 - * @param string $bio 个人简介 + * @ApiParams (name="avatar", type="string", required=true, description="头像地址") + * @ApiParams (name="username", type="string", required=true, description="用户名") + * @ApiParams (name="nickname", type="string", required=true, description="昵称") + * @ApiParams (name="bio", type="string", required=true, description="个人简介") */ public function profile() { @@ -189,8 +189,8 @@ class User extends Api * 修改邮箱 * * @ApiMethod (POST) - * @param string $email 邮箱 - * @param string $captcha 验证码 + * @ApiParams (name="email", type="string", required=true, description="邮箱") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") */ public function changeemail() { @@ -224,8 +224,8 @@ class User extends Api * 修改手机号 * * @ApiMethod (POST) - * @param string $mobile 手机号 - * @param string $captcha 验证码 + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") */ public function changemobile() { @@ -259,8 +259,8 @@ class User extends Api * 第三方登录 * * @ApiMethod (POST) - * @param string $platform 平台名称 - * @param string $code Code码 + * @ApiParams (name="platform", type="string", required=true, description="平台名称") + * @ApiParams (name="code", type="string", required=true, description="Code码") */ public function third() { @@ -291,9 +291,9 @@ class User extends Api * 重置密码 * * @ApiMethod (POST) - * @param string $mobile 手机号 - * @param string $newpassword 新密码 - * @param string $captcha 验证码 + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="newpassword", type="string", required=true, description="新密码") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") */ public function resetpwd() { diff --git a/application/api/controller/Validate.php b/application/api/controller/Validate.php index adb36d0ff..6538f8d84 100644 --- a/application/api/controller/Validate.php +++ b/application/api/controller/Validate.php @@ -23,8 +23,8 @@ class Validate extends Api * 检测邮箱 * * @ApiMethod (POST) - * @param string $email 邮箱 - * @param string $id 排除会员ID + * @ApiParams (name="email", type="string", required=true, description="邮箱") + * @ApiParams (name="id", type="string", required=true, description="排除会员ID") */ public function check_email_available() { @@ -41,8 +41,8 @@ class Validate extends Api * 检测用户名 * * @ApiMethod (POST) - * @param string $username 用户名 - * @param string $id 排除会员ID + * @ApiParams (name="username", type="string", required=true, description="用户名") + * @ApiParams (name="id", type="string", required=true, description="排除会员ID") */ public function check_username_available() { @@ -59,8 +59,8 @@ class Validate extends Api * 检测昵称 * * @ApiMethod (POST) - * @param string $nickname 昵称 - * @param string $id 排除会员ID + * @ApiParams (name="nickname", type="string", required=true, description="昵称") + * @ApiParams (name="id", type="string", required=true, description="排除会员ID") */ public function check_nickname_available() { @@ -77,8 +77,8 @@ class Validate extends Api * 检测手机 * * @ApiMethod (POST) - * @param string $mobile 手机号 - * @param string $id 排除会员ID + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="id", type="string", required=true, description="排除会员ID") */ public function check_mobile_available() { @@ -95,7 +95,7 @@ class Validate extends Api * 检测手机 * * @ApiMethod (POST) - * @param string $mobile 手机号 + * @ApiParams (name="mobile", type="string", required=true, description="手机号") */ public function check_mobile_exist() { @@ -111,7 +111,7 @@ class Validate extends Api * 检测邮箱 * * @ApiMethod (POST) - * @param string $mobile 邮箱 + * @ApiParams (name="email", type="string", required=true, description="邮箱") */ public function check_email_exist() { @@ -127,9 +127,9 @@ class Validate extends Api * 检测手机验证码 * * @ApiMethod (POST) - * @param string $mobile 手机号 - * @param string $captcha 验证码 - * @param string $event 事件 + * @ApiParams (name="mobile", type="string", required=true, description="手机号") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") + * @ApiParams (name="event", type="string", required=true, description="事件") */ public function check_sms_correct() { @@ -146,9 +146,9 @@ class Validate extends Api * 检测邮箱验证码 * * @ApiMethod (POST) - * @param string $email 邮箱 - * @param string $captcha 验证码 - * @param string $event 事件 + * @ApiParams (name="email", type="string", required=true, description="邮箱") + * @ApiParams (name="captcha", type="string", required=true, description="验证码") + * @ApiParams (name="event", type="string", required=true, description="事件") */ public function check_ems_correct() { -- Gitee From ee0be09841c553ed8e32c469477678f165bbed8f Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 26 Feb 2024 22:34:06 +0800 Subject: [PATCH 02/25] =?UTF-8?q?style:=20=E5=8E=BB=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Common.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index e90476f30..4113a7d77 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -38,9 +38,9 @@ class Common extends Api /** * 加载初始化 * - * @ApiParams (name="version", type="string", required=true, description="版本号") - * @ApiParams (name="lng", type="string", required=true, description="经度") - * @ApiParams (name="lat", type="string", required=true, description="纬度") + * @ApiParams (name="version", type="string", required=true, description="版本号") + * @ApiParams (name="lng", type="string", required=true, description="经度") + * @ApiParams (name="lat", type="string", required=true, description="纬度") */ public function init() { -- Gitee From 5400c6ff2ad564e36a77ae76b4080b885d83f8cd Mon Sep 17 00:00:00 2001 From: Karson Date: Tue, 3 Sep 2024 10:20:59 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/auth/admin/edit.html | 2 +- application/admin/view/auth/rule/edit.html | 6 ++--- application/admin/view/category/edit.html | 4 ++-- .../admin/view/general/attachment/edit.html | 10 ++++----- application/admin/view/user/group/edit.html | 2 +- application/admin/view/user/rule/edit.html | 2 +- application/admin/view/user/user/edit.html | 22 +++++++++---------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application/admin/view/auth/admin/edit.html b/application/admin/view/auth/admin/edit.html index a36d0096f..20c7a45db 100644 --- a/application/admin/view/auth/admin/edit.html +++ b/application/admin/view/auth/admin/edit.html @@ -39,7 +39,7 @@
- +
diff --git a/application/admin/view/auth/rule/edit.html b/application/admin/view/auth/rule/edit.html index 658a408b1..0aee82fbd 100644 --- a/application/admin/view/auth/rule/edit.html +++ b/application/admin/view/auth/rule/edit.html @@ -34,8 +34,8 @@
- - + + {:__('Search icon')}
@@ -67,7 +67,7 @@
- +
diff --git a/application/admin/view/category/edit.html b/application/admin/view/category/edit.html index 4beea83d8..61c3ae971 100644 --- a/application/admin/view/category/edit.html +++ b/application/admin/view/category/edit.html @@ -52,7 +52,7 @@
- +
@@ -77,7 +77,7 @@
- +
diff --git a/application/admin/view/general/attachment/edit.html b/application/admin/view/general/attachment/edit.html index 9ae1b4ba7..b27e07718 100644 --- a/application/admin/view/general/attachment/edit.html +++ b/application/admin/view/general/attachment/edit.html @@ -22,13 +22,13 @@
- +
- +
@@ -40,7 +40,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -76,7 +76,7 @@
- +
diff --git a/application/admin/view/user/group/edit.html b/application/admin/view/user/group/edit.html index 075ce123f..bc7a9e362 100644 --- a/application/admin/view/user/group/edit.html +++ b/application/admin/view/user/group/edit.html @@ -1,6 +1,6 @@
{:token()} - +
diff --git a/application/admin/view/user/rule/edit.html b/application/admin/view/user/rule/edit.html index 7b1978ec2..a570686ff 100644 --- a/application/admin/view/user/rule/edit.html +++ b/application/admin/view/user/rule/edit.html @@ -33,7 +33,7 @@
- +
diff --git a/application/admin/view/user/user/edit.html b/application/admin/view/user/user/edit.html index 73914f40c..f7c50f841 100644 --- a/application/admin/view/user/user/edit.html +++ b/application/admin/view/user/user/edit.html @@ -1,6 +1,6 @@ {:token()} - +
@@ -41,7 +41,7 @@
- +
@@ -54,7 +54,7 @@
- +
@@ -66,7 +66,7 @@
- +
@@ -78,25 +78,25 @@
- +
- +
- +
- +
@@ -114,19 +114,19 @@
- +
- +
- +
-- Gitee From c5285b8fddbd6959573bbc79af0d6cf52e8c2407 Mon Sep 17 00:00:00 2001 From: Karson Date: Tue, 3 Sep 2024 10:22:34 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Ajax.php | 16 ++++++++++++++-- application/index/controller/Ajax.php | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php index 3513eb168..a1626c468 100644 --- a/application/admin/controller/Ajax.php +++ b/application/admin/controller/Ajax.php @@ -11,6 +11,7 @@ use think\Cache; use think\Config; use think\Db; use think\Lang; +use think\Loader; use think\Response; use think\Validate; @@ -47,9 +48,20 @@ class Ajax extends Backend $header['Expires'] = gmdate("D, d M Y H:i:s", time() + $offset) . " GMT"; } + $controllername = $this->request->get('controllername'); + $lang = $this->request->get('lang'); + if (!$lang || !in_array($lang, config('allow_lang_list')) || !$controllername || !preg_match("/^[a-z0-9\.]+$/i", $controllername)) { + return jsonp(['errmsg' => '参数错误'], 200, [], ['json_encode_param' => JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE]); + } + $controllername = input("controllername"); - //默认只加载了控制器对应的语言名，你还根据控制器名来加载额外的语言包 - $this->loadlang($controllername); + $className = Loader::parseClass($this->request->module(), 'controller', $controllername, false); + + //存在对应的类才加载 + if (class_exists($className)) { + $this->loadlang($controllername); + } + return jsonp(Lang::get(), 200, $header, ['json_encode_param' => JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE]); } diff --git a/application/index/controller/Ajax.php b/application/index/controller/Ajax.php index 967f9077b..3e1f24a13 100644 --- a/application/index/controller/Ajax.php +++ b/application/index/controller/Ajax.php @@ -4,6 +4,7 @@ namespace app\index\controller; use app\common\controller\Frontend; use think\Lang; +use think\Loader; use think\Response; /** @@ -31,8 +32,20 @@ class Ajax extends Frontend $header['Expires'] = gmdate("D, d M Y H:i:s", time() + $offset) . " GMT"; } + $controllername = $this->request->get('controllername'); + $lang = $this->request->get('lang'); + if (!$lang || !in_array($lang, config('allow_lang_list')) || !$controllername || !preg_match("/^[a-z0-9\.]+$/i", $controllername)) { + return jsonp(['errmsg' => '参数错误'], 200, [], ['json_encode_param' => JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE]); + } + $controllername = input("controllername"); - $this->loadlang($controllername); + $className = Loader::parseClass($this->request->module(), 'controller', $controllername, false); + + //存在对应的类才加载 + if (class_exists($className)) { + $this->loadlang($controllername); + } + //强制输出JSON Object return jsonp(Lang::get(), 200, $header, ['json_encode_param' => JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE]); } -- Gitee From e7c1922cf3e5d555eee33ff65b501c91ee31e9c6 Mon Sep 17 00:00:00 2001 From: Karson Date: Tue, 3 Sep 2024 10:23:19 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common/library/Auth.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/common/library/Auth.php b/application/common/library/Auth.php index f8a92a1cc..f3ed90f6d 100644 --- a/application/common/library/Auth.php +++ b/application/common/library/Auth.php @@ -221,7 +221,13 @@ class Auth $this->setError('Account is locked'); return false; } + + if ($user->loginfailure >= 10 && time() - $user->loginfailuretime < 86400) { + $this->setError('Please try again after 1 day'); + } + if ($user->password != $this->getEncryptPassword($password, $user->salt)) { + $user->save(['loginfailure' => $user->loginfailure + 1, 'loginfailuretime' => time()]); $this->setError('Password is incorrect'); return false; } -- Gitee From 7f54960449d920fee0bab41cc6febc0b8c883766 Mon Sep 17 00:00:00 2001 From: Karson Date: Tue, 3 Sep 2024 10:27:24 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E4=BC=98=E5=8C=96PHP=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Install.php | 6 +++--- application/admin/command/Install/zh-cn.php | 2 +- composer.json | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/application/admin/command/Install.php b/application/admin/command/Install.php index 07d35593d..83ff9d645 100644 --- a/application/admin/command/Install.php +++ b/application/admin/command/Install.php @@ -70,7 +70,7 @@ class Install extends Command $adminName = $this->installation($hostname, $hostport, $database, $username, $password, $prefix, $adminUsername, $adminPassword, $adminEmail, $siteName); if ($adminName) { - $output->highlight("Admin url:http://www.yoursite.com/{$adminName}"); + $output->highlight("Admin url:http://www.example.com/{$adminName}"); } $output->highlight("Admin username:{$adminUsername}"); @@ -309,8 +309,8 @@ class Install extends Command //数据库配置文件 $dbConfigFile = APP_PATH . 'database.php'; - if (version_compare(PHP_VERSION, '7.2.0', '<')) { - throw new Exception(__("The current version %s is too low, please use PHP 7.2 or higher", PHP_VERSION)); + if (version_compare(PHP_VERSION, '7.4.0', '<')) { + throw new Exception(__("The current version %s is too low, please use PHP 7.4 or higher", PHP_VERSION)); } if (!extension_loaded("PDO")) { throw new Exception(__("PDO is not currently installed and cannot be installed")); diff --git a/application/admin/command/Install/zh-cn.php b/application/admin/command/Install/zh-cn.php index 46326bbc1..0e3658e20 100644 --- a/application/admin/command/Install/zh-cn.php +++ b/application/admin/command/Install/zh-cn.php @@ -27,7 +27,7 @@ return [ 'Password is too weak' => '密码太简单，请重新输入', 'The two passwords you entered did not match' => '两次输入的密码不一致', 'Please input correct website' => '网站名称输入不正确', - 'The current version %s is too low, please use PHP 7.1 or higher' => '当前版本%s过低，请使用PHP7.1以上版本', + 'The current version %s is too low, please use PHP 7.4 or higher' => '当前版本%s过低，请使用PHP7.4及以上版本', 'PDO is not currently installed and cannot be installed' => '当前未开启PDO，无法进行安装', 'The current permissions are insufficient to write the file %s' => '当前权限不足，无法写入文件%s', 'Please go to the official website to download the full package or resource package and try to install' => '当前代码仅包含核心代码，请前往官网下载完整包或资源包覆盖后再尝试安装', diff --git a/composer.json b/composer.json index fabc437df..f6e795d75 100755 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": ">=7.2.0", + "php": ">=7.4.0", "topthink/framework": "dev-master", "topthink/think-captcha": "^1.0.9", "topthink/think-installer": "^1.0.14", @@ -38,6 +38,11 @@ "easywechat-composer/easywechat-composer": true } }, + "autoload": { + "psr-4": { + "addons\\": "addons/" + } + }, "repositories": [ { "type": "git", -- Gitee From 028a0b5f22862cb628821ccde1ba402711f442ff Mon Sep 17 00:00:00 2001 From: Karson Date: Tue, 3 Sep 2024 10:27:56 +0800 Subject: [PATCH 07/25] =?UTF-8?q?Fieldlist=E6=96=B0=E5=A2=9E=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E7=BB=84=E4=BF=9D=E5=AD=98=E5=92=8C=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E7=A9=BA=E6=95=B0=E6=8D=AE=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/js/require-form.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js index a4ba212f8..d88b7b4e2 100755 --- a/public/assets/js/require-form.js +++ b/public/assets/js/require-form.js @@ -321,16 +321,28 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio } data[match[1]][match[2]] = j.value; }); - var result = template ? [] : {}; + //使用数组保存 + var usearray = container.data("usearray") || false; + //保留空数据 + var keepempty = container.data("keepempty") || false; + + var result = template || usearray ? [] : {}; + var keys = Object.keys(Object.values(data)[0] || {}); + + var isassociative = !usearray && keys.indexOf("value") > -1 && (keys.length === 1 || (keys.length === 2 && keys.indexOf("key") > -1)); + if(isassociative && keys.length ===2){ + result = {}; + } + $.each(data, function (i, j) { if (j) { - var keys = Object.keys(j); - if (keys.indexOf("value") > -1 && (keys.length === 1 || (keys.length === 2 && keys.indexOf("key") > -1))) { + if (isassociative) { if (keys.length === 2) { - if (j.key != '') { + if (j.key != '' || keepempty) { result['__PLACEHOLDKEY__' + j.key] = j.value; } } else { + //一维数组 result.push(j.value); } } else { -- Gitee From 6d4aaf5ea8766d969c9fcf57f960f6bc45f3a4dd Mon Sep 17 00:00:00 2001 From: Karson Date: Thu, 4 Jul 2024 15:27:26 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8F=91=E9=80=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # application/api/controller/Ems.php --- application/api/controller/Ems.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/application/api/controller/Ems.php b/application/api/controller/Ems.php index 01123ebb5..6b76949c6 100644 --- a/application/api/controller/Ems.php +++ b/application/api/controller/Ems.php @@ -33,6 +33,25 @@ class Ems extends Api $event = $this->request->post("event"); $event = $event ? $event : 'register'; + if (!$email || !filter_var($email, FILTER_VALIDATE_EMAIL)) { + $this->error(__('邮箱格式错误')); + } + if (!preg_match("/^[a-z0-9_\-]{3,30}\$/i", $event)) { + $this->error(__('事件名称错误')); + } + + //发送前验证码 + if (config('fastadmin.user_api_captcha')) { + + if (!preg_match("/^[a-z0-9]{4,6}\$/i", $captcha)) { + $this->error(__('验证码格式错误')); + } + + if (!\think\Validate::is($captcha, 'captcha')) { + $this->error("验证码不正确"); + } + } + $last = Emslib::get($email, $event); if ($last && time() - $last['createtime'] < 60) { $this->error(__('发送频繁')); @@ -79,6 +98,17 @@ class Ems extends Api $event = $event ? $event : 'register'; $captcha = $this->request->post("captcha"); + if (!$email || !filter_var($email, FILTER_VALIDATE_EMAIL)) { + $this->error(__('邮箱格式错误')); + } + if (!preg_match("/^[a-z0-9_\-]{3,30}\$/i", $event)) { + $this->error(__('事件名称错误')); + } + + if (!preg_match("/^[a-z0-9]{4,6}\$/i", $captcha)) { + $this->error(__('验证码格式错误')); + } + if ($event) { $userinfo = User::getByEmail($email); if ($event == 'register' && $userinfo) { -- Gitee From 54d6e0904b809a2ce4fe6513e24733186937a025 Mon Sep 17 00:00:00 2001 From: Karson Date: Thu, 25 Jul 2024 14:51:18 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=B5=84=E6=BA=90=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Install.php | 2 +- application/admin/command/Install/install.html | 2 +- application/admin/command/Install/zh-cn.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/admin/command/Install.php b/application/admin/command/Install.php index 83ff9d645..135770d27 100644 --- a/application/admin/command/Install.php +++ b/application/admin/command/Install.php @@ -86,7 +86,7 @@ class Install extends Command */ public function index() { - $this->view = View::instance(Config::get('template'), Config::get('view_replace_str')); + $this->view = View::instance(array_merge(Config::get('template'), ['tpl_cache' => false])); $this->request = Request::instance(); define('INSTALL_PATH', APP_PATH . 'admin' . DS . 'command' . DS . 'Install' . DS); diff --git a/application/admin/command/Install/install.html b/application/admin/command/Install/install.html index 1381c80d8..6c3bca051 100644 --- a/application/admin/command/Install/install.html +++ b/application/admin/command/Install/install.html @@ -254,7 +254,7 @@ - + + - +