diff --git a/composer.lock b/composer.lock index e90a6ffb3..0621fb3fa 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "53c8d243412a6fafe4cec8aaf6795bea04455b78" + "reference": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/53c8d243412a6fafe4cec8aaf6795bea04455b78", - "reference": "53c8d243412a6fafe4cec8aaf6795bea04455b78", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", + "reference": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-12-30T06:41:04+00:00" + "time": "2019-12-30T07:02:34+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 10b9ba8a3..0e4ff69ef 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "53c8d243412a6fafe4cec8aaf6795bea04455b78" + "reference": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/53c8d243412a6fafe4cec8aaf6795bea04455b78", - "reference": "53c8d243412a6fafe4cec8aaf6795bea04455b78", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", + "reference": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-12-30T06:41:04+00:00", + "time": "2019-12-30T07:02:34+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 9019f95ca..9353832ac 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php index 6dceb1a84..be97dac3f 100644 --- a/vendor/zoujingli/think-library/src/Library.php +++ b/vendor/zoujingli/think-library/src/Library.php @@ -19,6 +19,7 @@ use think\admin\service\AdminService; use think\middleware\SessionInit; use think\Request; use think\Service; +use function Composer\Autoload\includeFile; /** * 模块注册服务 @@ -33,9 +34,8 @@ class Library extends Service public function register() { // 读取中文语言 - if ($this->app->lang->getLangSet() === 'zh-cn') { - $this->app->lang->load(__DIR__ . '/lang/zh-cn.php', 'zh-cn'); - } + $this->app->lang->load(__DIR__ . '/lang/zh-cn.php', 'zh-cn'); + $this->app->lang->load(__DIR__ . '/lang/en-us.php', 'en-us'); // 判断访问模式 if ($this->app->request->isCli()) { if (empty($_SERVER['REQUEST_URI']) && isset($_SERVER['argv'][1])) { @@ -68,9 +68,8 @@ class Library extends Service }, 'route'); } // 动态加入应用函数 - foreach (glob($this->app->getAppPath() . '*/sys.php') as $file) { - \Composer\Autoload\includeFile($file); - } + $syspath = "{$this->app->getAppPath()}*/sys.php"; + foreach (glob($syspath) as $file) includeFile($file); } /** diff --git a/vendor/zoujingli/think-library/src/lang/en-us.php b/vendor/zoujingli/think-library/src/lang/en-us.php new file mode 100644 index 000000000..4bcfff5d4 --- /dev/null +++ b/vendor/zoujingli/think-library/src/lang/en-us.php @@ -0,0 +1,29 @@ + 'Sorry, no permission to access the operation.', + 'think_library_not_login' => 'Sorry, requiring login to obtain view permission.', + 'think_library_delete_success' => 'Congratulation! Data deletion completed.', + 'think_library_delete_error' => 'Sorry, data deletion failed, please try again later.', + 'think_library_form_success' => 'Congratulation! Data saving completed.', + 'think_library_form_error' => 'Sorry, data saving failed, please try again later.', + 'think_library_save_success' => 'Congratulation! Data update completed.', + 'think_library_save_error' => 'Sorry, Data update failed, please try again later.', + 'think_library_sort_success' => 'Congratulation! Modification of list sort completed.', + 'think_library_sort_error' => 'Sorry, modification of list sort failed, please try again later.', + 'think_library_page_html' => 'total %s records, display %s per page, total %s page current display %s page.', + 'think_library_csrf_error' => 'Form token validation failed, please refresh and try again later.', +]; \ No newline at end of file