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

commit.ref

@@ -1 +1 @@
-Subproject commit a0eea84051aad4351e3a6bc999ed5bb2ade83f93
+Subproject commit cb503506758d89000dca6c98ca875c9166b40b82

commit.yml

@@ -3,21 +3,156 @@ branches: {
   }
 fileChange:
   /application:
-    newFile: !uuid '9a9a3094c57ed98302e200053a49092666023e81'
-    oldFile: !uuid 'fcfadeca5903d052b8db8142be6d4443c21ca7ae'
+    newFile: !uuid '0ad19ab827d95210e01b46cf527ccae320d56546'
+    oldFile: !uuid '9a9a3094c57ed98302e200053a49092666023e81'
   /application/wechat:
-    newFile: !uuid '721008bc0ec2b421c22b07eb4615975b3f27cf45'
-    oldFile: !uuid 'b740a5e1da7430195d5882b06ccab8571517b270'
+    newFile: !uuid '08700c07828ccbb6266c5d9c88bf659617a427fa'
+    oldFile: !uuid '721008bc0ec2b421c22b07eb4615975b3f27cf45'
   /application/wechat/controller:
-    newFile: !uuid 'e0e350e87be9440f9191a708c867d5371f50af66'
-    oldFile: !uuid '0fa509f2fc49a167f955e492c43fad497858295e'
-  /application/wechat/controller/api:
-    newFile: !uuid '479e84ae11195a7951d5b4484ed383b8b6937ae6'
-    oldFile: !uuid 'c381d64c1dd921c5cfe9f2eed98986d8aed6c222'
-  /application/wechat/controller/api/Push.php:
-    newFile: !uuid '320e30e067c086a9a4e79bed681c16cf531ae018'
-    oldFile: !uuid 'ee0d400dafed5cc44dbd8a3ddcba2a0d286353cc'
-gitCommitId: !uuid 'a0eea84051aad4351e3a6bc999ed5bb2ade83f93'
+    newFile: !uuid 'fb3d6ee8c3f7cbad08bb31f3a3800b293b9f3a71'
+    oldFile: !uuid 'e0e350e87be9440f9191a708c867d5371f50af66'
+  /application/wechat/controller/Config.php:
+    newFile: !uuid '625e261d310360ca497541ec4066f62d84493596'
+    oldFile: !uuid '7a332a5953e9316502a4f6d252839a8d1a2568d1'
+  /application/wechat/controller/Keys.php:
+    newFile: !uuid 'e680a008c15cc8003d5861f923de8bcc492117ed'
+    oldFile: !uuid 'd4f1d71e3aa90f8a9b39da6a2cb729409afe10a7'
+  /thinkphp:
+    newFile: !uuid '065efaad5b4c7ba52632168cbe812327d03bb956'
+    oldFile: !uuid '0748b4f05a706e0a35ef33605ba85a9fbc57d6a8'
+  /thinkphp/library:
+    newFile: !uuid '100abff5a3fda88bc0768e991630d5252509d1fb'
+    oldFile: !uuid '5d25476c541aa99ddc621c1b5c806f0f2edeec99'
+  /thinkphp/library/think:
+    newFile: !uuid 'e74663dfdd7a1501523ca9a7334c0ca178cd1ec4'
+    oldFile: !uuid '5487a9eb05bac1b5face3b1bac46538e5e02c6b6'
+  /thinkphp/library/think/App.php:
+    newFile: !uuid '600946a90d6bf053db23b797981eda11aa55f126'
+    oldFile: !uuid 'edeb2d04809f2a35650d3a4ada51e5b106bd4873'
+  /thinkphp/library/think/Db.php:
+    newFile: !uuid '6af0e3d44a10b01ca1841bff3e2f9710aa32e362'
+    oldFile: !uuid '9be2dd2ea252b92417646a88e5ac8f17bc660716'
+  /thinkphp/library/think/Model.php:
+    newFile: !uuid 'd1d67d45d3fae073caadb8003acc440fc51ef610'
+    oldFile: !uuid '3fd30288c0f34da6e9d5eb592da97d8c9b000490'
+  /thinkphp/library/think/Paginator.php:
+    newFile: !uuid 'bbe63e2e31fad0a785638086305c153e5292ba84'
+    oldFile: !uuid 'e2f9b898f416fd74b89e18b099523e1fffaf5b93'
+  /thinkphp/library/think/Request.php:
+    newFile: !uuid 'fd3540fca95ddb6f85e8e51297646576d8d4262b'
+    oldFile: !uuid 'c627d06d783eeba29492489c2fda33b9e0c83617'
+  /thinkphp/library/think/Route.php:
+    newFile: !uuid '9d340e45f34d7e506967df8144ed9e22063025e2'
+    oldFile: !uuid '645fb9e1d782f1dd904d05bd4a3ca2fd0a9b8966'
+  /thinkphp/library/think/Url.php:
+    newFile: !uuid '613b32114cda4adf22b15653e1d2c1e637b6d206'
+    oldFile: !uuid '1e4dfd7d260f38868363a739b0c58a6d0fb07fb3'
+  /thinkphp/library/think/db:
+    newFile: !uuid '53b0b7b9cdb2ffd77f8679829a4e72d5f7990127'
+    oldFile: !uuid '15205447416f7d5df3167ad01e8a40a705f41b07'
+  /thinkphp/library/think/db/Builder.php:
+    newFile: !uuid 'bc2dcb20d8c9e6c876533679e26fe04120c438a8'
+    oldFile: !uuid '9e41c40739dfc7e14c4580e0d5c613c2cc54752c'
+  /thinkphp/library/think/db/Connection.php:
+    newFile: !uuid '36b0fa5477c44e8715f331c422930d758e69d719'
+    oldFile: !uuid 'c46579005d7e8eb84ae033232dc3682a06e0d9d3'
+  /thinkphp/library/think/db/Query.php:
+    newFile: !uuid '991d231676d110021714d4ea1f0adf44f2fcdb24'
+    oldFile: !uuid 'd5c5e151aa4ad7b35725bdc97f55de4a98c866a8'
+  /thinkphp/library/think/model:
+    newFile: !uuid 'f1fe6dd4c8ebde92d263e193e0f9641f20f0ab75'
+    oldFile: !uuid '884c2caab69e4692f3455d5be86d9de7490226ab'
+  /thinkphp/library/think/model/Collection.php:
+    newFile: !uuid '3a9b60f590586baee595960c665035f6b8477e4b'
+    oldFile: !uuid '1b6061a27a7b168784b2b20a849474e47ce59b82'
+  /thinkphp/library/think/paginator:
+    newFile: !uuid '6a661ccdfef242fc134e7bf4a9f9560dae350b2a'
+    oldFile: !uuid '68c2d09992467920b4f77a6575d1a95ac9d11c7d'
+  /thinkphp/library/think/paginator/Collection.php:
+    newFile: null
+    oldFile: !uuid '4005c9ff98ba5fddcc77beea4529ad5f2ff99cab'
+  /thinkphp/library/think/template:
+    newFile: !uuid 'd5c9daca58f49885a5293f29f7607a4efc9475aa'
+    oldFile: !uuid '5d856c9f6aacae6001b439a8955afe7e2440f12a'
+  /thinkphp/library/think/template/driver:
+    newFile: !uuid 'd8fc3fafd85c83959ad81ccb2a3cee9e96a60981'
+    oldFile: !uuid 'aff11ead99cd1a631f0ba49d593430103bc5909d'
+  /thinkphp/library/think/template/driver/File.php:
+    newFile: !uuid '3b96a0f3ba927d910532b632e7c07e30389cb73e'
+    oldFile: !uuid '45a0ab0280035cef7c0661e8609f517792e517ce'
+  /thinkphp/library/think/view:
+    newFile: !uuid 'd563118b193ee2349d83e1a91efbfee2e10ba1ee'
+    oldFile: !uuid '39030b3012e7b9e4ff71b791f564f995ca627de5'
+  /thinkphp/library/think/view/driver:
+    newFile: !uuid '503f5ef678f54c3a5436087299c4ca66790e24f5'
+    oldFile: !uuid 'e190d7b68217a0173d1b68f0518f896f49eb14f6'
+  /thinkphp/library/think/view/driver/Php.php:
+    newFile: !uuid 'a1a03ebd4891393711877a8a462177b3b083b368'
+    oldFile: !uuid '7deae11335d3d6d0ff93d4a90eb5a8b6e01b9aba'
+  /vendor:
+    newFile: !uuid 'bddc78e079926fddf4703baa8c20fdd35d6362a2'
+    oldFile: !uuid '300e9276fe4e2e0be01bbb4db4ff34fc1e5eca25'
+  /vendor/autoload.php:
+    newFile: !uuid '8d751c70f9d25626cab0fe91da0e67a2c53a8b94'
+    oldFile: !uuid 'c2459abebf3be27b9f4c62e2e92e2d2849b4be9e'
+  /vendor/composer:
+    newFile: !uuid '231fa8a47350097ad7bf9f1f3f3f52b2822a37bd'
+    oldFile: !uuid '34a132985f9b862d45193fc113cd07a55e87a490'
+  /vendor/composer/autoload_classmap.php:
+    newFile: !uuid 'b91dee85a78de86d10a1a7783edde1a81d6ebbf0'
+    oldFile: !uuid 'c7cb81d53c60fb02c8908f9c0f68a5213c92613e'
+  /vendor/composer/autoload_real.php:
+    newFile: !uuid '9ea608ea095b1231e55f2e40e289189211325001'
+    oldFile: !uuid '2bf76fdfcfe66904bd3de44ea9024575fd4534ac'
+  /vendor/composer/autoload_static.php:
+    newFile: !uuid 'b38a33bc94d6318916e433ec9589c7f400c993ab'
+    oldFile: !uuid 'cd922f84f9243e9457e06b247d2d04699a5ecdb0'
+  /vendor/composer/installed.json:
+    newFile: !uuid '8322dc2a3b6625129d4532a22008fd2af13c88a1'
+    oldFile: !uuid 'eb4bf6960f24ce9f5701c9d11796810d94eb2b1d'
+  /vendor/symfony:
+    newFile: !uuid '73c579836e8aee042fcbd2239a3e7915602ef48e'
+    oldFile: !uuid '69dd0fe992a8b9ea3580c268db4c9d15514d7413'
+  /vendor/symfony/options-resolver:
+    newFile: !uuid 'e77e3dc8e5e93456a0eb958b204c87954b3b3caa'
+    oldFile: !uuid '140a739a11758c2fcf71f9d21d3e3e434c575552'
+  /vendor/symfony/options-resolver/CHANGELOG.md:
+    newFile: !uuid '5f6d15b2c7ddc45f2d0f915bf1b8bab27f9a7d1d'
+    oldFile: !uuid '6e9d49fb61d75997a3bcfa9177f3062fcd397247'
+  /vendor/symfony/options-resolver/Debug:
+    newFile: null
+    oldFile: !uuid '304bb1f1d545656f41ee599a48e19847cfc7443f'
+  /vendor/symfony/options-resolver/Debug/OptionsResolverIntrospector.php:
+    newFile: null
+    oldFile: !uuid '60317243e9c4f937e6f181f079c0eda0cdb1ef93'
+  /vendor/symfony/options-resolver/Exception:
+    newFile: !uuid 'c47a15a4b48a0f23b5d0169f83d29f2efbba84c8'
+    oldFile: !uuid '269957ce66d2e9afe5ccef3a4348c15b74ac66a5'
+  /vendor/symfony/options-resolver/Exception/NoConfigurationException.php:
+    newFile: null
+    oldFile: !uuid '6693ec14df892d213865b404c6a3eb63e99cfb2e'
+  /vendor/symfony/options-resolver/LICENSE:
+    newFile: !uuid '17d16a13367dd1c08e82d1de69e2c44852dcc3d2'
+    oldFile: !uuid '21d7fb9e2f29b50caca3a76f0647e94e2cc8ddc1'
+  /vendor/symfony/options-resolver/OptionsResolver.php:
+    newFile: !uuid '32ac5663fdcb1b1c5713b85e0ef8bda380ee3a1e'
+    oldFile: !uuid '95a492de94bb8fb5a9dfa400a2dba20b58179dec'
+  /vendor/symfony/options-resolver/Tests:
+    newFile: !uuid 'b953ae400415c53ef931655c04d50df09f89e2e3'
+    oldFile: !uuid '915948c7189a96723ee4041057d452191cb0575f'
+  /vendor/symfony/options-resolver/Tests/Debug:
+    newFile: null
+    oldFile: !uuid '9c9faf376b8768774b0ddd60be62440dce506a02'
+  /vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php:
+    newFile: null
+    oldFile: !uuid '7c4753ab5f6b4f07168c35c26c1061e9a5ea8540'
+  /vendor/symfony/options-resolver/Tests/OptionsResolverTest.php:
+    newFile: !uuid 'd09dece33cc8be3eab80087a5caef52ae6bf700f'
+    oldFile: !uuid '440af8b5787e6132a3c738cb36780aacac8515e9'
+  /vendor/symfony/options-resolver/composer.json:
+    newFile: !uuid 'a751730af3819eccbe15c8202404aac6698291f3'
+    oldFile: !uuid '895847ea5add7aaa90fac5fe7ed6e7841b484066'
+gitCommitId: !uuid 'cb503506758d89000dca6c98ca875c9166b40b82'
 renames: {
   }
-revisionId: 897
+revisionId: 898