diff --git a/commit.ref b/commit.ref index 8b2e4600b..f5dffb2b7 160000 --- a/commit.ref +++ b/commit.ref @@ -1 +1 @@ -Subproject commit 8b2e4600b2f4e9d23cabc341f22188b481117674 +Subproject commit f5dffb2b7963c345bcc79fe8f18023d44c38ab15 diff --git a/commit.yml b/commit.yml index cc817a35c..8573b6066 100644 --- a/commit.yml +++ b/commit.yml @@ -3,174 +3,150 @@ branches: { } fileChange: /thinkphp: - newFile: !uuid 'ebc1fcad16a4377e91afd0a106df35e3eee5ae94' - oldFile: !uuid 'c8da7571246ff8688c18c57f802c24c333bbd997' - /thinkphp/convention.php: - newFile: !uuid '1d85e56ef18adf7c6a5e664980c4453975421e4d' - oldFile: !uuid '6675a57a9cc0f2c9fe40845a1b7f1173c8e97534' + newFile: !uuid '6c702785d32a6e9add5f6a6b82928be024684a3f' + oldFile: !uuid 'ebc1fcad16a4377e91afd0a106df35e3eee5ae94' + /thinkphp/LICENSE.txt: + newFile: !uuid '774fa76fd417171f928001ee064a84b95523851a' + oldFile: !uuid '574a39c401ff71ffcb90d15edb906b8046c7661b' /thinkphp/library: - newFile: !uuid '3193e33a875eca6f0a94b8ca4afbb9490efd6de0' - oldFile: !uuid '54a4b352c654f7b10148d869c8d47d10aca97669' + newFile: !uuid 'a8061548de75a132904ce08cc4d30baaac3b8e2a' + oldFile: !uuid '3193e33a875eca6f0a94b8ca4afbb9490efd6de0' /thinkphp/library/think: - newFile: !uuid '83dd2a111a413fc174b5d12409cc8882b3e3afb8' - oldFile: !uuid '42e1b5bbdc3046126fb9de71b7d17cfac2ecb2c7' + newFile: !uuid 'ab083633c6dac313e25fe9240411be4d83f37c4e' + oldFile: !uuid '83dd2a111a413fc174b5d12409cc8882b3e3afb8' /thinkphp/library/think/App.php: - newFile: !uuid '9c5e3bd82a0a5e74592de2da86654df8031804b2' - oldFile: !uuid 'cb3f40cd89113aae6ce95737dd4a9b7abdf7fa83' - /thinkphp/library/think/Build.php: - newFile: !uuid '4f90476d9326e91e1e41211dc2af924e45390b7f' - oldFile: !uuid '3dc0ca352866c47e32729e3c9cc5f4fe2a49a151' + newFile: !uuid '27f3251f33bbe4ce05bad384362b653699947671' + oldFile: !uuid '9c5e3bd82a0a5e74592de2da86654df8031804b2' + /thinkphp/library/think/Config.php: + newFile: !uuid '5cf0df169d5c32470eeb386064b4ba8b5fe92fdc' + oldFile: !uuid 'afef6a987fbe20f5d44a236d8ccb813bfe51103e' /thinkphp/library/think/Console.php: - newFile: !uuid '3a51f9f6d036e866b36c9481837b3df51f206a92' - oldFile: !uuid 'e73da7f15a8e974b5c06483a87c7cbdf0380e095' - /thinkphp/library/think/Container.php: - newFile: !uuid 'cd7954c0625d1042dd2edaa7bbe0d02efe2fe41a' - oldFile: !uuid '5c19b748acff8822e1bf3d0364761b3f35a7999d' - /thinkphp/library/think/Db.php: - newFile: !uuid '9280eac0e35d4a1bb8011a070f7f8f40dfa3d641' - oldFile: !uuid 'a21998c5904dd48b50fef315e83f784d0e57a7f4' - /thinkphp/library/think/Middleware.php: - newFile: !uuid 'd3f43606db76a0392f82d9725fc1a110b953329d' - oldFile: !uuid 'aafe88314d8f40982ebe47067e2375587a5cb054' - /thinkphp/library/think/Request.php: - newFile: !uuid '948e1844141ed7c5a3063cc7ba782c58f3b5c917' - oldFile: !uuid 'ba468dace9abbf68473a98a6ff1ec9447bc78976' + newFile: !uuid 'd1212907280d297e3e84f069c84db9b59e282327' + oldFile: !uuid '3a51f9f6d036e866b36c9481837b3df51f206a92' + /thinkphp/library/think/Controller.php: + newFile: !uuid 'e0966eb27b610abcc1628c77c5586d2245ddae17' + oldFile: !uuid '8edab8c670a62602a84b14152712dcfc455e2462' + /thinkphp/library/think/Hook.php: + newFile: !uuid 'b7e83deb79ed20585021569a63569dbc8fa394fe' + oldFile: !uuid 'b46684a5888fcadba27b6a5d774d8b8997e5c8ec' + /thinkphp/library/think/Log.php: + newFile: !uuid '70c7bb9a51b201a5a515c4e6097d2d684a889091' + oldFile: !uuid '351aae74150d461cbd9206879f318ece45125651' /thinkphp/library/think/Route.php: - newFile: !uuid '933168bf4a0669ea4bd767f5e15e212ef23af7dc' - oldFile: !uuid '353c0bf1480e477b15b6b5fe619f62ae26615417' - /thinkphp/library/think/Template.php: - newFile: !uuid 'a6238a657afe9b67df23e90e9af6e01e4a2c6e7a' - oldFile: !uuid '9410325755caf58dca72cf2c7fdbac84d52d02d6' - /thinkphp/library/think/console: - newFile: !uuid '81fa918890a2f8920f739c8d37587566d9e17914' - oldFile: !uuid '9024ea949c5774b7cc5101a27496f9b80ffc536a' - /thinkphp/library/think/console/Command.php: - newFile: !uuid 'a208e7b54b055bd99c53ff788f77f0f935601d5a' - oldFile: !uuid 'd0caad2f6b7eb81ff0567811e87c9f395db0b805' - /thinkphp/library/think/console/Table.php: - newFile: !uuid '9e28e266b3c01113afc771b084438e63609f01e4' - oldFile: null - /thinkphp/library/think/console/command: - newFile: !uuid 'edbfa69ad946097ec31f13176971ce038e980bc4' - oldFile: !uuid 'dc92be65321e21b4fee2092ff5d8e83eeee9e764' - /thinkphp/library/think/console/command/Build.php: - newFile: !uuid '88a5bf820156366f8129c5b5be1bfdc00fa8d942' - oldFile: !uuid '2b83199b1638ccde292d170620fbb798b7881c79' - /thinkphp/library/think/console/command/Help.php: - newFile: !uuid 'f1b63b42e8f06364a7729a983017ece6f417afce' - oldFile: !uuid 'bae2c653312f35f38f72a976d96a7346c621261f' - /thinkphp/library/think/console/command/Lists.php: - newFile: !uuid '6eb856c262e733bda6925d8abf56558e3c06e509' - oldFile: !uuid '084ddaa231ce3b1dd8c0b602387b49da80344c74' - /thinkphp/library/think/console/command/Make.php: - newFile: !uuid '2f20954ac4a7baf6c640644800f050546976e108' - oldFile: !uuid '7474f26684bcf280cfbbc42eccaa71827c5c49c5' - /thinkphp/library/think/console/command/RouteList.php: - newFile: !uuid '0405c31b6c8131935b924008e49120bf57b6be47' - oldFile: null - /thinkphp/library/think/console/command/RunServer.php: - newFile: !uuid '2e028dc6d0fc8bf0160240f5d0896a2e0bf69867' - oldFile: !uuid '4dd610b6e76d99396c5c194b8c36a846e1e84fbd' - /thinkphp/library/think/console/command/Version.php: - newFile: !uuid 'ee7eca9c936f63e8287205e9fe39a2a29ae6f623' - oldFile: !uuid 'ae7618c97b9d30b875e8ae8f453d49b992d995f9' - /thinkphp/library/think/console/command/make: - newFile: !uuid '39c5e3be0fb26da406caabe0bc2059d0a2a9cfd4' - oldFile: !uuid 'd89cc340f62b3700c08362b70ebb53a2b88045e4' - /thinkphp/library/think/console/command/make/Command.php: - newFile: !uuid 'b539eb236e24161adabb30acfa53c2b84a92ef49' - oldFile: null - /thinkphp/library/think/console/command/make/Controller.php: - newFile: !uuid '2a6ab770d2a2d95e87ddf95638d5b694843f1d74' - oldFile: !uuid 'e4cc5bb572af841f98771c37ad2ad2684af7c688' - /thinkphp/library/think/console/command/make/Validate.php: - newFile: !uuid '89830ad1d01294057524dd91485a10b59f08e262' - oldFile: !uuid 'e7e39e635b0d91918c8adb25b1789cda78006afc' - /thinkphp/library/think/console/command/make/stubs: - newFile: !uuid 'f10a4da1c5580529faf4adecc697f0f86f5b571c' - oldFile: !uuid 'c341badcaf7098d3b947bcefa713aa1c3c638cbb' - /thinkphp/library/think/console/command/make/stubs/command.stub: - newFile: !uuid 'd2c7c1e7e519f9262d9f4abb167c89a9df24afce' - oldFile: null - /thinkphp/library/think/console/command/make/stubs/controller.api.stub: - newFile: !uuid '54ec0594e4df7a7bb634eb83c83102e5fd26ceb7' - oldFile: !uuid 'aed9edfbd66a830b4d00e5b00dcbe6fce7d7d1f1' - /thinkphp/library/think/console/command/make/stubs/controller.stub: - newFile: !uuid '4533c07d230feb9e9d1ae8dd18c0964ff0915b5b' - oldFile: !uuid '870ce5cfbdbcdb4407f8af8cbf862b53fa68c233' - /thinkphp/library/think/console/command/optimize: - newFile: !uuid '713727c0cfdf34726e8fa1f366dfe32776bf0da2' - oldFile: !uuid '2e74b0ad7e8a8da7a25743b3200c6c8b5378dd83' - /thinkphp/library/think/console/command/optimize/Autoload.php: - newFile: !uuid 'b15ddce3fe0743ed53718743a9f7f6f905c9a75b' - oldFile: !uuid 'c5eab03ce2114367fbde8ebfdd8cf255b47c3bf9' - /thinkphp/library/think/console/command/optimize/Config.php: - newFile: !uuid 'da955568333aa2d4e087456398dc480d6511f2a1' - oldFile: !uuid '1be4e3a2d72e5f302f3d18151aa9775cce1f0d18' - /thinkphp/library/think/console/command/optimize/Route.php: - newFile: !uuid 'f6dc63288221f174e52f07b96078d133bd51b7e4' - oldFile: !uuid '21e39466cab3268733aaa7a1a7fc42280c01c9ab' - /thinkphp/library/think/console/command/optimize/Schema.php: - newFile: !uuid '7b9e02d62696a0a9b22b88bf37cb7dadd40f08db' - oldFile: !uuid '61620badd69740b240d89545a51feb4dcf69c336' - /thinkphp/library/think/console/output: - newFile: !uuid '799b0c9e3a3b829b9a8b3267c119779dd75c05c5' - oldFile: !uuid 'c30e35bbafec24230c92a1b284235f005a773191' - /thinkphp/library/think/console/output/descriptor: - newFile: !uuid 'defeb2a35b8ba3c15abe61616549a2fe2b88536b' - oldFile: !uuid 'c2599bffd91a1fec211af5c13324f60eeb2635d8' - /thinkphp/library/think/console/output/descriptor/Console.php: - newFile: !uuid '8739c536e747f4ecbc6f60050be2b83d9578aa0b' - oldFile: !uuid '4648b68e665ec9aa87512c8da4ff8461035ea8b8' + newFile: !uuid 'ed66c51d04a1bdd821e29dd5e828ec6860d782e3' + oldFile: !uuid '933168bf4a0669ea4bd767f5e15e212ef23af7dc' /thinkphp/library/think/db: - newFile: !uuid '6cd5f4defad268170e51524af70535625d59c8c3' - oldFile: !uuid '57d48975e3ef9e0d774579d0278cdf41685ae95f' + newFile: !uuid 'b487b9b8d2b32515b7baed90125caddfaba72e51' + oldFile: !uuid '6cd5f4defad268170e51524af70535625d59c8c3' + /thinkphp/library/think/db/Builder.php: + newFile: !uuid '507cda98a9b4892ccc978069cb3bc1a87db26b4f' + oldFile: !uuid '12b9c780ed42eb5b7dee93eb359ddb01c96c881d' /thinkphp/library/think/db/Connection.php: - newFile: !uuid '412dd3d879520ae91fc2ecc20c096de5b8eba028' - oldFile: !uuid '82769b87d57baf1f2e15d702850c49195f67bb2e' + newFile: !uuid 'd2bad3c0a4ff86e6e275853b8f2045624dfbf6af' + oldFile: !uuid '412dd3d879520ae91fc2ecc20c096de5b8eba028' /thinkphp/library/think/db/Query.php: - newFile: !uuid '35d2db19df39910887963383b7879ede373de531' - oldFile: !uuid '4e99d2280f1c633f3c0d67c81b34363cc4c0523a' + newFile: !uuid 'bcf6964c5eec3a7d7d1c7c2bf8ef43b2dd9dbe9d' + oldFile: !uuid '35d2db19df39910887963383b7879ede373de531' + /thinkphp/library/think/db/Where.php: + newFile: !uuid '9132e5461e7e17274a503e4c43c33517f4c180ea' + oldFile: !uuid '8db7c31ebf6a30a47bcd0597255c395fc230f77e' + /thinkphp/library/think/log: + newFile: !uuid '1c31e1d06d8e9a42de5be31fe143f7665e35dbf4' + oldFile: !uuid '5760d5c06fefe99f38ccbdaccd431e8b7aa8af84' + /thinkphp/library/think/log/driver: + newFile: !uuid '9a54b78d79b074d3dc2a91e4ac328c48ebdd80a9' + oldFile: !uuid '9259fb18934b40f64e4eb424f11f1b214a74fd30' + /thinkphp/library/think/log/driver/File.php: + newFile: !uuid '10f745d263e35aa2a871b441f11b7ec9752e72e2' + oldFile: !uuid 'dfd963c28c768f6e4d2ee8ea12dd27d858ecd337' + /thinkphp/library/think/log/driver/Socket.php: + newFile: !uuid '5e4f8bfd825bc5fad642f63f46926262582a20ab' + oldFile: !uuid 'b4a2cadc7050c8b473d87609f1c399f96ab4cc51' + /thinkphp/library/think/model: + newFile: !uuid '5663c6f6bb91a6b0fbbfa8cb3631c2005b5f3750' + oldFile: !uuid '026a2f4ab26413daf5d4c621298e0c3f45681c78' + /thinkphp/library/think/model/relation: + newFile: !uuid 'c5aa5a52f18b3dca0a076b804299eb880630d0ac' + oldFile: !uuid '009e818ae39e3f060902f2f1f2133a94fe6e199c' + /thinkphp/library/think/model/relation/BelongsTo.php: + newFile: !uuid 'a1d2b23c85603f24ef5ae00fb69e4fdf56e11def' + oldFile: !uuid '8ffa9ea161b00893f862741030b62d2d5b18afb9' + /thinkphp/library/think/model/relation/HasOne.php: + newFile: !uuid '1ccb6adc6c1b21c3bdc70fe3ce4a413e111e8b07' + oldFile: !uuid '3ce5fea03b816c6ab296d682c25715ef1a90fedd' + /thinkphp/library/think/model/relation/MorphMany.php: + newFile: !uuid '7c083dd799ca165781869490fc11ff01ef17ef71' + oldFile: !uuid '3e913ccd06f6fb69d01f46a6c7be30e73ac9d528' + /thinkphp/library/think/response: + newFile: !uuid '93fcdb5216569903a5a49b43b41771e11cd71535' + oldFile: !uuid '42116f2ce4f1b8aff50dbc1e75689f11a57d27ab' + /thinkphp/library/think/response/Redirect.php: + newFile: !uuid '73729ce889483be8ecd8c2f29a9288974ee72c93' + oldFile: !uuid '62fa83a7aafd42d880ee6302f60417342c13ce03' /thinkphp/library/think/route: - newFile: !uuid '6cb0dfefc1b919734930ac696199b1d108f38cbc' - oldFile: !uuid 'c83d0e1f408b114746ac55ddd4f8890cf2541bf8' - /thinkphp/library/think/route/Dispatch.php: - newFile: !uuid '76c30d199fb2c97f85a65b757f393544baa8d3aa' - oldFile: !uuid 'ecdf3ada5e4d797850b28d9faa83bc41d188b3d3' - /thinkphp/library/think/route/Resource.php: - newFile: !uuid 'ff13928244a279a495eaac22716ae46d41912558' - oldFile: !uuid '4e66d9fd866096792cf196795dc00dfa8b8aa054' - /thinkphp/library/think/route/Rule.php: - newFile: !uuid '46c36a3cb1086561d7c6f9e8da69b2df243de013' - oldFile: !uuid '9c26fb0278b65670ca14d96db23fc95627ac1ba5' + newFile: !uuid '4203671e996939c6f905c525e3e015f590a792cf' + oldFile: !uuid '6cb0dfefc1b919734930ac696199b1d108f38cbc' + /thinkphp/library/think/route/AliasRule.php: + newFile: !uuid '393cb3107fea1d62dbfc93fb029423e50badd93b' + oldFile: !uuid 'daf59fe13ebb9345759d4bf2a67624afeb72b6b5' /thinkphp/library/think/route/RuleGroup.php: - newFile: !uuid '57b8e28f0b43c688d22c212511c1c92430d5ff54' - oldFile: !uuid '86eb686d160256f64628e1065143b869278e4e79' - /thinkphp/library/think/route/RuleItem.php: - newFile: !uuid 'e4bddd90c21dac4e744c6a6f1bde9ed1921901c7' - oldFile: !uuid 'd210d922238e7a13cc853c2d48c228c983a0e81d' + newFile: !uuid '3ebb409952338da24670dbee185c48daa3fb76a8' + oldFile: !uuid '57b8e28f0b43c688d22c212511c1c92430d5ff54' /thinkphp/library/think/route/RuleName.php: - newFile: !uuid '026cb6206eb50aae756587c648bbfbef3f9354ec' - oldFile: !uuid 'c73c36394fe12d2537ff152c4d34116666708295' + newFile: !uuid '46481f8c54a614b80640b86d9095f81799def05b' + oldFile: !uuid '026cb6206eb50aae756587c648bbfbef3f9354ec' /vendor: - newFile: !uuid 'd607aa27b2e954b6f2f1815c41d8a29e4462e3e9' - oldFile: !uuid 'ced058ec8057d7f88b4527a62e7aeee2221619a2' + newFile: !uuid '6223b7aff47c02d58e8a5dcafbe646a74adb5322' + oldFile: !uuid 'd607aa27b2e954b6f2f1815c41d8a29e4462e3e9' /vendor/autoload.php: - newFile: !uuid 'db1ddd414590b6fd61ee7fcfbc64d404e1d7461e' - oldFile: !uuid 'f52588b37ec3ae6c775b182efcd91a17c31f2b4b' + newFile: !uuid '10f85353b187c7f38fd1c4a40c3c1e4e656f784b' + oldFile: !uuid 'db1ddd414590b6fd61ee7fcfbc64d404e1d7461e' /vendor/composer: - newFile: !uuid '0bc9084774a28894e44225f820c3023fd831dcd2' - oldFile: !uuid '49c0fcb67d28d28dead0074d17ed66f75b2a6513' + newFile: !uuid 'd8b0b790faa3db2a0fce4fa80b176fe67199374f' + oldFile: !uuid '0bc9084774a28894e44225f820c3023fd831dcd2' /vendor/composer/autoload_real.php: - newFile: !uuid '2ab9f0cc97911c6c178bc42f5b870c7846befd86' - oldFile: !uuid '3e1c135b5ae366dd9b3d8e3559cc7f1d62ae3d08' + newFile: !uuid '46afd63e7abdce21f9c596c24491d791127e3377' + oldFile: !uuid '2ab9f0cc97911c6c178bc42f5b870c7846befd86' /vendor/composer/autoload_static.php: - newFile: !uuid 'a5f8faca5bb6bfda0e74275dee6990c7373b525a' - oldFile: !uuid 'e658926af099284596714b362dc120ceef5c2336' + newFile: !uuid '735497876558ba0e36404c9b05006b9a4c26a38f' + oldFile: !uuid 'a5f8faca5bb6bfda0e74275dee6990c7373b525a' /vendor/composer/installed.json: - newFile: !uuid '82662acc74b97c7cbf5ef63896c8df7ae0189d4c' - oldFile: !uuid 'b3d6979ee1c62a152d2bd52ed00b887b6eff053d' -gitCommitId: !uuid '8b2e4600b2f4e9d23cabc341f22188b481117674' + newFile: !uuid '9435932ed14380622c61bad0c02f55b7a74d99c2' + oldFile: !uuid '82662acc74b97c7cbf5ef63896c8df7ae0189d4c' + /vendor/symfony: + newFile: !uuid '194a3a2131e000cb5ac2197699dd21bcde7bb517' + oldFile: !uuid 'ad76c192e5f567b8525ec850617b339ac74907bd' + /vendor/symfony/options-resolver: + newFile: !uuid '7270f9a5f2bd5394888351a61ea320dea17510dc' + oldFile: !uuid '96065af33ed9058bbdea5100803715922acc57c0' + /vendor/symfony/options-resolver/OptionsResolver.php: + newFile: !uuid '83d81969cb01b9177505b615a95c1e188da2f022' + oldFile: !uuid '79a6c0897c2733198630bed2fdc0742d14080138' + /vendor/zoujingli: + newFile: !uuid '294734ddaf90591e2aa43d73e05e180e33b82388' + oldFile: !uuid '19b9dd5447c53c068db211edd4fb529ccdbaa898' + /vendor/zoujingli/wechat-developer: + newFile: !uuid '7cedfbb088ddfefd199818c88efd9698eb877ed0' + oldFile: !uuid 'b4acff90453308eaf62e7e7c4fc13b3483aac89f' + /vendor/zoujingli/wechat-developer/WeChat: + newFile: !uuid 'e09169565e5783e1cf4c2345a84111cbba18c584' + oldFile: !uuid '068e1f461db1893e67031c41c1d03e62bc4ba6da' + /vendor/zoujingli/wechat-developer/WeChat/Contracts: + newFile: !uuid 'bdd32f0b85e2382216bc4592b732e5bc162fbe86' + oldFile: !uuid 'ab19aaae95dbd78fdc7bccfc9d3b70151ae65819' + /vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php: + newFile: !uuid '30bbc25f1c3b76ce686c3215baf682147c336d2e' + oldFile: !uuid '83c9a3d1fd71bf3e08046691900276b3a7d02a1c' + /vendor/zoujingli/wechat-developer/WeChat/Custom.php: + newFile: !uuid '12e505142e1eac9c46e0f3903418cafca4a2157f' + oldFile: !uuid 'bdd288781ae944c4ad798262092c14013bd7c456' + /vendor/zoujingli/wechat-developer/WePay: + newFile: !uuid 'af8708f5e09ac755f31d1ace3763de5118a5ed38' + oldFile: !uuid '1b55cc4e958d5ccc3d5c1702468b816f98abda58' + /vendor/zoujingli/wechat-developer/WePay/Refund.php: + newFile: !uuid 'da8152204c61595d7ac6fd3e9fd954674363e9ed' + oldFile: !uuid 'a91493ee9c5003fc112cd951e69d93852e2875da' +gitCommitId: !uuid 'f5dffb2b7963c345bcc79fe8f18023d44c38ab15' renames: { } -revisionId: 1083 +revisionId: 1084