-
+
公众号APPID：{$vo.authorizer_appid} 调用次数：{$vo.total}
-
+
昵称：{$vo.nick_name|default='未获取到公众号昵称 '|raw}
微信昵称
粉丝标签
- 性别语音
+ 性别语言
关注时间
- * @date 2018/08/10 11:31
*/
class Controller extends \stdClass
{
@@ -45,21 +42,33 @@ class Controller extends \stdClass
* 表单CSRF验证状态
* @var boolean
*/
- private $_isCsrf = false;
+ private $_csrf = false;
/**
* Controller constructor.
+ * @throws \think\Exception
*/
public function __construct()
{
- // 获取当前请求对象
$this->request = request();
- // 禁用访问内部方法
- if (in_array($this->request->method(), get_class_methods(__CLASS__))) {
+ if (in_array($this->request->action(), get_class_methods(__CLASS__))) {
$this->error('Access without permission.');
}
}
+ /**
+ * Controller destruct
+ */
+ public function __destruct()
+ {
+ $this->request = request();
+ $action = $this->request->action();
+ $method = strtolower($this->request->method());
+ if (method_exists($this, $callback = "_{$action}_{$method}")) {
+ call_user_func_array([$this, $callback], $this->request->route());
+ }
+ }
+
/**
* 实例方法调用
* @param string $method 函数名称
@@ -73,27 +82,11 @@ class Controller extends \stdClass
if (class_exists($name = "library\\logic\\" . ucfirst(ltrim($method, '_')))) {
return (new \ReflectionClass($name))->newInstanceArgs($arguments)->init($this);
}
- if (method_exists($this, $method)) {
- return call_user_func_array([$this, $method], $arguments);
- }
throw new \think\Exception('method not exists:' . get_class($this) . '->' . $method);
}
/**
- * 返回成功的操作
- * @param mixed $info 消息内容
- * @param array $data 返回数据
- * @param integer $code 返回代码
- */
- public function success($info, $data = [], $code = 1)
- {
- $result = ['code' => $code, 'info' => $info, 'data' => $data];
- if ($this->_isCsrf) Csrf::clearFormToken(Csrf::getToken());
- throw new \think\exception\HttpResponseException(json($result));
- }
-
- /**
- * 返回失败的请求
+ * 返回失败的操作
* @param mixed $info 消息内容
* @param array $data 返回数据
* @param integer $code 返回代码
@@ -105,14 +98,27 @@ class Controller extends \stdClass
}
/**
- * URL重定向
- * @param string $url 重定向跳转链接
- * @param array $params 重定向链接参数
- * @param integer $code 重定向跳转代码
+ * 返回成功的操作
+ * @param mixed $info 消息内容
+ * @param array $data 返回数据
+ * @param integer $code 返回代码
*/
- public function redirect($url, $params = [], $code = 301)
+ public function success($info, $data = [], $code = 1)
{
- throw new \think\exception\HttpResponseException(redirect($url, $params, $code));
+ $result = ['code' => $code, 'info' => $info, 'data' => $data];
+ if ($this->_csrf) Csrf::clearFormToken(Csrf::getToken());
+ throw new \think\exception\HttpResponseException(json($result));
+ }
+
+ /**
+ * URL重定向
+ * @param string $url 跳转链接
+ * @param array $vars 跳转参数
+ * @param integer $code 跳转代码
+ */
+ public function redirect($url, $vars = [], $code = 301)
+ {
+ throw new \think\exception\HttpResponseException(redirect($url, $vars, $code));
}
/**
@@ -124,8 +130,11 @@ class Controller extends \stdClass
public function fetch($tpl = '', $vars = [], $node = null)
{
foreach ($this as $name => $value) $vars[$name] = $value;
- if ($this->_isCsrf) Csrf::fetchTemplate($tpl, $vars, $node);
- else throw new \think\exception\HttpResponseException(view($tpl, $vars));
+ if ($this->_csrf) {
+ Csrf::fetchTemplate($tpl, $vars, $node);
+ } else {
+ throw new \think\exception\HttpResponseException(view($tpl, $vars));
+ }
}
/**
@@ -153,26 +162,33 @@ class Controller extends \stdClass
*/
public function callback($name, &$one = [], &$two = [])
{
- $methods = [$name, "_{$this->request->action()}{$name}"];
- foreach ($methods as $method) if (method_exists($this, $method)) {
- if (false === $this->$method($one, $two)) return false;
+ if (is_callable($name)) {
+ return call_user_func($name, $this, $one, $two);
+ }
+ foreach ([$name, "_{$this->request->action()}{$name}"] as $method) {
+ if (method_exists($this, $method)) {
+ if (false === $this->$method($one, $two)) {
+ return false;
+ }
+ }
}
return true;
}
/**
* 检查表单令牌验证
- * @param boolean $isRutrun
+ * @param boolean $return 是否返回结果
* @return boolean
*/
- protected function applyCsrfToken($isRutrun = false)
+ protected function applyCsrfToken($return = false)
{
- $this->_isCsrf = true;
+ $this->_csrf = true;
if ($this->request->isPost() && !Csrf::checkFormToken()) {
- if ($isRutrun) return false;
+ if ($return) return false;
$this->error('表单令牌验证失败，请刷新页面再试！');
+ } else {
+ return true;
}
- return true;
}
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/command/sync/Admin.php b/vendor/zoujingli/think-library/src/command/sync/Admin.php
index 819819f0a..bfc6e9643 100644
--- a/vendor/zoujingli/think-library/src/command/sync/Admin.php
+++ b/vendor/zoujingli/think-library/src/command/sync/Admin.php
@@ -15,6 +15,8 @@
namespace library\command\sync;
use library\command\Sync;
+use think\console\Input;
+use think\console\Output;
/**
* Class Admin
@@ -27,4 +29,15 @@ class Admin extends Sync
$this->modules = ['application/admin/', 'think'];
$this->setName('xsync:admin')->setDescription('synchronize update admin module files');
}
+
+ protected function execute(Input $input, Output $output)
+ {
+ $root = str_replace('\\', '/', env('root_path'));
+ if (file_exists("{$root}/application/admin/sync.lock")) {
+ $this->output->error('admin module has been locked');
+ } else {
+ parent::execute($input, $output);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/command/sync/Config.php b/vendor/zoujingli/think-library/src/command/sync/Config.php
index 8aa0a015b..8610913fc 100644
--- a/vendor/zoujingli/think-library/src/command/sync/Config.php
+++ b/vendor/zoujingli/think-library/src/command/sync/Config.php
@@ -15,6 +15,8 @@
namespace library\command\sync;
use library\command\Sync;
+use think\console\Input;
+use think\console\Output;
/**
* Class Config
@@ -27,4 +29,14 @@ class Config extends Sync
$this->modules = ['config/'];
$this->setName('xsync:config')->setDescription('synchronize update config php files');
}
+
+ protected function execute(Input $input, Output $output)
+ {
+ $root = str_replace('\\', '/', env('root_path'));
+ if (file_exists("{$root}/config/sync.lock")) {
+ $this->output->error('config files has been locked');
+ } else {
+ parent::execute($input, $output);
+ }
+ }
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/command/sync/Plugs.php b/vendor/zoujingli/think-library/src/command/sync/Plugs.php
index ca8f6663b..ed3a4e824 100644
--- a/vendor/zoujingli/think-library/src/command/sync/Plugs.php
+++ b/vendor/zoujingli/think-library/src/command/sync/Plugs.php
@@ -15,6 +15,8 @@
namespace library\command\sync;
use library\command\Sync;
+use think\console\Input;
+use think\console\Output;
/**
* Class Plugs
@@ -27,4 +29,14 @@ class Plugs extends Sync
$this->modules = ['public/static/'];
$this->setName('xsync:plugs')->setDescription('synchronize update plugs static files');
}
+
+ protected function execute(Input $input, Output $output)
+ {
+ $root = str_replace('\\', '/', env('root_path'));
+ if (file_exists("{$root}/public/static/sync.lock")) {
+ $this->output->error('plugs static files has been locked');
+ } else {
+ parent::execute($input, $output);
+ }
+ }
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/command/sync/Service.php b/vendor/zoujingli/think-library/src/command/sync/Service.php
index 527e0311b..89e2d2695 100644
--- a/vendor/zoujingli/think-library/src/command/sync/Service.php
+++ b/vendor/zoujingli/think-library/src/command/sync/Service.php
@@ -15,6 +15,8 @@
namespace library\command\sync;
use library\command\Sync;
+use think\console\Input;
+use think\console\Output;
/**
* Class Service
@@ -27,4 +29,14 @@ class Service extends Sync
$this->modules = ['application/service/'];
$this->setName('xsync:service')->setDescription('synchronize update service module files');
}
+
+ protected function execute(Input $input, Output $output)
+ {
+ $root = str_replace('\\', '/', env('root_path'));
+ if (file_exists("{$root}/application/service/sync.lock")) {
+ $this->output->error('service module has been locked');
+ } else {
+ parent::execute($input, $output);
+ }
+ }
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/command/sync/Wechat.php b/vendor/zoujingli/think-library/src/command/sync/Wechat.php
index 1153ad741..7fe28af6a 100644
--- a/vendor/zoujingli/think-library/src/command/sync/Wechat.php
+++ b/vendor/zoujingli/think-library/src/command/sync/Wechat.php
@@ -15,6 +15,8 @@
namespace library\command\sync;
use library\command\Sync;
+use think\console\Input;
+use think\console\Output;
/**
* Class Wechat
@@ -27,4 +29,14 @@ class Wechat extends Sync
$this->modules = ['application/wechat/'];
$this->setName('xsync:wechat')->setDescription('synchronize update wechat module files');
}
+
+ protected function execute(Input $input, Output $output)
+ {
+ $root = str_replace('\\', '/', env('root_path'));
+ if (file_exists("{$root}/application/wechat/sync.lock")) {
+ $this->output->error('wechat module has been locked');
+ } else {
+ parent::execute($input, $output);
+ }
+ }
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/common.php b/vendor/zoujingli/think-library/src/common.php
similarity index 77%
rename from vendor/zoujingli/think-library/common.php
rename to vendor/zoujingli/think-library/src/common.php
index f4a3460f0..bbacdc526 100644
--- a/vendor/zoujingli/think-library/common.php
+++ b/vendor/zoujingli/think-library/src/common.php
@@ -42,19 +42,6 @@ if (!function_exists('format_datetime')) {
}
}
-if (!function_exists('systoken')) {
- /**
- * 生成CSRF-TOKEN参数
- * @param string $node
- * @return string
- */
- function systoken($node = null)
- {
- $csrf = \library\tools\Csrf::buildFormToken($node);
- return $csrf['token'];
- }
-}
-
if (!function_exists('sysconf')) {
/**
* 设备或配置系统参数
@@ -84,6 +71,19 @@ if (!function_exists('sysconf')) {
}
}
+if (!function_exists('systoken')) {
+ /**
+ * 生成CSRF-TOKEN参数
+ * @param string $node
+ * @return string
+ */
+ function systoken($node = null)
+ {
+ $csrf = \library\tools\Csrf::buildFormToken($node);
+ return $csrf['token'];
+ }
+}
+
if (!function_exists('http_get')) {
/**
* 以get模拟网络请求
@@ -129,7 +129,6 @@ if (!function_exists('data_save')) {
}
}
-
if (!function_exists('data_batch_save')) {
/**
* 批量更新数据
@@ -149,93 +148,91 @@ if (!function_exists('data_batch_save')) {
if (!function_exists('encode')) {
/**
- * UTF8 字符串加密
- * @param string $string
+ * 加密 UTF8 字符串
+ * @param string $content
* @return string
*/
- function encode($string)
+ function encode($content)
{
- return \library\tools\Crypt::encode($string);
+ return \library\tools\Crypt::encode($content);
}
}
if (!function_exists('decode')) {
/**
- * UTF8 字符串解密
- * @param string $string
+ * 解密 UTF8 字符串
+ * @param string $content
* @return string
*/
- function decode($string)
+ function decode($content)
{
- return \library\tools\Crypt::decode($string);
+ return \library\tools\Crypt::decode($content);
}
}
if (!function_exists('emoji_encode')) {
/**
- * Emoji 表情编码
- * @param string $string
+ * 编码 Emoji 表情
+ * @param string $content
* @return string
*/
- function emoji_encode($string)
+ function emoji_encode($content)
{
- return \library\tools\Crypt::emojiEncode($string);
+ return \library\tools\Emoji::encode($content);
}
}
if (!function_exists('emoji_decode')) {
/**
- * Emoji 表情解析
- * @param string $string
+ * 解析 Emoji 表情
+ * @param string $content
* @return string
*/
- function emoji_decode($string)
+ function emoji_decode($content)
{
- return \library\tools\Crypt::emojiDecode($string);
+ return \library\tools\Emoji::decode($content);
}
}
if (!function_exists('emoji_clear')) {
/**
- * Emoji 表情清除
- * @param string $string
+ * 清除 Emoji 表情
+ * @param string $content
* @return string
*/
- function emoji_clear($string)
+ function emoji_clear($content)
{
- return \library\tools\Crypt::emojiClear($string);
+ return \library\tools\Emoji::clear($content);
}
}
// 注册跨域中间键
-\think\facade\Middleware::add(function (\think\Request $request, \Closure $next) {
+\think\facade\Middleware::add(function (\think\Request $request, \Closure $next, $header = []) {
if (($origin = $request->header('origin', '*')) !== '*') {
- header("Access-Control-Allow-Origin:{$origin}");
- header('Access-Control-Allow-Methods:GET,POST');
- header('Access-Control-Expose-Headers:User-Token-Csrf');
- header('Access-Control-Allow-Headers:Content-Type,X-Requested-With');
+ $header['Access-Control-Allow-Origin'] = $origin;
+ $header['Access-Control-Allow-Methods'] = 'GET,POST,PATCH,PUT,DELETE';
+ $header['Access-Control-Allow-Headers'] = 'Authorization,Content-Type,If-Match,If-Modified-Since,If-None-Match,If-Unmodified-Since,X-Requested-With';
+ $header['Access-Control-Expose-Headers'] = 'User-Token-Csrf';
+ }
+ if ($request->isOptions()) {
+ return \think\Response::create()->code(204)->header($header);
+ } else {
+ return $next($request)->header($header);
}
- return $request->isOptions() ? response() : $next($request);
});
// 注册系统常用指令
\think\Console::addDefaultCommands([
'library\command\Sess',
- 'library\command\task\Stop',
- 'library\command\task\State',
- 'library\command\task\Start',
- 'library\command\task\Reset',
+ 'library\command\task\Stop', 'library\command\task\State',
+ 'library\command\task\Start', 'library\command\task\Reset',
'library\command\sync\Admin',
- 'library\command\sync\Plugs',
- 'library\command\sync\Config',
- 'library\command\sync\Wechat',
- 'library\command\sync\Service',
+ 'library\command\sync\Plugs', 'library\command\sync\Config',
+ 'library\command\sync\Wechat', 'library\command\sync\Service',
]);
-// 动态加载模块配置文件
+// 动态加载模块配置
if (function_exists('think\__include_file')) {
- $ds = DIRECTORY_SEPARATOR;
- foreach (glob(env('app_path') . "{$ds}*{$ds}sys.php") as $file) {
- \think\__include_file($file);
- }
+ $root = rtrim(str_replace('\\', '/', env('app_path')), '/');
+ foreach (glob("{$root}/*/sys.php") as $file) \think\__include_file($file);
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/logic/Input.php b/vendor/zoujingli/think-library/src/logic/Input.php
index 44844ca7a..749d07a05 100644
--- a/vendor/zoujingli/think-library/src/logic/Input.php
+++ b/vendor/zoujingli/think-library/src/logic/Input.php
@@ -63,19 +63,17 @@ class Input extends Logic
private function parse($data, $result = [])
{
if (is_array($data)) return $data;
- if (is_string($data)) {
- foreach (explode(',', $data) as $field) {
- if (strpos($field, '|') === false) {
- $array = explode('.', $field);
- $result[array_pop($array)] = input($field);
- } else {
- list($key, $value) = explode('|', $field);
- $array = explode('.', $key);
- $result[array_pop($array)] = input($key, $value);
- }
+ if (is_string($data)) foreach (explode(',', $data) as $field) {
+ if (strpos($field, '#') === false) {
+ $array = explode('.', $field);
+ $result[end($array)] = input($field);
+ } else {
+ list($name, $value) = explode('#', $field);
+ $array = explode('.', $name);
+ $result[end($array)] = input($name, $value);
}
- return $result;
}
+ return $result;
}
/**
@@ -87,8 +85,11 @@ class Input extends Logic
{
$this->controller = $controller;
$validate = \think\Validate::make($this->rule, $this->info);
- if ($validate->check($this->data)) return $this->data;
- $this->controller->error($validate->getError());
+ if ($validate->check($this->data)) {
+ return $this->data;
+ } else {
+ $this->controller->error($validate->getError());
+ }
}
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/logic/Query.php b/vendor/zoujingli/think-library/src/logic/Query.php
index f41fdbf2a..d015475f2 100644
--- a/vendor/zoujingli/think-library/src/logic/Query.php
+++ b/vendor/zoujingli/think-library/src/logic/Query.php
@@ -35,6 +35,20 @@ class Query extends Logic
$this->query = $this->buildQuery($dbQuery);
}
+ /**
+ * Query call.
+ * @param string $name 调用方法名称
+ * @param array $args 调用参数内容
+ * @return $this
+ */
+ public function __call($name, $args)
+ {
+ if (is_callable($callable = [$this->query, $name])) {
+ call_user_func_array($callable, $args);
+ }
+ return $this;
+ }
+
/**
* 逻辑器初始化
* @param Controller $controller
@@ -58,16 +72,21 @@ class Query extends Logic
/**
* 设置Like查询条件
* @param string|array $fields 查询字段
- * @param string $inputType 输入类型 get|post
+ * @param string $input 输入类型 get|post
+ * @param string $alias 别名分割符
* @return $this
*/
- public function like($fields, $inputType = 'request')
+ public function like($fields, $input = 'request', $alias = '#')
{
- $data = $this->controller->request->$inputType();
+ $data = $this->controller->request->$input();
foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) {
list($dk, $qk) = [$field, $field];
- if (stripos($field, '|') !== false) list($dk, $qk) = explode('|', $field);
- if (isset($data[$qk]) && $data[$qk] !== '') $this->query->whereLike($dk, "%{$data[$qk]}%");
+ if (stripos($field, $alias) !== false) {
+ list($dk, $qk) = explode($alias, $field);
+ }
+ if (isset($data[$qk]) && $data[$qk] !== '') {
+ $this->query->whereLike($dk, "%{$data[$qk]}%");
+ }
}
return $this;
}
@@ -75,16 +94,21 @@ class Query extends Logic
/**
* 设置Equal查询条件
* @param string|array $fields 查询字段
- * @param string $inputType 输入类型 get|post
+ * @param string $input 输入类型 get|post
+ * @param string $alias 别名分割符
* @return $this
*/
- public function equal($fields, $inputType = 'request')
+ public function equal($fields, $input = 'request', $alias = '#')
{
- $data = $this->controller->request->$inputType();
+ $data = $this->controller->request->$input();
foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) {
list($dk, $qk) = [$field, $field];
- if (stripos($field, '|') !== false) list($dk, $qk) = explode('|', $field);
- if (isset($data[$qk]) && $data[$qk] !== '') $this->query->where($dk, "{$data[$qk]}");
+ if (stripos($field, $alias) !== false) {
+ list($dk, $qk) = explode($alias, $field);
+ }
+ if (isset($data[$qk]) && $data[$qk] !== '') {
+ $this->query->where($dk, "{$data[$qk]}");
+ }
}
return $this;
}
@@ -93,73 +117,101 @@ class Query extends Logic
* 设置IN区间查询
* @param string $fields 查询字段
* @param string $split 输入分隔符
- * @param string $inputType 输入类型 get|post
+ * @param string $input 输入类型 get|post
+ * @param string $alias 别名分割符
* @return $this
*/
- public function in($fields, $split = ',', $inputType = 'request')
+ public function in($fields, $split = ',', $input = 'request', $alias = '#')
{
- $data = $this->controller->request->$inputType();
+ $data = $this->controller->request->$input();
foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) {
list($dk, $qk) = [$field, $field];
- if (stripos($field, '|') !== false) list($dk, $qk) = explode('|', $field);
- if (isset($data[$qk]) && $data[$qk] !== '') $this->query->whereIn($dk, explode($split, $data[$qk]));
- }
- return $this;
- }
-
-
- /**
- * 设置DateTime区间查询
- * @param string|array $fields 查询字段
- * @param string $split 输入分隔符
- * @param string $inputType 输入类型 get|post
- * @return $this
- */
- public function dateBetween($fields, $split = ' - ', $inputType = 'request')
- {
- $data = $this->controller->request->$inputType();
- foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) {
- list($dk, $qk) = [$field, $field];
- if (stripos($field, '|') !== false) list($dk, $qk) = explode('|', $field);
+ if (stripos($field, $alias) !== false) {
+ list($dk, $qk) = explode($alias, $field);
+ }
if (isset($data[$qk]) && $data[$qk] !== '') {
- list($start, $end) = explode($split, $data[$qk]);
- $this->query->whereBetween($dk, ["{$start} 00:00:00", "{$end} 23:59:59"]);
+ $this->query->whereIn($dk, explode($split, $data[$qk]));
}
}
return $this;
}
/**
- * 设置区间查询
+ * 设置内容区间查询
* @param string|array $fields 查询字段
* @param string $split 输入分隔符
- * @param string $inputType 输入类型 get|post
+ * @param string $input 输入类型 get|post
+ * @param string $alias 别名分割符
* @return $this
*/
- public function valueBetween($fields, $split = ' ', $inputType = 'request')
+ public function valueBetween($fields, $split = ' ', $input = 'request', $alias = '#')
{
- $data = $this->controller->request->$inputType();
- foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) {
- list($dk, $qk) = [$field, $field];
- if (stripos($field, '|') !== false) list($dk, $qk) = explode('|', $field);
- if (isset($data[$qk]) && $data[$qk] !== '') {
- list($start, $end) = explode($split, $data[$field]);
- $this->query->whereBetween($dk, ["{$start}", "{$end}"]);
- }
- }
- return $this;
+ return $this->setBetweenWhere($fields, $split, $input, $alias);
}
/**
- * 魔术调用方法
- * @param string $name 调用方法名称
- * @param array $arguments 调用参数
+ * 设置日期时间区间查询
+ * @param string|array $fields 查询字段
+ * @param string $split 输入分隔符
+ * @param string $input 输入类型
+ * @param string $alias 别名分割符
* @return $this
*/
- public function __call($name, $arguments)
+ public function dateBetween($fields, $split = ' - ', $input = 'request', $alias = '#')
{
- if (method_exists($this->query, $name)) {
- call_user_func_array([$this->query, $name], $arguments);
+ return $this->setBetweenWhere($fields, $split, $input, $alias, function ($value, $type) {
+ if ($type === 'after') {
+ return "{$value} 23:59:59";
+ } else {
+ return "{$value} 00:00:00";
+ }
+ });
+ }
+
+ /**
+ * 设置时间戳区间查询
+ * @param string|array $fields 查询字段
+ * @param string $split 输入分隔符
+ * @param string $input 输入类型
+ * @param string $alias 别名分割符
+ * @return $this
+ */
+ public function timeBetween($fields, $split = ' - ', $input = 'request', $alias = '#')
+ {
+ return $this->setBetweenWhere($fields, $split, $input, $alias, function ($value, $type) {
+ if ($type === 'after') {
+ return strtotime("{$value} 23:59:59");
+ } else {
+ return strtotime("{$value} 00:00:00");
+ }
+ });
+ }
+
+ /**
+ * 设置区域查询条件
+ * @param string|array $fields 查询字段
+ * @param string $split 输入分隔符
+ * @param string $input 输入类型
+ * @param string $alias 别名分割符
+ * @param callable $callback
+ * @return $this
+ */
+ private function setBetweenWhere($fields, $split = ' ', $input = 'request', $alias = '#', $callback = null)
+ {
+ $data = $this->controller->request->$input();
+ foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) {
+ list($dk, $qk) = [$field, $field];
+ if (stripos($field, $alias) !== false) {
+ list($dk, $qk) = explode($alias, $field);
+ }
+ if (isset($data[$qk]) && $data[$qk] !== '') {
+ list($begin, $after) = explode($split, $data[$field]);
+ if (is_callable($callback)) {
+ $after = call_user_func($callback, $after, 'after');
+ $begin = call_user_func($callback, $begin, 'begin');
+ }
+ $this->query->whereBetween($dk, [$begin, $after]);
+ }
}
return $this;
}
@@ -181,5 +233,4 @@ class Query extends Logic
{
return (new Page($this->query, $isPage, $isDisplay, $total, $limit))->init($this->controller);
}
-
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/tools/Crypt.php b/vendor/zoujingli/think-library/src/tools/Crypt.php
index 3e0953e0e..f3cdd6bde 100644
--- a/vendor/zoujingli/think-library/src/tools/Crypt.php
+++ b/vendor/zoujingli/think-library/src/tools/Crypt.php
@@ -41,44 +41,25 @@ class Crypt
public static function decode($encode)
{
$chars = '';
- foreach (str_split($encode, 2) as $char) $chars .= chr(intval(base_convert($char, 36, 10)));
+ foreach (str_split($encode, 2) as $char) {
+ $chars .= chr(intval(base_convert($char, 36, 10)));
+ }
return iconv('GBK//TRANSLIT', 'UTF-8', $chars);
}
/**
- * Emoji原形转换为String
- * @param string $content
- * @return string
+ * 静态调用方法处理
+ * @param string $name
+ * @param string $args
+ * @return mixed
*/
- public static function emojiEncode($content)
+ public static function __callStatic($name, $args)
{
- return json_decode(preg_replace_callback("/(\\\u[ed][0-9a-f]{3})/i", function ($string) {
- return addslashes($string[0]);
- }, json_encode($content)));
+ if (stripos($name, 'emoji') === 0) {
+ $method = str_replace('emoji', '', strtolower($name));
+ if (in_array($method, ['encode', 'decode', 'clear'])) {
+ return Emoji::$method($args[0]);
+ }
+ }
}
-
- /**
- * Emoji字符串转换为原形
- * @param string $content
- * @return string
- */
- public static function emojiDecode($content)
- {
- return json_decode(preg_replace_callback('/\\\\\\\\/i', function () {
- return '\\';
- }, json_encode($content)));
- }
-
- /**
- * Emoji字符串清清理
- * @param string $content
- * @return string
- */
- public static function emojiClear($content)
- {
- return preg_replace_callback('/./u', function (array $match) {
- return strlen($match[0]) >= 4 ? '' : $match[0];
- }, $content);
- }
-
}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/tools/Emoji.php b/vendor/zoujingli/think-library/src/tools/Emoji.php
new file mode 100644
index 000000000..678eb9cb8
--- /dev/null
+++ b/vendor/zoujingli/think-library/src/tools/Emoji.php
@@ -0,0 +1,59 @@
+= 4 ? '' : $match[0];
+ }, $content);
+ }
+}
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/tools/Http.php b/vendor/zoujingli/think-library/src/tools/Http.php
index aa3f8fc85..4263b582f 100644
--- a/vendor/zoujingli/think-library/src/tools/Http.php
+++ b/vendor/zoujingli/think-library/src/tools/Http.php
@@ -68,17 +68,17 @@ class Http
curl_setopt($curl, CURLOPT_HTTPHEADER, $options['headers']);
}
// Cookie 信息设置
+ if (!empty($options['cookie'])) {
+ curl_setopt($curl, CURLOPT_COOKIE, $options['cookie']);
+ }
if (!empty($options['cookie_file'])) {
curl_setopt($curl, CURLOPT_COOKIEJAR, $options['cookie_file']);
curl_setopt($curl, CURLOPT_COOKIEFILE, $options['cookie_file']);
}
- if (!empty($options['cookie'])) {
- curl_setopt($curl, CURLOPT_COOKIE, $options['cookie']);
- }
// POST 数据设置
if (strtolower($method) === 'post') {
curl_setopt($curl, CURLOPT_POST, true);
- curl_setopt($curl, CURLOPT_POSTFIELDS, self::_buildHttpData($options['data']));
+ curl_setopt($curl, CURLOPT_POSTFIELDS, self::buildQueryData($options['data']));
}
// 请求超时设置
if (isset($options['timeout']) && is_numeric($options['timeout'])) {
@@ -104,7 +104,7 @@ class Http
* @param boolean $build 是否编译数据
* @return array|string
*/
- private static function _buildHttpData($data, $build = true)
+ private static function buildQueryData($data, $build = true)
{
if (!is_array($data)) return $data;
foreach ($data as $key => $value) if (is_object($value) && $value instanceof \CURLFile) {
@@ -126,16 +126,14 @@ class Http
{
if (!empty($_SERVER['HTTP_USER_AGENT'])) return $_SERVER['HTTP_USER_AGENT'];
$userAgents = [
+ "Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1",
"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.57 Safari/536.11",
- "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-us) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50",
"Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Firefox/38.0",
"Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; .NET CLR 2.0.50727; .NET CLR 3.0.30729; .NET CLR 3.5.30729; InfoPath.3; rv:11.0) like Gecko",
- "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0",
+ "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-us) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50",
"Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)",
+ "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0.1) Gecko/20100101 Firefox/4.0.1",
- "Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1",
- "Opera/9.80 (Macintosh; Intel Mac OS X 10.6.8; U; en) Presto/2.8.131 Version/11.11",
- "Opera/9.80 (Windows NT 6.1; U; en) Presto/2.8.131 Version/11.11",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11",
];
return $userAgents[array_rand($userAgents, 1)];
diff --git a/vendor/zoujingli/wechat-developer/README.md b/vendor/zoujingli/wechat-developer/README.md
index 636d4cf2f..85b813bcf 100644
--- a/vendor/zoujingli/wechat-developer/README.md
+++ b/vendor/zoujingli/wechat-developer/README.md
@@ -30,7 +30,7 @@ WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先
* 商户支付文档：https://pay.weixin.qq.com/wiki/doc/api/index.html
针对 WeChatDeveloper 也有一准备了帮助资料可供参考。
-* ThinkAdmin：https://github.com/zoujingli/Think.Admin
+* ThinkAdmin：https://github.com/zoujingli/ThinkAdmin
* WeChatDeveloper：https://www.kancloud.cn/zoujingli/wechat-developer
diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php
index d0de000bc..60a435d5c 100644
--- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php
+++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php
@@ -31,6 +31,17 @@ class Tools
*/
public static $cache_path = null;
+ /**
+ * 缓存写入操作
+ * @var array
+ */
+ public static $cache_callable = [
+ 'set' => null, // 写入缓存
+ 'get' => null, // 获取缓存
+ 'del' => null, // 删除缓存
+ 'put' => null, // 写入文件
+ ];
+
/**
* 网络缓存
* @var array
@@ -356,6 +367,9 @@ class Tools
*/
public static function pushFile($name, $content)
{
+ if (is_callable(self::$cache_callable['put'])) {
+ return call_user_func_array(self::$cache_callable['put'], func_get_args());
+ }
$file = self::_getCacheName($name);
if (!file_put_contents($file, $content)) {
throw new LocalCacheException('local file write error.', '0');
@@ -373,8 +387,12 @@ class Tools
*/
public static function setCache($name, $value = '', $expired = 3600)
{
+ if (is_callable(self::$cache_callable['set'])) {
+ return call_user_func_array(self::$cache_callable['set'], func_get_args());
+ }
$file = self::_getCacheName($name);
- if (!file_put_contents($file, serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]))) {
+ $data = ['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)];
+ if (!file_put_contents($file, serialize($data))) {
throw new LocalCacheException('local cache error.', '0');
}
return $file;
@@ -387,6 +405,9 @@ class Tools
*/
public static function getCache($name)
{
+ if (is_callable(self::$cache_callable['get'])) {
+ return call_user_func_array(self::$cache_callable['get'], func_get_args());
+ }
$file = self::_getCacheName($name);
if (file_exists($file) && ($content = file_get_contents($file))) {
$data = unserialize($content);
@@ -405,6 +426,9 @@ class Tools
*/
public static function delCache($name)
{
+ if (is_callable(self::$cache_callable['del'])) {
+ return call_user_func_array(self::$cache_callable['del'], func_get_args());
+ }
$file = self::_getCacheName($name);
return file_exists($file) ? unlink($file) : true;
}
diff --git a/vendor/zoujingli/wechat-developer/_test/config.php b/vendor/zoujingli/wechat-developer/_test/config.php
index 010618cda..e6f807584 100644
--- a/vendor/zoujingli/wechat-developer/_test/config.php
+++ b/vendor/zoujingli/wechat-developer/_test/config.php
@@ -12,6 +12,22 @@
// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
// +----------------------------------------------------------------------
+// 配置缓存处理函数
+//\WeChat\Contracts\Tools::$cache_callable = [
+// 'set' => function ($name, $value, $expired = 360) {
+// var_dump(func_get_args());
+// },
+// 'get' => function ($name) {
+// var_dump(func_get_args());
+// },
+// 'del' => function ($name) {
+// var_dump(func_get_args());
+// },
+// 'put' => function ($name) {
+// var_dump(func_get_args());
+// },
+//];
+
return [
'token' => 'test',
'appid' => 'wx60a43dd8161666d4',
diff --git a/vendor/zoujingli/wechat-developer/_test/pay-order-notify.php b/vendor/zoujingli/wechat-developer/_test/pay-order-notify.php
index 3597f025b..7b8267a23 100644
--- a/vendor/zoujingli/wechat-developer/_test/pay-order-notify.php
+++ b/vendor/zoujingli/wechat-developer/_test/pay-order-notify.php
@@ -25,7 +25,7 @@ try {
// 4. 获取通知参数
$data = $wechat->getNotify();
- if ($data['result_code'] === 'SUCCESS' && $data['result_code'] === 'SUCCESS') {
+ if ($data['return_code'] === 'SUCCESS' && $data['result_code'] === 'SUCCESS') {
// @todo 去更新下原订单的支付状态
$order_no = $data['out_trade_no'];
@@ -39,4 +39,4 @@ try {
// 出错啦，处理下吧
echo $e->getMessage() . PHP_EOL;
-}
\ No newline at end of file
+}
diff --git a/vendor/zoujingli/wechat-developer/_test/pay-redpack-create.php b/vendor/zoujingli/wechat-developer/_test/pay-redpack-create.php
index c2dab54cb..3df5fb6c0 100644
--- a/vendor/zoujingli/wechat-developer/_test/pay-redpack-create.php
+++ b/vendor/zoujingli/wechat-developer/_test/pay-redpack-create.php
@@ -27,7 +27,7 @@ try {
$options = [
'mch_billno' => time(),
're_openid' => 'o38gps3vNdCqaggFfrBRCRikwlWY',
- 'send_name' => '商户名称',
+ 'send_name' => '商户名称😍',
'act_name' => '活动名称',
'total_amount' => '100',
'total_num' => '1',
diff --git a/vendor/zoujingli/weopen-developer/WeMini/Code.php b/vendor/zoujingli/weopen-developer/WeMini/Code.php
index 00d2fd946..7e61d5e55 100644
--- a/vendor/zoujingli/weopen-developer/WeMini/Code.php
+++ b/vendor/zoujingli/weopen-developer/WeMini/Code.php
@@ -97,15 +97,17 @@ class Code extends BasicWeChat
/**
* 5. 将第三方提交的代码包提交审核（仅供第三方开发者代小程序调用）
* @param array $itemList 提交审核项的一个列表
+ * @param string $feedbackInfo 反馈内容不超过200字
+ * @param string $feedbackStuff 图片 media_id 列表
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
- public function submitAudit(array $itemList)
+ public function submitAudit(array $itemList, $feedbackInfo = '', $feedbackStuff = '')
{
$url = 'https://api.weixin.qq.com/wxa/submit_audit?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
- return $this->httpPostForJson($url, ['item_list' => $itemList], true);
+ return $this->httpPostForJson($url, ['item_list' => $itemList, 'feedback_info' => '', 'feedback_stuff' => $feedbackStuff], true);
}
/**