#866: Merge branch 'master' of https://github.com/zoujingli/ThinkAdmin

# Conflicts:
#	vendor/autoload.php
#	vendor/composer/autoload_real.php
#	vendor/composer/autoload_static.php

commit.ref

@@ -1 +1 @@
-Subproject commit f17e5c00a36882cdf08c5bff94f2908607c7d7f0
+Subproject commit a8be6c7ccd4ec72e018ccc60e039a17dbb8db22e

commit.yml

@@ -1,149 +1,9 @@
 !revision
 branches: {
   }
-fileChange:
-  /thinkphp:
-    newFile: !uuid '60ad029fa2380036601d324a22f3db1083fd5f99'
-    oldFile: !uuid 'd9baa5329cd2f1c61b20e4f532702b015869c6ad'
-  /thinkphp/convention.php:
-    newFile: !uuid '3e2d31ffbfb47f989b635827cb886d71082657d3'
-    oldFile: !uuid '4cae2c34c12e3ce38871c1ff46517e309be02da0'
-  /thinkphp/helper.php:
-    newFile: !uuid '30670f9f16371e33b12f54806d2a0dadebf2ec46'
-    oldFile: !uuid '18ade67df2b967d464b69ff20c053ebff276c186'
-  /thinkphp/library:
-    newFile: !uuid '5e49c53205699d3b518bf5d61a85e27ebf957dec'
-    oldFile: !uuid 'e78562924e03d98a0a24fb7ae45edbaf85fe05f8'
-  /thinkphp/library/think:
-    newFile: !uuid 'c8c4fa8535589e3e869b70787367919213f49d8c'
-    oldFile: !uuid '2a712907e7ac0aa14bfafb49dac1aecf209e51ff'
-  /thinkphp/library/think/App.php:
-    newFile: !uuid '6da1888b5e6e6146f5e219f654a2e55e2c1fd0ca'
-    oldFile: !uuid 'fb59cfd8cf13c3f7415f87d3e7e66f2a364e0b4c'
-  /thinkphp/library/think/Container.php:
-    newFile: !uuid '08c48a076cdeef6f6f0b8dee24573427468fb50f'
-    oldFile: !uuid 'b138e600395cc606b9ba9d03e32695b71952381e'
-  /thinkphp/library/think/Controller.php:
-    newFile: !uuid 'ffa3818661c392a520237cfae6488b4f70a0ab42'
-    oldFile: !uuid '28909c89ff3c0ee93c28489f75d3fe53a922523e'
-  /thinkphp/library/think/Loader.php:
-    newFile: !uuid '6354f9e47efd0731b54619c79494b295e218eb71'
-    oldFile: !uuid 'd8065f23cebe2ff45d5cbdb6e995fdf931935b65'
-  /thinkphp/library/think/Log.php:
-    newFile: !uuid 'b584ee78f3705d928e9b03a8b6db70d6f3782b37'
-    oldFile: !uuid '0e8248dfdbd278ec7df92ebb1bfdf434a73508a8'
-  /thinkphp/library/think/Middleware.php:
-    newFile: !uuid '6c2d22116fb052d12c3ec1625e70200b4cd56ee2'
-    oldFile: !uuid '296de275b0818326da56766a408e7049e6ce2d14'
-  /thinkphp/library/think/Request.php:
-    newFile: !uuid '16db947bbc3ef2f0b8921d6c34972a006e29b4fc'
-    oldFile: !uuid '66b88ce9c0a9cec6897da1efd8f34644defb7b40'
-  /thinkphp/library/think/Route.php:
-    newFile: !uuid '645fb9e1d782f1dd904d05bd4a3ca2fd0a9b8966'
-    oldFile: !uuid '81f914b9f8bf9b02599c9c8fde1422dc63f15df4'
-  /thinkphp/library/think/Url.php:
-    newFile: !uuid '1e4dfd7d260f38868363a739b0c58a6d0fb07fb3'
-    oldFile: !uuid 'a7281df467f19b256e2ae3504c9ecb6332086bb0'
-  /thinkphp/library/think/Validate.php:
-    newFile: !uuid '930f7d0fa45150d416bd44ef223e13a881e6b6c9'
-    oldFile: !uuid '4abfc6b251e9b9a7d8f357a0fd267235c0630bb5'
-  /thinkphp/library/think/cache:
-    newFile: !uuid '5fc84cfb04f1ece27cdc777ea3e8c420e12a7c15'
-    oldFile: !uuid '26644341daa7a368b1ed8636527dfdbda2acd13f'
-  /thinkphp/library/think/cache/driver:
-    newFile: !uuid 'e32eb3505e58b9f5a2255d2c3a2b24b943390bf5'
-    oldFile: !uuid '90dfef8e10c56f90a018b9cfa3bcf4b1f8820810'
-  /thinkphp/library/think/cache/driver/File.php:
-    newFile: !uuid '5f10200bf58a1a080b45fe904203ed6cfb8bdd72'
-    oldFile: !uuid '3ff1a01282951994a119a44a8a5af8ce91959bb4'
-  /thinkphp/library/think/cache/driver/Redis.php:
-    newFile: !uuid '77958c334a4f76e33aa29c66403882a1e7e508a0'
-    oldFile: !uuid '2f019608ccf883770fbe98a37a06645ff0c82c91'
-  /thinkphp/library/think/db:
-    newFile: !uuid 'c6c2c52a9b264a006f69d3dda404d63b7ae92060'
-    oldFile: !uuid '84224a2e0242d3585ae13c195cd2752210a842d2'
-  /thinkphp/library/think/db/Builder.php:
-    newFile: !uuid '78ea0f4a9c35e4875ea45200daeabe6ff4ab3405'
-    oldFile: !uuid 'd6a5df4e73f0f019080f210e20937248463fe9dc'
-  /thinkphp/library/think/db/builder:
-    newFile: !uuid 'ee78004d4ac30eeb752575d7323b86c714b062b2'
-    oldFile: !uuid 'd0f3a2a92cacb5ba75969e41f4dbf51b583b5258'
-  /thinkphp/library/think/db/builder/Mysql.php:
-    newFile: !uuid 'a73fa293da29ae4bb9da56cd22b289860a34fa09'
-    oldFile: !uuid 'f5cd5f400bdc8160a2136aef43f859cf4639516e'
-  /thinkphp/library/think/log:
-    newFile: !uuid '5be7af7257d14cf54fa019140705996db1257c92'
-    oldFile: !uuid 'bb86c8ca9efaf8b3a61c66346c260e82572290be'
-  /thinkphp/library/think/log/driver:
-    newFile: !uuid 'b4fc578d9f1f2a88cf18488be696e6d8386890f4'
-    oldFile: !uuid '27d3187f124cca28d7b73f523ffb7242bd578fa0'
-  /thinkphp/library/think/log/driver/File.php:
-    newFile: !uuid '1db14925bf32cd77b8711f6afe36ede71e74d352'
-    oldFile: !uuid 'f715092228139632bbcaa15fec2f49a4d5088864'
-  /thinkphp/library/think/route:
-    newFile: !uuid 'f83074fb6938e907b2af8ee0c94ba828273809d2'
-    oldFile: !uuid '61a39c1d2f9fda1abd0a877dd561a900032d5468'
-  /thinkphp/library/think/route/Dispatch.php:
-    newFile: !uuid 'ec7e1549731239c2786a0eaed810fcc730560aa2'
-    oldFile: !uuid 'ca6b5d63de72552593ad5ddfbcb5b6c68796d0f3'
-  /thinkphp/library/think/route/Domain.php:
-    newFile: !uuid '9043017c40f1707075429fdee2803e01d5439fd6'
-    oldFile: !uuid '08581908e217fe5c806edec84a49cd9baf4dcad3'
-  /thinkphp/library/think/route/Rule.php:
-    newFile: !uuid '8d53c437773650dd792ea58f4c139c1965f8eeb0'
-    oldFile: !uuid '92f1ce9defbe316931840939e9eaa28ea9b63568'
-  /thinkphp/library/think/route/RuleGroup.php:
-    newFile: !uuid 'bf8c65897b4930db81bdb32e0bb97f9326f5d9dd'
-    oldFile: !uuid '4f2f7d14738bc52e4c9f4b3020cc2e7da263f7ca'
-  /thinkphp/library/think/route/RuleItem.php:
-    newFile: !uuid '27e5e7548f25ce0eda4348e988f191a6dc6e0cb2'
-    oldFile: !uuid 'b7873b0cfd6238e59f8919a2244724257d041f53'
-  /thinkphp/library/think/route/RuleName.php:
-    newFile: !uuid '408a7c93e67cc7a6472271ff0cd748fc2be6aa73'
-    oldFile: !uuid '460ccab39ed1ea543813e8cff10750a1e2b17c37'
-  /thinkphp/library/think/route/dispatch:
-    newFile: !uuid 'd584c1ae0f6478fe797b415e1b9578d80750a7a1'
-    oldFile: !uuid '98d132c3d88e9cc00a6485c6d5af4790ff21f2b9'
-  /thinkphp/library/think/route/dispatch/Module.php:
-    newFile: !uuid '26c92e94d9a8da54298a8c88dedbe1b8ef420568'
-    oldFile: !uuid 'ed8e21ec0e07f8863c58a065d837858c60ab2f75'
-  /thinkphp/library/think/route/dispatch/Url.php:
-    newFile: !uuid 'f26197aae32f14254a5c725004e5f594b7d4ffdb'
-    oldFile: !uuid '1d5b9d01a398aff4d8f2bfee04a4e27e40f44588'
-  /thinkphp/library/think/view:
-    newFile: !uuid '02a6b63831798ec16873361445861c9e78118521'
-    oldFile: !uuid '8dbb1923f61f76c024736f44f33192eaf0efa4da'
-  /thinkphp/library/think/view/driver:
-    newFile: !uuid '11ca3b9fdfb0e06843e592120ddac76c1c795b03'
-    oldFile: !uuid 'da92015eb52120c090f191c0728b90e0a70fc8b6'
-  /thinkphp/library/think/view/driver/Php.php:
-    newFile: !uuid '6e5db3bd778f2810dd5d9b93f84b1ce2c910b333'
-    oldFile: !uuid 'e2091aadafc658062a8ff6f314f688c22836c9a1'
-  /thinkphp/library/think/view/driver/Think.php:
-    newFile: !uuid '137acf85939571819e13b7115052cbdb7edc5be7'
-    oldFile: !uuid '83daa1c5728e876966768b4725426ec9655f885c'
-  /vendor:
-    newFile: !uuid 'e645259307aeea645542d1c9166357d484125af6'
-    oldFile: !uuid 'f47b40af50761fd7874d12a0fa6d525f8c66e6af'
-  /vendor/autoload.php:
-    newFile: !uuid '370320b1ce63f33202632fc67402148bd8450eb5'
-    oldFile: !uuid 'b72f4a9329072424eccae570c76e728d4d24e881'
-  /vendor/composer:
-    newFile: !uuid '189e69d8ffa19cc54fa7a54a492837901ef41cbc'
-    oldFile: !uuid '3d3fc7880e5ab3fb02d40d45654f975db87d9dd8'
-  /vendor/composer/autoload_classmap.php:
-    newFile: !uuid 'a750b2486ffc1e5ae8e1dfc1dec560931b78de1a'
-    oldFile: !uuid 'c18d97a36e4bbe97f138ef444d72299fc1c081c4'
-  /vendor/composer/autoload_real.php:
-    newFile: !uuid '6797dae11b522dd59442cc27d5ad9c1450ecdc90'
-    oldFile: !uuid '8d2b66e79661d4f0b51b67e6c2b7248571e19630'
-  /vendor/composer/autoload_static.php:
-    newFile: !uuid '6c4c81d93940585048edd0572253a5334d07d8fc'
-    oldFile: !uuid 'd77aefaf381d429089b056c950b5ec340cd37c5e'
-  /vendor/composer/installed.json:
-    newFile: !uuid 'e47427012a5153ca7fda58eaf80c623f642b94fe'
-    oldFile: !uuid '277d7f926ac5367809f35c32cf5135e8d2c10583'
-gitCommitId: !uuid 'f17e5c00a36882cdf08c5bff94f2908607c7d7f0'
+fileChange: {
+  }
+gitCommitId: !uuid 'a8be6c7ccd4ec72e018ccc60e039a17dbb8db22e'
 renames: {
   }
-revisionId: 865
+revisionId: 866