From fb4976501ab7913c3a454a1d73e8e32f6aa5f8b7 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 30 Dec 2019 17:38:14 +0800 Subject: [PATCH] ComposerUpdate --- app/admin/view/api/plugs/upload.js | 2 +- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- vendor/zoujingli/think-library/src/lang/en-us.php | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/admin/view/api/plugs/upload.js b/app/admin/view/api/plugs/upload.js index bc9823dea..8e537967e 100644 --- a/app/admin/view/api/plugs/upload.js +++ b/app/admin/view/api/plugs/upload.js @@ -22,7 +22,7 @@ define(['md5'], function (SparkMD5, allowExtsMimes) { files = object.pushFile(), $input.data('files', files); for (index in files) md5file(files[index]).then(function (file) { $input.data('file', file).data('index', index); - jQuery.ajax("?s=admin/api.upload/state", { + jQuery.ajax("{:url('@admin/api.upload/state')}", { data: {xkey: file.xkey, uptype: uptype, safe: safe}, method: 'post', success: function (ret) { file.xurl = ret.data.url; if (ret.code === 404) { diff --git a/composer.lock b/composer.lock index 0621fb3fa..a03c1fdbf 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf" + "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", - "reference": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", + "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-12-30T07:02:34+00:00" + "time": "2019-12-30T07:20:40+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0e4ff69ef..12c28915e 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": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf" + "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", - "reference": "cc6078bda8b769fee0f694c1ccd19aa66e61a6cf", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", + "reference": "8d9a76ebfaf1ddd430a997f3bef892b7a5800f4c", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-12-30T07:02:34+00:00", + "time": "2019-12-30T07:20:40+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 9353832ac..2fc4e9b87 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/lang/en-us.php b/vendor/zoujingli/think-library/src/lang/en-us.php index 4bcfff5d4..c22fdefd8 100644 --- a/vendor/zoujingli/think-library/src/lang/en-us.php +++ b/vendor/zoujingli/think-library/src/lang/en-us.php @@ -16,14 +16,14 @@ return [ 'think_library_not_auth' => '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_success' => '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_success' => '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_success' => '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_success' => '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_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