diff --git a/commit.ref b/commit.ref index e049fe479..5a9e2bb10 160000 --- a/commit.ref +++ b/commit.ref @@ -1 +1 @@ -Subproject commit e049fe479abbd58d3bc7734f19311f28af2ec713 +Subproject commit 5a9e2bb1021dac921dc2a825f83965cb319638e9 diff --git a/commit.yml b/commit.yml index f7697b3f7..0bcf30905 100644 --- a/commit.yml +++ b/commit.yml @@ -3,150 +3,156 @@ branches: { } fileChange: /thinkphp: - newFile: !uuid '4679fe7bf72341edc578911a99e77b5870eaa863' - oldFile: !uuid 'bb3577f2c57bd107d6c0090f7bf9365cc4a39ed8' - /thinkphp/helper.php: - newFile: !uuid '9c46533509097279ebe608676b6bd34d433a084c' - oldFile: !uuid '4aa73722c6e92ab5cc273e8c24d1a653292215c0' + newFile: !uuid '9279a88b8a2e81769118d6d8a410e0f085f01e4d' + oldFile: !uuid '4679fe7bf72341edc578911a99e77b5870eaa863' /thinkphp/library: - newFile: !uuid 'caab80052b18c6c0b4cf6af3c956d5864b8bf36d' - oldFile: !uuid '24ee0d37bcc78dc9664a0ee4fb6713d157c73967' + newFile: !uuid 'e3cc5d27810568cff97567534eb6a4c603794d24' + oldFile: !uuid 'caab80052b18c6c0b4cf6af3c956d5864b8bf36d' /thinkphp/library/think: - newFile: !uuid '169b773409985692b9042169d0f8232e39c6374e' - oldFile: !uuid '01005ff2c887c139f70b6cc47e2e6c07cb83fe08' + newFile: !uuid '1f76b54fcab40f05b4d1cdb84d19908b9b2350ce' + oldFile: !uuid '169b773409985692b9042169d0f8232e39c6374e' /thinkphp/library/think/App.php: - newFile: !uuid 'cfa2601ea4946270a18083f193fba8b5e5eee53b' - oldFile: !uuid 'addb756c178184d417e19d7029f33d84afb086eb' + newFile: !uuid 'ac8b0e91bda661d451547c0e9ce6222531867315' + oldFile: !uuid 'cfa2601ea4946270a18083f193fba8b5e5eee53b' + /thinkphp/library/think/Controller.php: + newFile: !uuid 'd16a1ed501ca4d9ffdadcdb647703a5afa197229' + oldFile: !uuid 'a57da9e352df2478f50018d8e61470e7fc51761f' + /thinkphp/library/think/Model.php: + newFile: !uuid '9896f9ff5caf7ecfd6fb56279299926410472529' + oldFile: !uuid 'e0dcecf6466a989f85b5fec651eeda17eceb839b' + /thinkphp/library/think/Validate.php: + newFile: !uuid '54c3a73700f525992b18f3f7cc46394ac38fc665' + oldFile: !uuid '4672a5cbafec5141ebd9288f63714cbef7155cc4' + /thinkphp/library/think/cache: + newFile: !uuid '87dbabd961ed2838ed9295390070f6ffb6fd56e6' + oldFile: !uuid '4a03a6451c3be06678501cc9c7b20d669a1d76be' + /thinkphp/library/think/cache/Driver.php: + newFile: !uuid 'f4c5dcbf7629ef05cb7684a9f3c8da0fb3b8fef0' + oldFile: !uuid 'f0ec7baf407407b4976fd7dfc1249f29ac7233b6' + /thinkphp/library/think/cache/driver: + newFile: !uuid '0d093880f9e25843867f12750c7b1a0d4e2e28e9' + oldFile: !uuid '6218a69eec3e1a1a58bd4599d55e3c779a970b53' + /thinkphp/library/think/cache/driver/File.php: + newFile: !uuid '93d321f2324a02ed5dbd2101843da740b8817af8' + oldFile: !uuid '7c5661e3d7c1e7972bbd7dce12e5cc3c1b2dfe33' + /thinkphp/library/think/cache/driver/Lite.php: + newFile: !uuid '0cfe3907933ebb1b6e68b412e62b70f5ace87a0c' + oldFile: !uuid '544663c057ed6ac4ec512260125c6590ca954162' + /thinkphp/library/think/cache/driver/Memcache.php: + newFile: !uuid '1c535597e863969953c8bc60ae1a8051f76314f3' + oldFile: !uuid '162ca520754c88156b074804c362305570c49990' + /thinkphp/library/think/cache/driver/Memcached.php: + newFile: !uuid '6af60d19b79867cc64220a6e5817bfd8fb17e5f6' + oldFile: !uuid 'd04fac0877796387b5e4eb2eede0320edbf1488f' + /thinkphp/library/think/cache/driver/Redis.php: + newFile: !uuid '813746e77511cb74da0c604daf6c63e1e382eaf8' + oldFile: !uuid 'b924ec3d43020e2f3cb04629b2a2f0da0c26a1f7' + /thinkphp/library/think/cache/driver/Sqlite.php: + newFile: !uuid 'f57361e3c4d476377cee8e06321c1ef30e60c37f' + oldFile: !uuid '7e78ec12d2e72d149b35373550864eafffcb39fc' + /thinkphp/library/think/cache/driver/Wincache.php: + newFile: !uuid 'ef15784173ed4186f1ab99fffec885df425ad9bf' + oldFile: !uuid '10966e786cf8af77ea66c82f35fca7768c05f287' + /thinkphp/library/think/cache/driver/Xcache.php: + newFile: !uuid '4e698597a50f44cf4446ccc4f46e3c83e1d442ee' + oldFile: !uuid '6d1bf3f6cf0c047613af49521c271e8950e49877' /thinkphp/library/think/db: - newFile: !uuid '87306d821f74c7087b3965ace97bcd49a50f778a' - oldFile: !uuid '984b222ab98789f34756acfe338a90789e524ca8' + newFile: !uuid '5081dba79b8fce0a26a4b09470efbb6d0107b61e' + oldFile: !uuid '87306d821f74c7087b3965ace97bcd49a50f778a' /thinkphp/library/think/db/Query.php: - newFile: !uuid '00483328ee1c3bfc0d9bd7732ce05b4a92b75f42' - oldFile: !uuid 'f58da0e9a46df63ee013ef83447e9ba57951f81a' - /thinkphp/library/think/db/connector: - newFile: !uuid '577dc893d2e8c5422a5bca97d1cd1f4b51d2a594' - oldFile: !uuid '3852978d9b3fbdaf352b70e2a1c8eaa3bf8b4e90' - /thinkphp/library/think/db/connector/Sqlsrv.php: - newFile: !uuid '123affb87f4360f0e3be8a10cc7c0f7f495bef51' - oldFile: !uuid 'aba405fd95874041ac78906f4c8c0a7ad1fe47e2' + newFile: !uuid '2704c8df78a69e94fca5e161a16053c2ebf8339d' + oldFile: !uuid '00483328ee1c3bfc0d9bd7732ce05b4a92b75f42' /thinkphp/library/think/model: - newFile: !uuid 'fc8cea9c51506debc8668254cca2b624823c7804' - oldFile: !uuid '67dc0315c694c092c452487443b444ae81b432e6' + newFile: !uuid '7a84749820efaac045a26efe7b54008b03cb8d01' + oldFile: !uuid 'fc8cea9c51506debc8668254cca2b624823c7804' + /thinkphp/library/think/model/concern: + newFile: !uuid '6fe6703fe954c180ecf537078182a455fdb2d6e0' + oldFile: !uuid '535eacb884d5225f2e7bb1da4ef297c084534a30' + /thinkphp/library/think/model/concern/Attribute.php: + newFile: !uuid 'b7a80fd3beda932ea7c3e4512495c7a639c925b6' + oldFile: !uuid '75b02ab542af4aaad8adbd1c903457119fc3ee6b' /thinkphp/library/think/model/relation: - newFile: !uuid 'bf5b3f251feb69d1591c614026992490ea3bc664' - oldFile: !uuid '09908b24bb9ca14438a2f2a11e7fa3af15b01a01' + newFile: !uuid 'ef31f0f23d528da40bf6969c16897cd74e77bbf3' + oldFile: !uuid 'bf5b3f251feb69d1591c614026992490ea3bc664' /thinkphp/library/think/model/relation/BelongsToMany.php: - newFile: !uuid 'b7cdebe1db45cac0fe9071f74d037e2e11029c5c' - oldFile: !uuid 'a66b0d01e10cca07592f640f635f6c4c9768a2c9' + newFile: !uuid '747482b6ebf10e65424d9a28e2895fdb3e985675' + oldFile: !uuid 'b7cdebe1db45cac0fe9071f74d037e2e11029c5c' /thinkphp/library/think/model/relation/HasMany.php: - newFile: !uuid '72d831445105d8bada2470a00be9a8b378314ee2' - oldFile: !uuid 'f679e95b476d0acddc63c43b32578240684b3f13' + newFile: !uuid 'dbb8fa08336ce2e5f6953251e1c7ace8f41409e3' + oldFile: !uuid '72d831445105d8bada2470a00be9a8b378314ee2' /thinkphp/library/think/model/relation/MorphMany.php: - newFile: !uuid '1a7f15eb49c3e680d33a21d049517574a57215cc' - oldFile: !uuid 'e1ca0912fd0f4db6682105d4c8b67239f83aa7aa' + newFile: !uuid 'a1f54889bbf38966825a7c8e4f0a84eee718fcf2' + oldFile: !uuid '1a7f15eb49c3e680d33a21d049517574a57215cc' /thinkphp/library/think/model/relation/MorphOne.php: - newFile: !uuid '716539f48ff350947ee9f5893f32fd2c6dd92ed2' - oldFile: !uuid '738040db427e789fa7d9dce978c66434a8da7042' - /thinkphp/library/think/response: - newFile: !uuid 'fac945b4df5ff29bab87c44d7f32c0a4f3e1c19b' - oldFile: !uuid 'bab43d30a07a46da0787f84017d1f39675ee124b' - /thinkphp/library/think/response/Download.php: - newFile: !uuid 'd5fcb444c8cc57da97cef8ce79afb0534b6616ba' - oldFile: !uuid '02a440df95351da9e64c1bc24d0d07844df7e646' + newFile: !uuid '775b2dfd7c43ca424acf1ae3b60b6acadf93f18d' + oldFile: !uuid '716539f48ff350947ee9f5893f32fd2c6dd92ed2' /thinkphp/library/think/route: - newFile: !uuid 'd16dae10e1e8baa38aed542e0095124f5881585d' - oldFile: !uuid '1a10216b2094ba798d430ab2d5285b55125f5d28' + newFile: !uuid 'c90b5d8b64c1722b6c90f6071f1ef4bd3846df6d' + oldFile: !uuid 'd16dae10e1e8baa38aed542e0095124f5881585d' + /thinkphp/library/think/route/Rule.php: + newFile: !uuid 'fdfc29d1d7925186bb88ffa4a7e9edf9993f2187' + oldFile: !uuid '35730fee97b326f098d0fbd11e5a299ab12d4d7d' /thinkphp/library/think/route/dispatch: - newFile: !uuid '2fbb3c8f0d7c41b33342c22f1afde8744a03eb7f' - oldFile: !uuid '317aab7fb4432d406cc431b06ff57b5911d36184' + newFile: !uuid '25b07e02099fbd8ee81053c842c790fec14026f0' + oldFile: !uuid '2fbb3c8f0d7c41b33342c22f1afde8744a03eb7f' /thinkphp/library/think/route/dispatch/Module.php: - newFile: !uuid 'dc1974ceb44dcfafa6e91e4bd40c88ed6c1748d7' - oldFile: !uuid '396ce11dd11e415dde28fe27c2e90bc0a3b69096' - /thinkphp/library/think/template: - newFile: !uuid '8465c2dd41980bf07189f19e7d20a09f853ba1be' - oldFile: !uuid 'd5c9daca58f49885a5293f29f7607a4efc9475aa' - /thinkphp/library/think/template/TagLib.php: - newFile: !uuid 'bbbb2c0358548d39d24c069bf3a9ce7bfc14a11a' - oldFile: !uuid '3653b7d2f322882d5743bdc8be92088ab50bf884' + newFile: !uuid 'e8842cd3a331aba54343d077c2d5eeacf7a2ea9e' + oldFile: !uuid 'dc1974ceb44dcfafa6e91e4bd40c88ed6c1748d7' + /thinkphp/library/think/route/dispatch/Url.php: + newFile: !uuid '00dc8cca3c7b2dd7fac7fd477ee73ae18cb8b615' + oldFile: !uuid '95ee9e53fc3643f33f8691757c9802e449c726bd' /vendor: - newFile: !uuid '177fe0942e6f009adc89b62e24ac7920c20db976' - oldFile: !uuid '2d2f2f54a2969c6902c889ac7044555087445d13' + newFile: !uuid '298bf9d1b174dcb5292522d56842337bf695a3ce' + oldFile: !uuid '177fe0942e6f009adc89b62e24ac7920c20db976' /vendor/autoload.php: - newFile: !uuid '482a857ff47d8f55c77ba8cdcbaf893dfbdc9e99' - oldFile: !uuid '37bc1d31d1ead01650a7d5c276fb2da44fde4614' + newFile: !uuid 'a285a94c369b227dd4bdb8955fb7e305a8a96c6f' + oldFile: !uuid '482a857ff47d8f55c77ba8cdcbaf893dfbdc9e99' /vendor/composer: - newFile: !uuid '4f31cdf7dc53079981b6ad0f4d1712ed4ea2d3e4' - oldFile: !uuid '055a06e7bcc1b817225648cfff40edc6b4cb61d5' - /vendor/composer/autoload_classmap.php: - newFile: !uuid '1ec63efa6dceb78d2556725e62023ce1a55ffafd' - oldFile: !uuid '5bbd0768ab56e490b58aa5f40d54484b7374269a' + newFile: !uuid 'dcf85e8010382e04a6ed337f3c183ccb56fbcb9d' + oldFile: !uuid '4f31cdf7dc53079981b6ad0f4d1712ed4ea2d3e4' /vendor/composer/autoload_real.php: - newFile: !uuid 'd55839f5824d85e7f4dd3585da911a45bd42d5f5' - oldFile: !uuid '72a1dfa0d8574a80712a8a8616575dc3dc392a01' + newFile: !uuid '190a8063622f94415f0dc1ad0a5dc4d33ecf90c5' + oldFile: !uuid 'd55839f5824d85e7f4dd3585da911a45bd42d5f5' /vendor/composer/autoload_static.php: - newFile: !uuid '8cecedfae946b6d8a353d2833c21b3595a46fda6' - oldFile: !uuid '2f7d5e130f7dce2cfc74e45c9e3f89671cff0c43' + newFile: !uuid 'e3fcf6d8863e15b0c25c21c7b2b91e0d5deab84c' + oldFile: !uuid '8cecedfae946b6d8a353d2833c21b3595a46fda6' /vendor/composer/installed.json: - newFile: !uuid 'c05d282b5ec5ab36666a4b469a61c37f749dcc1f' - oldFile: !uuid '89be400f9a3df249b9147c21295589c6befececc' + newFile: !uuid '92b8daf9830bc6e594e080085cc92a7fc24ac32d' + oldFile: !uuid 'c05d282b5ec5ab36666a4b469a61c37f749dcc1f' /vendor/zoujingli: - newFile: !uuid 'b921258ee6b8abc76732b44d755f744990609fc4' - oldFile: !uuid '4efb80c1e93f15d8d5efcff1f49bc4fc25f43916' + newFile: !uuid 'c9fd26bdac7852921082a72e5c0ee5574007a531' + oldFile: !uuid 'b921258ee6b8abc76732b44d755f744990609fc4' /vendor/zoujingli/wechat-developer: - newFile: !uuid 'fd70ba4d4c42eb803f63b2e7d8e7cb85f3b788b5' - oldFile: !uuid '90d98a49dbbbef96362582a4bdec9481ca00d665' - /vendor/zoujingli/wechat-developer/README.md: - newFile: !uuid '636d4cf2fc9a6b04df606dacbe19c531a3de44bf' - oldFile: !uuid '53f90c4729f33ffebbfe954457104063d6943c71' + newFile: !uuid 'ffa7289ff9d4824ea77011a9b3421f45b25a9da5' + oldFile: !uuid 'fd70ba4d4c42eb803f63b2e7d8e7cb85f3b788b5' /vendor/zoujingli/wechat-developer/WeChat: - newFile: !uuid 'cdf65ef964434a153711952959f8312232f1b380' - oldFile: !uuid '73110f677794b3d233cb622d7cd20f803ac0e8e4' - /vendor/zoujingli/wechat-developer/WeChat/Card.php: - newFile: !uuid 'b392781eb1bbc8c5b34564ac361c1a93079df86a' - oldFile: !uuid '59cba2dba1089da439a722f9ad6f419edac5e13a' + newFile: !uuid 'acab3c939b3ee463f1aa93f89fe379a511c1b95c' + oldFile: !uuid 'cdf65ef964434a153711952959f8312232f1b380' /vendor/zoujingli/wechat-developer/WeChat/Contracts: - newFile: !uuid '6abb1885e39bdeb176c8b5e9fa8f69f99d89191b' - oldFile: !uuid '215f7f9f877749ed7946069c4bc9bfed5438cd4b' + newFile: !uuid 'be7fc26076bd98ca3648278b8872a7c3e75278c2' + oldFile: !uuid '6abb1885e39bdeb176c8b5e9fa8f69f99d89191b' + /vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicAliPay.php: + newFile: !uuid 'cce79b9fd68d8fc695cee6a474f3856e0d315aa0' + oldFile: !uuid '360d32198016e534cdfce71db52d6ce9ce2c17be' /vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPushEvent.php: - newFile: !uuid 'a221f18420cd642c09acfb9b6c63ec149e231879' - oldFile: !uuid '205075e98a17236307022319ef4ae353cb0db234' - /vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php: - newFile: !uuid 'da8e2f806b1dbc32b583ce539ad44c4dc12fb112' - oldFile: !uuid '3dd4eb097fb841e40d33bcee294dbecb1de36e08' - /vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php: - newFile: !uuid '1f0f0965f9fdc808da7c5916897712bec4445b8f' - oldFile: !uuid 'f25cbdaf84bd722a32da5b32f161c7b62bccc597' - /vendor/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php: - newFile: !uuid 'e81e3da46c82494b618df38c8ff51666252c75eb' - oldFile: null + newFile: !uuid 'c21e6e492f70db181104546b9bf26c7163e4f487' + oldFile: !uuid 'a221f18420cd642c09acfb9b6c63ec149e231879' /vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php: - newFile: !uuid '4cc4305d8fb777058ecfca73a5afe9c93306159a' - oldFile: !uuid '40e23712f1e043191ffc04f1267078019064caad' - /vendor/zoujingli/wechat-developer/WeChat/Limit.php: - newFile: !uuid '6ccc6f4883087dc4cce44d128db5563222d03d19' - oldFile: !uuid 'ebd56d3b9260d22b7d1bb6d18f1673f33f4f2f48' - /vendor/zoujingli/wechat-developer/WeChat/Oauth.php: - newFile: !uuid 'a8be2729e60c6cd2ee0b8d72f54bfa4bfa877a19' - oldFile: !uuid '151a4eed72179df441693d39464eb5157fed0f19' + newFile: !uuid 'b919e5c3d8af8eefd55fa8537665cc2664680e61' + oldFile: !uuid '4cc4305d8fb777058ecfca73a5afe9c93306159a' /vendor/zoujingli/wechat-developer/WeChat/Pay.php: - newFile: !uuid 'b063a435e675d82c16bad6a66b386bf0a4b490df' - oldFile: !uuid '5030ab51edb358c98af0776da6ecdaadf8d633c0' - /vendor/zoujingli/wechat-developer/WeChat/Product.php: - newFile: !uuid '74eb3eed4ace0a075db533f2c7a1ea284eeb7e18' - oldFile: !uuid 'b1add210a9400e92ca28e9212250dc54de0cea70' - /vendor/zoujingli/wechat-developer/WeChat/Script.php: - newFile: !uuid '49d040cb91d04572a149a3040f2be76a68d5322d' - oldFile: !uuid '59099d2811c9baaed959db02d024fca8613d1ea2' - /vendor/zoujingli/wechat-developer/WeChat/Wifi.php: - newFile: !uuid 'ff22afffc8480f5396351dca6aa11a2c93888664' - oldFile: !uuid 'ecc45a45e601e22ef2a81b4aceaa79d4843763f4' - /vendor/zoujingli/wechat-developer/_test: - newFile: !uuid '4a2d0df33bf5b2176b56f49be14e6001bdc160c0' - oldFile: !uuid '37e0e0a567dee933d76be8c2189232327c661cb6' - /vendor/zoujingli/wechat-developer/_test/pay-order-notify.php: - newFile: !uuid '3597f025bf8feb21f81865870ca9db65d32c5543' - oldFile: null -gitCommitId: !uuid 'e049fe479abbd58d3bc7734f19311f28af2ec713' + newFile: !uuid '9045c000630aa2aba59c05bc69958d7ddff31237' + oldFile: !uuid 'b063a435e675d82c16bad6a66b386bf0a4b490df' + /vendor/zoujingli/wechat-developer/WePay: + newFile: !uuid '5efa697f5a73224a681b606a663726cb3893badb' + oldFile: !uuid '59d7b6178b32a67c88ac8f4b061c1c11456de4c3' + /vendor/zoujingli/wechat-developer/WePay/Bill.php: + newFile: !uuid '4c853c700e547af5f1c90a252838e198c8e5ecd6' + oldFile: !uuid '383da63d874523f7a5040284d497e930f274cddb' + /vendor/zoujingli/wechat-developer/WePay/Order.php: + newFile: !uuid '2b4a1f54d31b51402d4d1bd3162a7b5924d011be' + oldFile: !uuid '1b9de102b01b0c4132e94dd048e4bc294cdab0ed' +gitCommitId: !uuid '5a9e2bb1021dac921dc2a825f83965cb319638e9' renames: { } -revisionId: 1103 +revisionId: 1104