Browse Source

[更新]同步framework代码

Anyon 5 năm trước cách đây
mục cha
commit
4fa3cea59d

+ 225 - 0
LICENSE.md

@@ -0,0 +1,225 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========================================================================
+The following license applies to the ip2region library
+--------------------------------------------------------------------------
+Copyright (c) 2015 Lionsoul<chenxin619315@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ 3 - 0
README.md

@@ -1,3 +1,6 @@
+[![Latest Stable Version](https://poser.pugx.org/zoujingli/thinkadmin/v/stable)](https://packagist.org/packages/zoujingli/thinkadmin) [![Total Downloads](https://poser.pugx.org/zoujingli/thinkadmin/downloads)](https://packagist.org/packages/zoujingli/thinkadmin) [![Latest Unstable Version](https://poser.pugx.org/zoujingli/thinkadmin/v/unstable)](https://packagist.org/packages/zoujingli/thinkadmin) [![License](https://poser.pugx.org/zoujingli/thinkadmin/license)](https://packagist.org/packages/zoujingli/thinkadmin)
+
+
 大道至简 · 原生框架
 --
 ThinkAdmin V4.0 是一个基于 ThinkPHP5.1 开发的后台管理系统。

+ 1 - 1
vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0::getLoader();
+return ComposerAutoloaderInit8651ef010a748f71dab0ecc2b38ca5a2::getLoader();

+ 7 - 7
vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0
+class ComposerAutoloaderInit8651ef010a748f71dab0ecc2b38ca5a2
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit8651ef010a748f71dab0ecc2b38ca5a2', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit8651ef010a748f71dab0ecc2b38ca5a2', '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\ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit8651ef010a748f71dab0ecc2b38ca5a2::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit8651ef010a748f71dab0ecc2b38ca5a2::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire0572b4f33e87472ba8ec9af0ef3293f0($fileIdentifier, $file);
+            composerRequire8651ef010a748f71dab0ecc2b38ca5a2($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire0572b4f33e87472ba8ec9af0ef3293f0($fileIdentifier, $file)
+function composerRequire8651ef010a748f71dab0ecc2b38ca5a2($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

+ 4 - 4
vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0
+class ComposerStaticInit8651ef010a748f71dab0ecc2b38ca5a2
 {
     public static $files = array (
         '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@@ -346,9 +346,9 @@ class ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit8651ef010a748f71dab0ecc2b38ca5a2::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit8651ef010a748f71dab0ecc2b38ca5a2::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit8651ef010a748f71dab0ecc2b38ca5a2::$classMap;
 
         }, null, ClassLoader::class);
     }

+ 4 - 4
vendor/composer/installed.json

@@ -499,12 +499,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "706b33fa3d9c9106b61e5c2949a279dc4009f066"
+            "reference": "e0532657e7408ffb76806b421d34e9833e414ea1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/706b33fa3d9c9106b61e5c2949a279dc4009f066",
-            "reference": "706b33fa3d9c9106b61e5c2949a279dc4009f066",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e0532657e7408ffb76806b421d34e9833e414ea1",
+            "reference": "e0532657e7408ffb76806b421d34e9833e414ea1",
             "shasum": "",
             "mirrors": [
                 {
@@ -523,7 +523,7 @@
             "qiniu/php-sdk": "^7.2",
             "topthink/framework": "5.1.*"
         },
-        "time": "2019-06-04T02:50:32+00:00",
+        "time": "2019-06-13T02:34:10+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

+ 2 - 1
vendor/zoujingli/think-library/src/common.php

@@ -80,7 +80,8 @@ if (!function_exists('systoken')) {
      */
     function systoken($node = null)
     {
-        $csrf = \library\tools\Csrf::buildFormToken($node);
+        $real = \library\tools\Node::get($node);
+        $csrf = \library\tools\Csrf::buildFormToken($real);
         return $csrf['token'];
     }
 }

+ 21 - 1
vendor/zoujingli/think-library/src/tools/Data.php

@@ -153,8 +153,28 @@ class Data
     }
 
     /**
+     * 获取随机字符串编码
+     * @param integer $length
+     * @param integer $type
+     * @return string
+     */
+    public static function randomCode($length = 10, $type = 1)
+    {
+        list($nchars, $schars) = [join('', range(0, 9)), join('', range('a', 'z'))];
+        if (intval($type) === 1) list($strs, $chars) = [range(1, 9), $nchars];
+        if (intval($type) === 2) list($strs, $chars) = ['', $schars];
+        if (intval($type) === 3) list($strs, $chars) = ['', $nchars . $schars];
+        if (isset($strs) && isset($chars)) {
+            while (strlen($strs) < $length) $strs .= $chars[rand(0, strlen($chars) - 1)];
+            return $strs;
+        } else {
+            return self::uniqidNumberCode();
+        }
+    }
+
+    /**
      * 文件大小显示转换
-     * @param integer $size
+     * @param integer $size 文件大小
      * @param integer $dec
      * @return string
      */

+ 22 - 3
vendor/zoujingli/think-library/src/tools/Node.php

@@ -14,6 +14,8 @@
 
 namespace library\tools;
 
+use think\facade\Request;
+
 /**
  * 控制器节点管理器
  * Class Node
@@ -29,14 +31,31 @@ class Node
     protected static $ignore = ['initialize', 'success', 'error', 'redirect', 'fetch', 'assign', 'callback'];
 
     /**
+     * 获取标准访问节点
+     * @param string $node
+     * @return string
+     */
+    public static function get($node = null)
+    {
+        if (empty($node)) return self::current();
+        if (count(explode('/', $node)) === 1) {
+            $preNode = Request::module() . '/' . Request::controller();
+            return self::parseString($preNode) . '/' . strtolower($node);
+        }
+        if (count($attr = explode('/', $node)) >= 3) {
+            $attr[1] = self::parseString($attr[1]);
+        }
+        return strtolower(join('/', $attr));
+    }
+
+    /**
      * 获取当前访问节点
      * @return string
      */
     public static function current()
     {
-        $request = request();
-        list($module, $controller, $action) = [$request->module(), $request->controller(), $request->action()];
-        return self::parseString("{$module}/{$controller}") . '/' . strtolower($action);
+        $preNode = Request::module() . '/' . Request::controller();
+        return self::parseString($preNode) . '/' . strtolower(Request::action());
     }
 
     /**