diff --git a/build.cmd b/build.cmd index c1e3c74a8..c0d05a3e7 100644 --- a/build.cmd +++ b/build.cmd @@ -1,12 +1,6 @@ @echo off -title Composer Plugs Update and Optimize -echo. -echo ========= 1. 清理已安装插件 ========= +@title Composer Plugs Update and Optimize @rmdir /s/q vendor thinkphp -echo. -echo ========= 2. 下载并安装插件 ========= composer update --profile --prefer-dist --optimize-autoloader -echo. -echo ========= 3. 压缩并发布插件 ========= composer dump-autoload --optimize exit \ No newline at end of file diff --git a/config/app.php b/config/app.php index 5a8700eef..c23ab0a8a 100644 --- a/config/app.php +++ b/config/app.php @@ -12,135 +12,11 @@ // | github寮婧愰」鐩細https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -use think\facade\Env; - return [ - // 搴旂敤鍚嶇О - 'app_name' => '', - // 搴旂敤鍦板潃 - 'app_host' => '', // 搴旂敤璋冭瘯妯″紡 - 'app_debug' => true, - // 搴旂敤Trace - 'app_trace' => false, - // 鏄惁鏀寔澶氭ā鍧 - 'app_multi_module' => true, - // 鍏ュ彛鑷姩缁戝畾妯″潡 - 'auto_bind_module' => false, - // 娉ㄥ唽鐨勬牴鍛藉悕绌洪棿 - 'root_namespace' => [], - // 榛樿杈撳嚭绫诲瀷 - 'default_return_type' => 'html', - // 榛樿AJAX 鏁版嵁杩斿洖鏍煎紡,鍙塲son xml ... - 'default_ajax_return' => 'json', - // 榛樿JSONP鏍煎紡杩斿洖鐨勫鐞嗘柟娉 - 'default_jsonp_handler' => 'jsonpReturn', - // 榛樿JSONP澶勭悊鏂规硶 - 'var_jsonp_handler' => 'callback', - // 榛樿鏃跺尯 - 'default_timezone' => 'Asia/Shanghai', - // 鏄惁寮鍚璇█ - 'lang_switch_on' => false, - // 榛樿鍏ㄥ眬杩囨护鏂规硶 鐢ㄩ楀彿鍒嗛殧澶氫釜 - 'default_filter' => '', - // 榛樿璇█ - 'default_lang' => 'zh-cn', - // 搴旂敤绫诲簱鍚庣紑 - 'class_suffix' => false, - // 鎺у埗鍣ㄧ被鍚庣紑 - 'controller_suffix' => false, - - // +---------------------------------------------------------------------- - // | 妯″潡璁剧疆 - // +---------------------------------------------------------------------- - - // 榛樿妯″潡鍚 - 'default_module' => 'index', - // 绂佹璁块棶妯″潡 - 'deny_module_list' => ['common'], - // 榛樿鎺у埗鍣ㄥ悕 - 'default_controller' => 'Index', - // 榛樿鎿嶄綔鍚 - 'default_action' => 'index', - // 榛樿楠岃瘉鍣 - 'default_validate' => '', - // 榛樿鐨勭┖妯″潡鍚 - 'empty_module' => '', - // 榛樿鐨勭┖鎺у埗鍣ㄥ悕 - 'empty_controller' => 'Error', - // 鎿嶄綔鏂规硶鍓嶇紑 - 'use_action_prefix' => false, - // 鎿嶄綔鏂规硶鍚庣紑 - 'action_suffix' => '', - // 鑷姩鎼滅储鎺у埗鍣 - 'controller_auto_search' => false, - - // +---------------------------------------------------------------------- - // | URL璁剧疆 - // +---------------------------------------------------------------------- - - // PATHINFO鍙橀噺鍚 鐢ㄤ簬鍏煎妯″紡 - 'var_pathinfo' => 's', - // 鍏煎PATH_INFO鑾峰彇 - 'pathinfo_fetch' => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'], - // pathinfo鍒嗛殧绗 - 'pathinfo_depr' => '/', - // HTTPS浠ｇ悊鏍囪瘑 - 'https_agent_name' => '', - // IP浠ｇ悊鑾峰彇鏍囪瘑 - 'http_agent_ip' => 'X-REAL-IP', - // URL浼潤鎬佸悗缂 - 'url_html_suffix' => 'html', - // URL鏅氭柟寮忓弬鏁 鐢ㄤ簬鑷姩鐢熸垚 - 'url_common_param' => false, + 'app_debug' => true, + // 搴旂敤Trace璋冭瘯 + 'app_trace' => false, // URL鍙傛暟鏂瑰紡 0 鎸夊悕绉版垚瀵硅В鏋 1 鎸夐『搴忚В鏋 - 'url_param_type' => 1, - // 鏄惁寮鍚矾鐢卞欢杩熻В鏋 - 'url_lazy_route' => false, - // 鏄惁寮哄埗浣跨敤璺敱 - 'url_route_must' => false, - // 鍚堝苟璺敱瑙勫垯 - 'route_rule_merge' => false, - // 璺敱鏄惁瀹屽叏鍖归厤 - 'route_complete_match' => false, - // 浣跨敤娉ㄨВ璺敱 - 'route_annotation' => false, - // 鍩熷悕鏍癸紝濡倀hinkphp.cn - 'url_domain_root' => '', - // 鏄惁鑷姩杞崲URL涓殑鎺у埗鍣ㄥ拰鎿嶄綔鍚 - 'url_convert' => true, - // 榛樿鐨勮闂帶鍒跺櫒灞 - 'url_controller_layer' => 'controller', - // 琛ㄥ崟璇锋眰绫诲瀷浼鍙橀噺 - 'var_method' => '_method', - // 琛ㄥ崟ajax浼鍙橀噺 - 'var_ajax' => '_ajax', - // 琛ㄥ崟pjax浼鍙橀噺 - 'var_pjax' => '_pjax', - // 鏄惁寮鍚姹傜紦瀛 true鑷姩缂撳瓨 鏀寔璁剧疆璇锋眰缂撳瓨瑙勫垯 - 'request_cache' => false, - // 璇锋眰缂撳瓨鏈夋晥鏈 - 'request_cache_expire' => null, - // 鍏ㄥ眬璇锋眰缂撳瓨鎺掗櫎瑙勫垯 - 'request_cache_except' => [], - // 鏄惁寮鍚矾鐢辩紦瀛 - 'route_check_cache' => false, - // 璺敱缂撳瓨鐨凨ey鑷畾涔夎缃紙闂寘锛夛紝榛樿涓哄綋鍓峌RL鍜岃姹傜被鍨嬬殑md5 - 'route_check_cache_key' => '', - // 璺敱缂撳瓨绫诲瀷鍙婂弬鏁 - 'route_cache_option' => '', - - // 榛樿璺宠浆椤甸潰瀵瑰簲鐨勬ā鏉挎枃浠 - 'dispatch_success_tmpl' => Env::get('think_path') . 'tpl/dispatch_jump.tpl', - 'dispatch_error_tmpl' => Env::get('think_path') . 'tpl/dispatch_jump.tpl', - - // 寮傚父椤甸潰鐨勬ā鏉挎枃浠 - 'exception_tmpl' => Env::get('think_path') . 'tpl/think_exception.tpl', - - // 閿欒鏄剧ず淇℃伅,闈炶皟璇曟ā寮忔湁鏁 - 'error_message' => '椤甸潰閿欒锛佽绋嶅悗鍐嶈瘯锝', - // 鏄剧ず閿欒淇℃伅 - 'show_error_msg' => false, - // 寮傚父澶勭悊handle绫 鐣欑┖浣跨敤 \think\exception\Handle - 'exception_handle' => '', + 'url_param_type' => 1, ]; diff --git a/config/cache.php b/config/cache.php deleted file mode 100644 index 985dbb1c4..000000000 --- a/config/cache.php +++ /dev/null @@ -1,25 +0,0 @@ - -// +---------------------------------------------------------------------- - -// +---------------------------------------------------------------------- -// | 缂撳瓨璁剧疆 -// +---------------------------------------------------------------------- - -return [ - // 椹卞姩鏂瑰紡 - 'type' => 'File', - // 缂撳瓨淇濆瓨鐩綍 - 'path' => '', - // 缂撳瓨鍓嶇紑 - 'prefix' => '', - // 缂撳瓨鏈夋晥鏈 0琛ㄧず姘镐箙缂撳瓨 - 'expire' => 0, -]; diff --git a/config/console.php b/config/console.php deleted file mode 100644 index 4bbb5c015..000000000 --- a/config/console.php +++ /dev/null @@ -1,19 +0,0 @@ - 'Think Console', - 'version' => '0.1', - 'user' => null, -]; diff --git a/config/cookie.php b/config/cookie.php deleted file mode 100644 index a41d42c6d..000000000 --- a/config/cookie.php +++ /dev/null @@ -1,30 +0,0 @@ - '', - // cookie 淇濆瓨鏃堕棿 - 'expire' => 0, - // cookie 淇濆瓨璺緞 - 'path' => '/', - // cookie 鏈夋晥鍩熷悕 - 'domain' => '', - // cookie 鍚敤瀹夊叏浼犺緭 - 'secure' => false, - // httponly璁剧疆 - 'httponly' => '', - // 鏄惁浣跨敤 setcookie - 'setcookie' => true, -]; diff --git a/config/database.php b/config/database.php index 7c20594fe..69782ed10 100644 --- a/config/database.php +++ b/config/database.php @@ -13,54 +13,18 @@ // +---------------------------------------------------------------------- return [ - // 鏁版嵁搴撶被鍨 - 'type' => 'mysql', - // 鏈嶅姟鍣ㄥ湴鍧 - 'hostname' => '127.0.0.1', - // 鏁版嵁搴撳悕 - 'database' => 'admin_v3', - // 鐢ㄦ埛鍚 - 'username' => 'admin_v3', - // 瀵嗙爜 - 'password' => 'FbYBHcWKr2', - // 绔彛 - 'hostport' => '3306', - // 杩炴帴dsn - 'dsn' => '', - // 鏁版嵁搴撹繛鎺ュ弬鏁 - 'params' => [], - // 鏁版嵁搴撶紪鐮侀粯璁ら噰鐢╱tf8 - 'charset' => 'utf8', - // 鏁版嵁搴撹〃鍓嶇紑 - 'prefix' => '', // 鏁版嵁搴撹皟璇曟ā寮 - 'debug' => true, - // 鏁版嵁搴撻儴缃叉柟寮:0 闆嗕腑寮(鍗曚竴鏈嶅姟鍣),1 鍒嗗竷寮(涓讳粠鏈嶅姟鍣) - 'deploy' => 0, - // 鏁版嵁搴撹鍐欐槸鍚﹀垎绂 涓讳粠寮忔湁鏁 - 'rw_separate' => false, - // 璇诲啓鍒嗙鍚 涓绘湇鍔″櫒鏁伴噺 - 'master_num' => 1, - // 鎸囧畾浠庢湇鍔″櫒搴忓彿 - 'slave_no' => '', - // 鑷姩璇诲彇涓诲簱鏁版嵁 - 'read_master' => false, - // 鏄惁涓ユ牸妫鏌ュ瓧娈垫槸鍚﹀瓨鍦 - 'fields_strict' => true, - // 鏁版嵁闆嗚繑鍥炵被鍨 - 'resultset_type' => 'array', - // 鑷姩鍐欏叆鏃堕棿鎴冲瓧娈 - 'auto_timestamp' => false, - // 鏃堕棿瀛楁鍙栧嚭鍚庣殑榛樿鏃堕棿鏍煎紡 - 'datetime_format' => 'Y-m-d H:i:s', - // 鏄惁闇瑕佽繘琛孲QL鎬ц兘鍒嗘瀽 - 'sql_explain' => false, - // Builder绫 - 'builder' => '', - // Query绫 - 'query' => '\\think\\db\\Query', - // 鏄惁闇瑕佹柇绾块噸杩 - 'break_reconnect' => false, - // 鏂嚎鏍囪瘑瀛楃涓 - 'break_match_str' => [], + 'debug' => true, + // 鏁版嵁搴撶被鍨 + 'type' => 'mysql', + // 鏈嶅姟鍣ㄥ湴鍧 + 'hostname' => '127.0.0.1', + // 鏁版嵁搴撳悕 + 'database' => 'admin_v3', + // 鐢ㄦ埛鍚 + 'username' => 'admin_v3', + // 瀵嗙爜 + 'password' => 'FbYBHcWKr2', + // 绔彛 + 'hostport' => '3306', ]; diff --git a/config/log.php b/config/log.php index 4aad205ea..79dc06d57 100644 --- a/config/log.php +++ b/config/log.php @@ -13,18 +13,7 @@ // +---------------------------------------------------------------------- return [ - // 鏃ュ織璁板綍鏂瑰紡锛屽唴缃 file socket 鏀寔鎵╁睍 - 'type' => 'File', - // 鏃ュ織淇濆瓨鐩綍 - 'path' => '', - // 鏃ュ織璁板綍绾у埆 - 'level' => [], - // 鍗曟枃浠舵棩蹇楀啓鍏 - 'single' => false, - // 鐙珛鏃ュ織绾у埆 - 'apart_level' => ['emergency', 'alert', 'critical', 'error', 'sql'], - // 鏈澶ф棩蹇楁枃浠舵暟閲 - 'max_files' => 0, - // 鏄惁鍏抽棴鏃ュ織鍐欏叆 - 'close' => false, -]; \ No newline at end of file + 'type' => 'file', + 'max_files' => '200', + 'apart_level' => ['error', 'sql'], +]; diff --git a/config/session.php b/config/session.php index 9c99b174d..56b722b28 100644 --- a/config/session.php +++ b/config/session.php @@ -12,18 +12,15 @@ // | github寮婧愰」鐩細https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -/* 瀹氫箟Session浼氳瘽瀛楁鍚 */ -$session_name = 's' . substr(md5(__DIR__), -8); -$session_path = env('runtime_path') . 'sess' . DIRECTORY_SEPARATOR; -file_exists($session_path) || mkdir($session_path, 0755, true); +/* 瀹氫箟浼氳瘽璺緞 */ +$_path_ = env('runtime_path') . 'sess' . DIRECTORY_SEPARATOR; +file_exists($_path_) || mkdir($_path_, 0755, true); +$_name_ = 's' . substr(md5(__DIR__), -8); -/* 瀹氫箟Session浼氳瘽鍙傛暟 */ +/* 閰嶇疆浼氳瘽鍙傛暟 */ return [ - 'id' => '', - 'type' => '', - 'prefix' => 'ta', - 'auto_start' => true, - 'path' => $session_path, - 'name' => $session_name, - 'var_session_id' => $session_name, + 'prefix' => 'fw', + 'path' => $_path_, + 'name' => $_name_, + 'var_session_id' => $_name_, ]; \ No newline at end of file diff --git a/config/template.php b/config/template.php index 5b2fac1bd..95db27061 100644 --- a/config/template.php +++ b/config/template.php @@ -12,33 +12,14 @@ // | github寮婧愰」鐩細https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -// 妯℃澘甯搁噺澹版槑 $appRoot = app('request')->root(); $uriRoot = rtrim(preg_match('/\.php$/', $appRoot) ? dirname($appRoot) : $appRoot, '\\/'); return [ - // 妯℃澘寮曟搸绫诲瀷 鏀寔 php think 鏀寔鎵╁睍 - 'type' => 'Think', - // 榛樿妯℃澘娓叉煋瑙勫垯 1 瑙ｆ瀽涓哄皬鍐+涓嬪垝绾 2 鍏ㄩ儴杞崲灏忓啓 3 淇濇寔鎿嶄綔鏂规硶 - 'auto_rule' => 1, - // 妯℃澘璺緞 - 'view_path' => '', - // 妯℃澘鍚庣紑 - 'view_suffix' => 'html', - // 妯℃澘鏂囦欢鍚嶅垎闅旂 - 'view_depr' => DIRECTORY_SEPARATOR, - // 妯℃澘寮曟搸鏅氭爣绛惧紑濮嬫爣璁 - 'tpl_begin' => '{', - // 妯℃澘寮曟搸鏅氭爣绛剧粨鏉熸爣璁 - 'tpl_end' => '}', - // 鏍囩搴撴爣绛惧紑濮嬫爣璁 - 'taglib_begin' => '{', - // 鏍囩搴撴爣绛剧粨鏉熸爣璁 - 'taglib_end' => '}', // 瀹氫箟妯℃澘鏇挎崲瀛楃涓 'tpl_replace_string' => [ '__APP__' => $appRoot, '__ROOT__' => $uriRoot, '__STATIC__' => $uriRoot . "/static", ], -]; +]; \ No newline at end of file diff --git a/config/trace.php b/config/trace.php deleted file mode 100644 index 49945a903..000000000 --- a/config/trace.php +++ /dev/null @@ -1,18 +0,0 @@ - 'Html', -]; diff --git a/thinkphp/helper.php b/thinkphp/helper.php index f29414669..4aa73722c 100644 --- a/thinkphp/helper.php +++ b/thinkphp/helper.php @@ -130,19 +130,19 @@ if (!function_exists('cache')) { } elseif (is_null($value)) { // 鍒犻櫎缂撳瓨 return Cache::rm($name); - } else { - // 缂撳瓨鏁版嵁 - if (is_array($options)) { - $expire = isset($options['expire']) ? $options['expire'] : null; //淇鏌ヨ缂撳瓨鏃犳硶璁剧疆杩囨湡鏃堕棿 - } else { - $expire = is_numeric($options) ? $options : null; //榛樿蹇嵎缂撳瓨璁剧疆杩囨湡鏃堕棿 - } + } - if (is_null($tag)) { - return Cache::set($name, $value, $expire); - } else { - return Cache::tag($tag)->set($name, $value, $expire); - } + // 缂撳瓨鏁版嵁 + if (is_array($options)) { + $expire = isset($options['expire']) ? $options['expire'] : null; //淇鏌ヨ缂撳瓨鏃犳硶璁剧疆杩囨湡鏃堕棿 + } else { + $expire = is_numeric($options) ? $options : null; //榛樿蹇嵎缂撳瓨璁剧疆杩囨湡鏃堕棿 + } + + if (is_null($tag)) { + return Cache::set($name, $value, $expire); + } else { + return Cache::tag($tag)->set($name, $value, $expire); } } } diff --git a/thinkphp/lang/zh-cn.php b/thinkphp/lang/zh-cn.php index e2067a767..1e0508204 100644 --- a/thinkphp/lang/zh-cn.php +++ b/thinkphp/lang/zh-cn.php @@ -50,6 +50,7 @@ return [ 'KVDB init error' => '娌℃湁鍒濆鍖朘VDB锛岃鍦⊿AE绠＄悊骞冲彴鍒濆鍖朘VDB鏈嶅姟', 'fields not exists' => '鏁版嵁琛ㄥ瓧娈典笉瀛樺湪', 'where express error' => '鏌ヨ琛ㄨ揪寮忛敊璇', + 'order express error' => '鎺掑簭琛ㄨ揪寮忛敊璇', 'no data to update' => '娌℃湁浠讳綍鏁版嵁闇瑕佹洿鏂', 'miss data to insert' => '缂哄皯闇瑕佸啓鍏ョ殑鏁版嵁', 'not support data' => '涓嶆敮鎸佺殑鏁版嵁琛ㄨ揪寮', diff --git a/thinkphp/library/think/App.php b/thinkphp/library/think/App.php index 27f3251f3..d888e3c97 100644 --- a/thinkphp/library/think/App.php +++ b/thinkphp/library/think/App.php @@ -20,7 +20,7 @@ use think\route\Dispatch; */ class App extends Container { - const VERSION = '5.1.25'; + const VERSION = '5.1.27 LTS'; /** * 褰撳墠妯″潡璺緞 diff --git a/thinkphp/library/think/Build.php b/thinkphp/library/think/Build.php index 4f90476d9..7a531d74c 100644 --- a/thinkphp/library/think/Build.php +++ b/thinkphp/library/think/Build.php @@ -190,22 +190,28 @@ class Build public function buildRoute($suffix = false, $layer = '') { $namespace = $this->app->getNameSpace(); - $modules = glob($this->basePath . '*', GLOB_ONLYDIR); $content = 'app->config('app.url_controller_layer'); } - foreach ($modules as $module) { - $module = basename($module); + if ($this->app->config('app.app_multi_module')) { + $modules = glob($this->basePath . '*', GLOB_ONLYDIR); - if (in_array($module, $this->app->config('app.deny_module_list'))) { - continue; + foreach ($modules as $module) { + $module = basename($module); + + if (in_array($module, $this->app->config('app.deny_module_list'))) { + continue; + } + + $path = $this->basePath . $module . DIRECTORY_SEPARATOR . $layer . DIRECTORY_SEPARATOR; + $content .= $this->buildDirRoute($path, $namespace, $module, $suffix, $layer); } - - $path = $this->basePath . $module . DIRECTORY_SEPARATOR . $layer . DIRECTORY_SEPARATOR; - $content .= $this->buildDirRoute($path, $namespace, $module, $suffix, $layer); + } else { + $path = $this->basePath . $layer . DIRECTORY_SEPARATOR; + $content .= $this->buildDirRoute($path, $namespace, '', $suffix, $layer); } $filename = $this->app->getRuntimePath() . 'build_route.php'; @@ -232,7 +238,7 @@ class Build foreach ($controllers as $controller) { $controller = basename($controller, '.php'); - $class = new \ReflectionClass($namespace . '\\' . $module . '\\' . $layer . '\\' . $controller); + $class = new \ReflectionClass($namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $controller); if (strpos($layer, '\\')) { // 澶氱骇鎺у埗鍣 @@ -274,12 +280,12 @@ class Build if (false !== strpos($comment, '@route(')) { $comment = $this->parseRouteComment($comment); - $route = $module . '/' . $controller; + $route = ($module ? $module . '/' : '') . $controller; $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\'' . $route . '\')', $comment); $content .= PHP_EOL . $comment; } elseif (false !== strpos($comment, '@alias(')) { $comment = $this->parseRouteComment($comment, '@alias('); - $route = $module . '/' . $controller; + $route = ($module ? $module . '/' : '') . $controller; $comment = preg_replace('/alias\(\s?([\'\"][\-\_\/\w]+[\'\"])\s?\)/is', 'Route::alias(\1,\'' . $route . '\')', $comment); $content .= PHP_EOL . $comment; } @@ -344,7 +350,7 @@ class Build $action = substr($action, 0, -strlen($suffix)); } - $route = $module . '/' . $controller . '/' . $action; + $route = ($module ? $module . '/' : '') . $controller . '/' . $action; $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\'' . $route . '\')', $comment); $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\'' . $route . '\')', $comment); diff --git a/thinkphp/library/think/Collection.php b/thinkphp/library/think/Collection.php index 4de972556..d58c8999b 100644 --- a/thinkphp/library/think/Collection.php +++ b/thinkphp/library/think/Collection.php @@ -429,15 +429,20 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria * @access public * @param string $field 鎺掑簭瀛楁 * @param string $order 鎺掑簭 + * @param bool $intSort 鏄惁涓烘暟瀛楁帓搴 * @return $this */ - public function order($field, $order = null) + public function order($field, $order = null, $intSort = true) { - return $this->sort(function ($a, $b) use ($field, $order) { + return $this->sort(function ($a, $b) use ($field, $order, $intSort) { $fieldA = isset($a[$field]) ? $a[$field] : null; $fieldB = isset($b[$field]) ? $b[$field] : null; - return 'desc' == strtolower($order) ? strcmp($fieldB, $fieldA) : strcmp($fieldA, $fieldB); + if ($intSort) { + return 'desc' == strtolower($order) ? $fieldB >= $fieldA : $fieldA >= $fieldB; + } else { + return 'desc' == strtolower($order) ? strcmp($fieldB, $fieldA) : strcmp($fieldA, $fieldB); + } }); } diff --git a/thinkphp/library/think/Model.php b/thinkphp/library/think/Model.php index d47ce3e30..93914f0d6 100644 --- a/thinkphp/library/think/Model.php +++ b/thinkphp/library/think/Model.php @@ -124,6 +124,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess */ protected $defaultSoftDelete; + /** + * 鍏ㄥ眬鏌ヨ鑼冨洿 + * @var array + */ + protected $globalScope = []; + /** * 鏋舵瀯鍑芥暟 * @access public @@ -272,7 +278,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess /** * 鑾峰彇褰撳墠妯″瀷鐨勬暟鎹簱鏌ヨ瀵硅薄 * @access public - * @param bool $useBaseQuery 鏄惁璋冪敤鍏ㄥ眬鏌ヨ鑼冨洿 + * @param bool|array $useBaseQuery 鏄惁璋冪敤鍏ㄥ眬鏌ヨ鑼冨洿锛堟垨鑰呮寚瀹氭煡璇㈣寖鍥村悕绉帮級 * @return Query */ public function db($useBaseQuery = true) @@ -289,10 +295,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess } // 鍏ㄥ眬浣滅敤鍩 - if ($useBaseQuery && method_exists($this, 'base')) { + if (true === $useBaseQuery && method_exists($this, 'base')) { call_user_func_array([$this, 'base'], [ & $query]); } + $globalScope = is_array($useBaseQuery) && $useBaseQuery ?: $this->globalScope; + + if ($globalScope) { + $query->scope($globalScope); + } + // 杩斿洖褰撳墠妯″瀷鐨勬暟鎹簱鏌ヨ瀵硅薄 return $query; } @@ -427,6 +439,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess // 閲嶆柊璁板綍鍘熷鏁版嵁 $this->origin = $this->data; + $this->set = []; return true; } @@ -1030,7 +1043,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess /** * 璁剧疆鏄惁浣跨敤鍏ㄥ眬鏌ヨ鑼冨洿 * @access public - * @param bool $use 鏄惁鍚敤鍏ㄥ眬鏌ヨ鑼冨洿 + * @param bool|array $use 鏄惁鍚敤鍏ㄥ眬鏌ヨ鑼冨洿锛堟垨鑰呯敤鏁扮粍鎸囧畾鏌ヨ鑼冨洿鍚嶇О锛 * @return Query */ public static function useGlobalScope($use) diff --git a/thinkphp/library/think/Request.php b/thinkphp/library/think/Request.php index 948e18441..61f7fedca 100644 --- a/thinkphp/library/think/Request.php +++ b/thinkphp/library/think/Request.php @@ -1174,13 +1174,13 @@ class Request $files = $this->file; if (!empty($files)) { - // 澶勭悊涓婁紶鏂囦欢 - $array = $this->dealUploadFile($files); - if (strpos($name, '.')) { list($name, $sub) = explode('.', $name); } + // 澶勭悊涓婁紶鏂囦欢 + $array = $this->dealUploadFile($files, $name); + if ('' === $name) { // 鑾峰彇鍏ㄩ儴鏂囦欢 return $array; @@ -1194,18 +1194,24 @@ class Request return; } - protected function dealUploadFile($files) + protected function dealUploadFile($files, $name) { $array = []; foreach ($files as $key => $file) { - if (is_array($file['name'])) { + if ($file instanceof File) { + $array[$key] = $file; + } elseif (is_array($file['name'])) { $item = []; $keys = array_keys($file); $count = count($file['name']); for ($i = 0; $i < $count; $i++) { if ($file['error'][$i] > 0) { - $this->throwUploadFileError($file['error'][$i]); + if ($name == $key) { + $this->throwUploadFileError($file['error'][$i]); + } else { + continue; + } } $temp['key'] = $key; @@ -1219,15 +1225,15 @@ class Request $array[$key] = $item; } else { - if ($file instanceof File) { - $array[$key] = $file; - } else { - if ($file['error'] > 0) { + if ($file['error'] > 0) { + if ($key == $name) { $this->throwUploadFileError($file['error']); + } else { + continue; } - - $array[$key] = (new File($file['tmp_name']))->setUploadInfo($file); } + + $array[$key] = (new File($file['tmp_name']))->setUploadInfo($file); } } diff --git a/thinkphp/library/think/db/Builder.php b/thinkphp/library/think/db/Builder.php index 507cda98a..daa7eda5e 100644 --- a/thinkphp/library/think/db/Builder.php +++ b/thinkphp/library/think/db/Builder.php @@ -113,6 +113,10 @@ abstract class Builder $result = []; foreach ($data as $key => $val) { + if ('*' != $options['field'] && !in_array($key, $fields, true)) { + continue; + } + $item = $this->parseKey($query, $key, true); if ($val instanceof Expression) { @@ -129,7 +133,7 @@ abstract class Builder list($key, $name) = explode('->', $key); $item = $this->parseKey($query, $key); $result[$item] = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key, $val, $bind) . ')'; - } elseif (false === strpos($key, '.') && !in_array($key, $fields, true)) { + } elseif ('*' == $options['field'] && false === strpos($key, '.') && !in_array($key, $fields, true)) { if ($options['strict']) { throw new Exception('fields not exists:[' . $key . ']'); } @@ -788,16 +792,10 @@ abstract class Builder */ protected function parseOrder(Query $query, $order) { - if (empty($order)) { - return ''; - } - - $array = []; - foreach ($order as $key => $val) { if ($val instanceof Expression) { $array[] = $val->getValue(); - } elseif (is_array($val) && !preg_match('/\W/', $key)) { + } elseif (is_array($val) && preg_match('/^[\w\.]+$/', $key)) { $array[] = $this->parseOrderField($query, $key, $val); } elseif ('[rand]' == $val) { $array[] = $this->parseRand($query); @@ -808,15 +806,17 @@ abstract class Builder $sort = $val; } - if (false === strpos($key, ')') && false === strpos($key, '#')) { + if (preg_match('/^[\w\.]+$/', $key)) { $sort = strtoupper($sort); $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : ''; $array[] = $this->parseKey($query, $key, true) . $sort; + } else { + throw new Exception('order express error:' . $key); } } } - return ' ORDER BY ' . implode(',', $array); + return empty($array) ? '' : ' ORDER BY ' . implode(',', $array); } /** diff --git a/thinkphp/library/think/db/Query.php b/thinkphp/library/think/db/Query.php index bcf6964c5..cea5a4c8d 100644 --- a/thinkphp/library/think/db/Query.php +++ b/thinkphp/library/think/db/Query.php @@ -1887,10 +1887,21 @@ class Query * 琛ㄨ揪寮忔柟寮忔寚瀹欶ield鎺掑簭 * @access public * @param string $field 鎺掑簭瀛楁 + * @param array $bind 鍙傛暟缁戝畾 * @return $this */ - public function orderRaw($field) + public function orderRaw($field, $bind = []) { + if ($bind) { + foreach ($bind as $key => $value) { + if (!is_numeric($key)) { + $field = str_replace(':' . $key, '?', $field); + } + } + + $this->bind(array_values($bind)); + } + $this->options['order'][] = $this->raw($field); return $this; diff --git a/thinkphp/library/think/db/builder/Mysql.php b/thinkphp/library/think/db/builder/Mysql.php index ab21648e1..7ec3bf850 100644 --- a/thinkphp/library/think/db/builder/Mysql.php +++ b/thinkphp/library/think/db/builder/Mysql.php @@ -14,6 +14,7 @@ namespace think\db\builder; use think\db\Builder; use think\db\Expression; use think\db\Query; +use think\Exception; /** * mysql鏁版嵁搴撻┍鍔 @@ -124,7 +125,7 @@ class Mysql extends Builder // JSON瀛楁鏀寔 list($field, $name) = explode('->', $key, 2); - return 'json_extract(' . $this->parseKey($query, $field) . ', \'$.' . str_replace('->', '.', $name) . '\')'; + return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$.' . str_replace('->', '.', $name) . '\')'; } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) { list($table, $key) = explode('.', $key, 2); @@ -140,6 +141,10 @@ class Mysql extends Builder } } + if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) { + throw new Exception('not support data:' . $key); + } + if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key))) { $key = '`' . $key . '`'; } diff --git a/thinkphp/library/think/db/builder/Sqlsrv.php b/thinkphp/library/think/db/builder/Sqlsrv.php index 25da4d9fd..e24f7d25a 100644 --- a/thinkphp/library/think/db/builder/Sqlsrv.php +++ b/thinkphp/library/think/db/builder/Sqlsrv.php @@ -14,6 +14,7 @@ namespace think\db\builder; use think\db\Builder; use think\db\Expression; use think\db\Query; +use think\Exception; /** * Sqlsrv鏁版嵁搴撻┍鍔 @@ -40,8 +41,6 @@ class Sqlsrv extends Builder return ' ORDER BY rand()'; } - $array = []; - foreach ($order as $key => $val) { if ($val instanceof Expression) { $array[] = $val->getValue(); @@ -54,12 +53,17 @@ class Sqlsrv extends Builder $sort = $val; } - $sort = in_array(strtolower($sort), ['asc', 'desc'], true) ? ' ' . $sort : ''; - $array[] = $this->parseKey($query, $key, true) . $sort; + if (preg_match('/^[\w\.]+$/', $key)) { + $sort = strtoupper($sort); + $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : ''; + $array[] = $this->parseKey($query, $key, true) . $sort; + } else { + throw new Exception('order express error:' . $key); + } } } - return ' ORDER BY ' . implode(',', $array); + return empty($array) ? '' : ' ORDER BY ' . implode(',', $array); } /** @@ -106,6 +110,10 @@ class Sqlsrv extends Builder } } + if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) { + throw new Exception('not support data:' . $key); + } + if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key))) { $key = '[' . $key . ']'; } diff --git a/thinkphp/library/think/model/concern/Attribute.php b/thinkphp/library/think/model/concern/Attribute.php index 9b06b9ad0..76342b9f3 100644 --- a/thinkphp/library/think/model/concern/Attribute.php +++ b/thinkphp/library/think/model/concern/Attribute.php @@ -72,6 +72,12 @@ trait Attribute */ private $data = []; + /** + * 淇敼鍣ㄦ墽琛岃褰 + * @var array + */ + private $set = []; + /** * 鍘熷鏁版嵁 * @var array @@ -304,10 +310,14 @@ trait Attribute * @param string $name 灞炴у悕 * @param mixed $value 灞炴у * @param array $data 鏁版嵁 - * @return $this + * @return void */ public function setAttr($name, $value, $data = []) { + if (isset($this->set[$name])) { + return; + } + if (is_null($value) && $this->autoWriteTimestamp && in_array($name, [$this->createTime, $this->updateTime])) { // 鑷姩鍐欏叆鐨勬椂闂存埑瀛楁 $value = $this->autoWriteTimestamp($name); @@ -325,8 +335,7 @@ trait Attribute // 璁剧疆鏁版嵁瀵硅薄灞炴 $this->data[$name] = $value; - - return $this; + $this->set[$name] = true; } /** diff --git a/thinkphp/library/think/route/Dispatch.php b/thinkphp/library/think/route/Dispatch.php index 76c30d199..93afe73b6 100644 --- a/thinkphp/library/think/route/Dispatch.php +++ b/thinkphp/library/think/route/Dispatch.php @@ -13,6 +13,7 @@ namespace think\route; use think\Container; use think\exception\ValidateException; +use think\App; use think\Request; use think\Response; diff --git a/thinkphp/library/think/route/Domain.php b/thinkphp/library/think/route/Domain.php index 260ca500a..80950dc28 100644 --- a/thinkphp/library/think/route/Domain.php +++ b/thinkphp/library/think/route/Domain.php @@ -20,8 +20,6 @@ use think\route\dispatch\Module as ModuleDispatch; class Domain extends RuleGroup { - protected $bind; - /** * 鏋舵瀯鍑芥暟 * @access public @@ -86,9 +84,7 @@ class Domain extends RuleGroup */ public function bind($bind) { - $this->bind = $bind; $this->router->bind($bind, $this->domain); - return $this; } @@ -117,8 +113,9 @@ class Domain extends RuleGroup */ private function checkUrlBind($request, $url) { - if (!empty($this->bind)) { - $bind = $this->bind; + $bind = $this->router->getBind($this->domain); + + if (!empty($bind)) { $this->parseBindAppendParam($bind); // 璁板綍缁戝畾淇℃伅 @@ -163,12 +160,13 @@ class Domain extends RuleGroup { $array = explode('|', $url, 2); $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action'); + $param = []; if (!empty($array[1])) { - $this->parseUrlParams($request, $array[1]); + $this->parseUrlParams($request, $array[1], $param); } - return new CallbackDispatch($request, $this, [$class, $action]); + return new CallbackDispatch($request, $this, [$class, $action], $param); } /** @@ -184,12 +182,13 @@ class Domain extends RuleGroup $array = explode('|', $url, 3); $class = !empty($array[0]) ? $array[0] : $this->router->config('default_controller'); $method = !empty($array[1]) ? $array[1] : $this->router->config('default_action'); + $param = []; if (!empty($array[2])) { - $this->parseUrlParams($request, $array[2]); + $this->parseUrlParams($request, $array[2], $param); } - return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method]); + return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method], $param); } /** @@ -204,12 +203,13 @@ class Domain extends RuleGroup { $array = explode('|', $url, 2); $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action'); + $param = []; if (!empty($array[1])) { - $this->parseUrlParams($request, $array[1]); + $this->parseUrlParams($request, $array[1], $param); } - return new ControllerDispatch($request, $this, $controller . '/' . $action); + return new ControllerDispatch($request, $this, $controller . '/' . $action, $param); } /** @@ -224,12 +224,13 @@ class Domain extends RuleGroup { $array = explode('|', $url, 2); $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action'); + $param = []; if (!empty($array[1])) { - $this->parseUrlParams($request, $array[1]); + $this->parseUrlParams($request, $array[1], $param); } - return new ModuleDispatch($request, $this, $controller . '/' . $action); + return new ModuleDispatch($request, $this, $controller . '/' . $action, $param); } } diff --git a/thinkphp/library/think/route/dispatch/Module.php b/thinkphp/library/think/route/dispatch/Module.php index 4224b362f..bfffec0ff 100644 --- a/thinkphp/library/think/route/dispatch/Module.php +++ b/thinkphp/library/think/route/dispatch/Module.php @@ -114,6 +114,7 @@ class Module extends Dispatch $vars = $this->rule->getConfig('url_param_type') ? $this->request->route() : $this->request->param(); + $vars = array_merge($vars, $this->param); } elseif (is_callable([$instance, '_empty'])) { // 绌烘搷浣 $call = [$instance, '_empty']; diff --git a/vendor/autoload.php b/vendor/autoload.php index 10f85353b..5502f1b4f 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit7ac0a16c6bb261e6fc9b66fbcc229d16::getLoader(); +return ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 46afd63e7..e1b49ae52 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit7ac0a16c6bb261e6fc9b66fbcc229d16 +class ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit7ac0a16c6bb261e6fc9b66fbcc229d16 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit7ac0a16c6bb261e6fc9b66fbcc229d16', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit7ac0a16c6bb261e6fc9b66fbcc229d16', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit08d118919634ee23e1a930bd6ef41bc2', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit7ac0a16c6bb261e6fc9b66fbcc229d16::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit7ac0a16c6bb261e6fc9b66fbcc229d16 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit7ac0a16c6bb261e6fc9b66fbcc229d16::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire7ac0a16c6bb261e6fc9b66fbcc229d16($fileIdentifier, $file); + composerRequire08d118919634ee23e1a930bd6ef41bc2($fileIdentifier, $file); } return $loader; } } -function composerRequire7ac0a16c6bb261e6fc9b66fbcc229d16($fileIdentifier, $file) +function composerRequire08d118919634ee23e1a930bd6ef41bc2($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 735497876..41a421a33 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit7ac0a16c6bb261e6fc9b66fbcc229d16 +class ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2 { public static $files = array ( '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php', @@ -303,9 +303,9 @@ class ComposerStaticInit7ac0a16c6bb261e6fc9b66fbcc229d16 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit7ac0a16c6bb261e6fc9b66fbcc229d16::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit7ac0a16c6bb261e6fc9b66fbcc229d16::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit7ac0a16c6bb261e6fc9b66fbcc229d16::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit08d118919634ee23e1a930bd6ef41bc2::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 9435932ed..3a1ba589d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -50,17 +50,17 @@ }, { "name": "topthink/framework", - "version": "v5.1.25", - "version_normalized": "5.1.25.0", + "version": "v5.1.27", + "version_normalized": "5.1.27.0", "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "2e684d5fa38bd2d8ee864982f3114a28992da895" + "reference": "f607b8fd51cc25e4da7e2f4ef0d5e64f390d36bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/2e684d5fa38bd2d8ee864982f3114a28992da895", - "reference": "2e684d5fa38bd2d8ee864982f3114a28992da895", + "url": "https://api.github.com/repos/top-think/framework/zipball/f607b8fd51cc25e4da7e2f4ef0d5e64f390d36bd", + "reference": "f607b8fd51cc25e4da7e2f4ef0d5e64f390d36bd", "shasum": "", "mirrors": [ { @@ -82,7 +82,7 @@ "sebastian/phpcpd": "2.*", "squizlabs/php_codesniffer": "2.*" }, - "time": "2018-10-04T05:04:50+00:00", + "time": "2018-10-22T02:10:08+00:00", "type": "think-framework", "installation-source": "dist", "notification-url": "https://packagist.org/downloads/", @@ -443,17 +443,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.1.14", - "version_normalized": "1.1.14.0", + "version": "v1.1.16", + "version_normalized": "1.1.16.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "328d21d32c3d06f5f050185a740f00fe475b6a03" + "reference": "8cd19c0e19ada95428709aa35f58e2bd00340b47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/328d21d32c3d06f5f050185a740f00fe475b6a03", - "reference": "328d21d32c3d06f5f050185a740f00fe475b6a03", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/8cd19c0e19ada95428709aa35f58e2bd00340b47", + "reference": "8cd19c0e19ada95428709aa35f58e2bd00340b47", "shasum": "", "mirrors": [ { @@ -464,10 +464,11 @@ }, "require": { "ext-curl": "*", + "ext-json": "*", "ext-openssl": "*", "php": ">=5.4" }, - "time": "2018-09-12T06:12:49+00:00", + "time": "2018-10-24T08:59:25+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/wechat-developer/Test/config.php b/vendor/zoujingli/wechat-developer/Test/config.php index 48fdd4ad3..403f7ef6f 100644 --- a/vendor/zoujingli/wechat-developer/Test/config.php +++ b/vendor/zoujingli/wechat-developer/Test/config.php @@ -20,7 +20,8 @@ return [ // 閰嶇疆鍟嗘埛鏀粯鍙傛暟 'mch_id' => "1332187001", 'mch_key' => 'A82DC5BD1F3359081049C568D8502BC5', - // 閰嶇疆鍟嗘埛鏀粯鍙屽悜璇佷功鐩綍 + // 閰嶇疆鍟嗘埛鏀粯鍙屽悜璇佷功鐩綍 锛坧12 | key,cert 浜岄変竴锛屼袱鑰呴兘閰嶇疆鏃秔12浼樺厛锛 + // 'ssl_p12' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.p12', 'ssl_key' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_key.pem', 'ssl_cer' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.pem', // 閰嶇疆缂撳瓨鐩綍锛岄渶瑕佹嫢鏈夊啓鏉冮檺 diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php index 22118fc5d..263ede660 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php @@ -79,10 +79,8 @@ class BasicPay public function getNotify() { $data = Tools::xml2arr(file_get_contents('php://input')); - if (!empty($data['sign'])) { - if ($this->getPaySign($data) === $data['sign']) { - return $data; - } + if (isset($data['sign']) && $this->getPaySign($data) === $data['sign']) { + return $data; } throw new InvalidResponseException('Invalid Notify.', '0'); } @@ -96,7 +94,6 @@ class BasicPay */ public function getPaySign(array $data, $signType = 'MD5', $buff = '') { - unset($data['sign']); ksort($data); foreach ($data as $k => $v) { $buff .= "{$k}={$v}&"; @@ -112,7 +109,8 @@ class BasicPay * 杞崲鐭摼鎺 * @param string $longUrl 闇瑕佽浆鎹㈢殑URL锛岀鍚嶇敤鍘熶覆锛屼紶杈撻渶URLencode * @return array - * @throws InvalidResponseException + * @throws \WeChat\Exceptions\ExcInvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException */ public function shortUrl($longUrl) { @@ -145,17 +143,28 @@ class BasicPay * @param bool $needSignType 鏄惁闇瑕佷紶绛惧悕绫诲瀷鍙傛暟 * @return array * @throws InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException */ protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true) { $option = []; if ($isCert) { + $option['ssl_p12'] = $this->config->get('ssl_p12'); $option['ssl_cer'] = $this->config->get('ssl_cer'); $option['ssl_key'] = $this->config->get('ssl_key'); - if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer'])) + if (is_string($option['ssl_p12']) && file_exists($option['ssl_p12'])) { + $content = file_get_contents($option['ssl_p12']); + if (openssl_pkcs12_read($content, $certs, $this->config->get('mch_id'))) { + $option['ssl_key'] = Tools::pushFile(md5($certs['pkey']) . '.pem', $certs['pkey']); + $option['ssl_cer'] = Tools::pushFile(md5($certs['cert']) . '.pem', $certs['cert']); + } else throw new InvalidArgumentException("P12 certificate does not match MCH_ID --- ssl_p12"); + } + if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer'])) { throw new InvalidArgumentException("Missing Config -- ssl_cer", '0'); - if (empty($option['ssl_key']) || !file_exists($option['ssl_key'])) + } + if (empty($option['ssl_key']) || !file_exists($option['ssl_key'])) { throw new InvalidArgumentException("Missing Config -- ssl_key", '0'); + } } $params = $this->params->merge($data); $needSignType && ($params['sign_type'] = strtoupper($signType)); diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php index 247bfe66b..40e23712f 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php @@ -75,10 +75,8 @@ class Tools if (empty($mines)) { $content = file_get_contents('http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types'); preg_match_all('#^([^\s]{2,}?)\s+(.+?)$#ism', $content, $matches, PREG_SET_ORDER); - foreach ($matches as $match) { - foreach (explode(" ", $match[2]) as $ext) { - $mines[$ext] = $match[1]; - } + foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) { + $mines[$ext] = $match[1]; } self::setCache('all_ext_mine', $mines); } @@ -256,20 +254,34 @@ class Tools return (intval($status["http_code"]) === 200) ? $content : false; } + /** + * 鍐欏叆鏂囦欢 + * @param string $name 鏂囦欢鍚嶇О + * @param string $content 鏂囦欢鍐呭 + * @return string + * @throws LocalCacheException + */ + public static function pushFile($name, $content) + { + $file = self::getCacheName($name); + if (!file_put_contents($file, $content)) throw new LocalCacheException('local file write error.', '0'); + return $file; + } + /** * 缂撳瓨閰嶇疆涓庡瓨鍌 * @param string $name 缂撳瓨鍚嶇О * @param string $value 缂撳瓨鍐呭 * @param int $expired 缂撳瓨鏃堕棿(0琛ㄧず姘镐箙缂撳瓨) + * @return string * @throws LocalCacheException */ public static function setCache($name, $value = '', $expired = 3600) { - $cache_file = self::getCacheName($name); + $file = self::getCacheName($name); $content = serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]); - if (!file_put_contents($cache_file, $content)) { - throw new LocalCacheException('local cache error.', '0'); - } + if (!file_put_contents($file, $content)) throw new LocalCacheException('local cache error.', '0'); + return $file; } /** @@ -279,8 +291,8 @@ class Tools */ public static function getCache($name) { - $cache_file = self::getCacheName($name); - if (file_exists($cache_file) && ($content = file_get_contents($cache_file))) { + $file = self::getCacheName($name); + if (file_exists($file) && ($content = file_get_contents($file))) { $data = unserialize($content); if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) { return $data['value']; @@ -297,8 +309,8 @@ class Tools */ public static function delCache($name) { - $cache_file = self::getCacheName($name); - return file_exists($cache_file) ? unlink($cache_file) : true; + $file = self::getCacheName($name); + return file_exists($file) ? unlink($file) : true; } /** diff --git a/vendor/zoujingli/wechat-developer/WePay/TransfersBank.php b/vendor/zoujingli/wechat-developer/WePay/TransfersBank.php index f53aacb3b..5f57c82da 100644 --- a/vendor/zoujingli/wechat-developer/WePay/TransfersBank.php +++ b/vendor/zoujingli/wechat-developer/WePay/TransfersBank.php @@ -53,7 +53,6 @@ class TransfersBank extends BasicPay if (!isset($options['amount'])) { throw new InvalidArgumentException('Missing Options -- [amount]'); } - isset($options['desc']) && $this->params->set('desc', $options['desc']); $this->params->offsetUnset('appid'); return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [ 'amount' => $options['amount'], @@ -61,6 +60,7 @@ class TransfersBank extends BasicPay 'partner_trade_no' => $options['partner_trade_no'], 'enc_bank_no' => $this->rsaEncode($options['enc_bank_no']), 'enc_true_name' => $this->rsaEncode($options['enc_true_name']), + 'desc' => isset($options['desc']) ? $options['desc'] : '', ], true, 'MD5', false); } @@ -68,7 +68,8 @@ class TransfersBank extends BasicPay * 鍟嗘埛浼佷笟浠樻鍒伴摱琛屽崱鎿嶄綔杩涜缁撴灉鏌ヨ * @param string $partnerTradeNo 鍟嗘埛璁㈠崟鍙凤紝闇淇濇寔鍞竴 * @return array - * @throws \WeChat\Exceptions\InvalidResponseException + * @throws InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException */ public function query($partnerTradeNo) { diff --git a/vendor/zoujingli/wechat-developer/composer.json b/vendor/zoujingli/wechat-developer/composer.json index 371dff343..5ed2a6ee5 100644 --- a/vendor/zoujingli/wechat-developer/composer.json +++ b/vendor/zoujingli/wechat-developer/composer.json @@ -20,6 +20,7 @@ ], "require": { "php": ">=5.4", + "ext-json": "*", "ext-curl": "*", "ext-openssl": "*" },