diff --git a/app/wechat/view/config/options_thr.html b/app/wechat/view/config/options_thr.html index 2cbf5078d..0d1d5ec61 100644 --- a/app/wechat/view/config/options_thr.html +++ b/app/wechat/view/config/options_thr.html @@ -10,7 +10,7 @@
-
qrc
+
qrc

微信昵称：{$wechat.user_nickname|default='-'}

微信类型：{$wechat.service_type|default='-'} / {$wechat.service_verify == '未认证' ? '未认证' : '已认证'}

diff --git a/composer.lock b/composer.lock index 68cd00aed..50bcd2981 100644 --- a/composer.lock +++ b/composer.lock @@ -937,12 +937,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "810b66ebea4a261549df9163df0430f7794143fe" + "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/810b66ebea4a261549df9163df0430f7794143fe", - "reference": "810b66ebea4a261549df9163df0430f7794143fe", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3feaa83edec0dc5d4979f5eeb2eff872678bedec", + "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec", "shasum": "", "mirrors": [ { @@ -987,7 +987,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://thinkadmin.top", - "time": "2020-08-20T10:09:01+00:00" + "time": "2020-08-21T03:31:56+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 933ae338b..66670afbf 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -963,12 +963,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "810b66ebea4a261549df9163df0430f7794143fe" + "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/810b66ebea4a261549df9163df0430f7794143fe", - "reference": "810b66ebea4a261549df9163df0430f7794143fe", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3feaa83edec0dc5d4979f5eeb2eff872678bedec", + "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec", "shasum": "", "mirrors": [ { @@ -985,7 +985,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-08-20T10:09:01+00:00", + "time": "2020-08-21T03:31:56+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 58e5b7444..7260fcbd5 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php index 2204b31f1..d1d5b64b5 100644 --- a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php +++ b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php @@ -28,47 +28,36 @@ class ValidateHelper extends Helper /** * 快捷输入并验证（ 支持 规则 # 别名 ） * @param array $rules 验证规则（ 验证信息数组 ） - * @param string $type 输入方式 ( post. 或 get. ) + * @param string|array $input 输入内容 ( post. 或 get. ) * @return array - * age.max:100 => message // 最大值限定 + * age.require => message // 最大值限定 + * age.between:1,120 => message // 范围限定 * name.require => message // 必填内容 - * name.between:1,120 => message // 范围限定 - * name.value => value // 固定字段数值内容 * name.default => 100 // 获取并设置默认值 + * region.value => value // 固定字段数值内容 * 更多规则参照 ThinkPHP 官方的验证类 */ - public function init(array $rules, $type = '') + public function init(array $rules, $input = ''): array { - list($data, $rule, $info, $alias) = [[], [], [], '']; - foreach ($rules as $name => $message) { - if (stripos($name, '#') !== false) { - list($name, $alias) = explode('#', $name); - } - if (stripos($name, '.') === false) { - if (is_numeric($name)) { - $field = $message; - if (is_string($message) && stripos($message, '#') !== false) { - list($name, $alias) = explode('#', $message); - $field = empty($alias) ? $name : $alias; - } - $data[$name] = input("{$type}{$field}"); - } else { - $data[$name] = $message; - } + if (is_string($input)) { + $input = trim($input, '.') ?: 'request'; + $input = $this->app->request->$input(); + } + [$data, $rule, $info] = [[], [], []]; + foreach ($rules as $name => $message) if (is_numeric($name)) { + [$name, $alias] = explode('#', $message . '#'); + $data[$name] = $input[($alias ?: $name)] ?? null; + } elseif (strpos($name, '.') === false) { + $data[$name] = $message; + } elseif (preg_match('|^(.*?)\.(.*?)#(.*?)#?$|', $name . '#', $matches)) { + [, $_key, $_rule, $alias] = $matches; + if (in_array($_rule, ['value', 'default'])) { + if ($_rule === 'value') $data[$_key] = $message; + elseif ($_rule === 'default') $data[$_key] = $input[($alias ?: $_key)] ?? $message; } else { - list($_rgx) = explode(':', $name); - list($_key, $_rule) = explode('.', $name); - if (in_array($_rule, ['value', 'default'])) { - if ($_rule === 'value') { - $data[$_key] = $message; - } elseif ($_rule === 'default') { - $data[$_key] = input($type . ($alias ?: $_key), $message); - } - } else { - $info[$_rgx] = $message; - $data[$_key] = $data[$_key] ?? input($type . ($alias ?: $_key)); - $rule[$_key] = empty($rule[$_key]) ? $_rule : "{$rule[$_key]}|{$_rule}"; - } + $info[strstr($name, ':', true)] = $message; + $data[$_key] = $data[$_key] ?? ($input[($alias ?: $_key)] ?? null); + $rule[$_key] = isset($rule[$_key]) ? ($rule[$_key] . '|' . $_rule) : $_rule; } } $validate = new Validate();